diff --git a/safe.csv b/safe.csv
index 3290818f..300774ef 100644
--- a/safe.csv
+++ b/safe.csv
@@ -663,6 +663,18 @@ address,name,chainId
 0x847A3364Cc5fE389283bD821cfC8A477288D9e82,AaveV3Ethereum ASSETS sUSDe INTEREST_RATE_STRATEGY,1
 0xb37aE8aBa6C0C1Bf2c509fc06E11aa4AF29B665A,AaveV3Ethereum ASSETS sUSDe ORACLE,1
 0x54D612b000697bd8B0094889D7d6A92bA0Bf2DEa,AaveV3Ethereum ASSETS sUSDe STATA_TOKEN,1
+0x18084fbA666a33d37592fA2633fD49a74DD93a88,AaveV3Ethereum ASSETS tBTC UNDERLYING,1
+0x10Ac93971cdb1F5c778144084242374473c350Da,AaveV3Ethereum ASSETS tBTC A_TOKEN,1
+0xCcf8413F9cA3bAE07EEF05E265D238d60abCb8Ca,AaveV3Ethereum ASSETS tBTC S_TOKEN,1
+0xAC50890a80A2731eb1eA2e9B4F29569CeB06D960,AaveV3Ethereum ASSETS tBTC V_TOKEN,1
+0x847A3364Cc5fE389283bD821cfC8A477288D9e82,AaveV3Ethereum ASSETS tBTC INTEREST_RATE_STRATEGY,1
+0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c,AaveV3Ethereum ASSETS tBTC ORACLE,1
+0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf,AaveV3Ethereum ASSETS cbBTC UNDERLYING,1
+0x5c647cE0Ae10658ec44FA4E11A51c96e94efd1Dd,AaveV3Ethereum ASSETS cbBTC A_TOKEN,1
+0x0002BfcCE657a4BEB498E23201bd767FC5A0A0d5,AaveV3Ethereum ASSETS cbBTC S_TOKEN,1
+0xeB284A70557EFe3591b9e6D9D720040E02c54a4d,AaveV3Ethereum ASSETS cbBTC V_TOKEN,1
+0x847A3364Cc5fE389283bD821cfC8A477288D9e82,AaveV3Ethereum ASSETS cbBTC INTEREST_RATE_STRATEGY,1
+0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c,AaveV3Ethereum ASSETS cbBTC ORACLE,1
 0x82dcCF206Ae2Ab46E2099e663F70DeE77caE7778,AaveV3Ethereum CAPS_PLUS_RISK_STEWARD,1
 0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c,AaveV3Ethereum COLLECTOR,1
 0x8689b8aDD004A9fD2320031b7d3f5aF1f7F41e17,AaveV3Ethereum CONFIG_ENGINE,1
@@ -1817,6 +1829,12 @@ address,name,chainId
 0x46Da028a47Ed58026aCbFbE91eeA51CcB062134E,AaveV3Base ASSETS weETH INTEREST_RATE_STRATEGY,8453
 0xFc4d1d7a8FD1E6719e361e16044b460737F12C44,AaveV3Base ASSETS weETH ORACLE,8453
 0x588159E0d360ffAA978330812f9234818ab46E8E,AaveV3Base ASSETS weETH STATA_TOKEN,8453
+0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf,AaveV3Base ASSETS cbBTC UNDERLYING,8453
+0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6,AaveV3Base ASSETS cbBTC A_TOKEN,8453
+0x839A515eB049237a6D4978F1735a00608a5A857D,AaveV3Base ASSETS cbBTC S_TOKEN,8453
+0x05e08702028de6AaD395DC6478b554a56920b9AD,AaveV3Base ASSETS cbBTC V_TOKEN,8453
+0x46Da028a47Ed58026aCbFbE91eeA51CcB062134E,AaveV3Base ASSETS cbBTC INTEREST_RATE_STRATEGY,8453
+0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F,AaveV3Base ASSETS cbBTC ORACLE,8453
 0x12DEB4025b79f2B43f6aeF079F9D77C3f9a67bb6,AaveV3Base CAPS_PLUS_RISK_STEWARD,8453
 0xBA9424d650A4F5c80a0dA641254d1AcCE2A37057,AaveV3Base COLLECTOR,8453
 0x08183F38166f640D60895150d99e57c6ad948451,AaveV3Base CONFIG_ENGINE,8453
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index dbb18b37..3689a6a5 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -256,6 +256,27 @@ library AaveV3BaseAssets {
 
   // https://basescan.org/address/0x588159E0d360ffAA978330812f9234818ab46E8E
   address internal constant weETH_STATA_TOKEN = 0x588159E0d360ffAA978330812f9234818ab46E8E;
+
+  // https://basescan.org/address/0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf
+  address internal constant cbBTC_UNDERLYING = 0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf;
+
+  uint8 internal constant cbBTC_DECIMALS = 8;
+
+  // https://basescan.org/address/0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6
+  address internal constant cbBTC_A_TOKEN = 0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6;
+
+  // https://basescan.org/address/0x05e08702028de6AaD395DC6478b554a56920b9AD
+  address internal constant cbBTC_V_TOKEN = 0x05e08702028de6AaD395DC6478b554a56920b9AD;
+
+  // https://basescan.org/address/0x839A515eB049237a6D4978F1735a00608a5A857D
+  address internal constant cbBTC_S_TOKEN = 0x839A515eB049237a6D4978F1735a00608a5A857D;
+
+  // https://basescan.org/address/0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F
+  address internal constant cbBTC_ORACLE = 0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F;
+
+  // https://basescan.org/address/0x46Da028a47Ed58026aCbFbE91eeA51CcB062134E
+  address internal constant cbBTC_INTEREST_RATE_STRATEGY =
+    0x46Da028a47Ed58026aCbFbE91eeA51CcB062134E;
 }
 
 library AaveV3BaseEModes {
diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
index 4ed9da77..6f60cc64 100644
--- a/src/AaveV3Ethereum.sol
+++ b/src/AaveV3Ethereum.sol
@@ -874,6 +874,48 @@ library AaveV3EthereumAssets {
 
   // https://etherscan.io/address/0x54D612b000697bd8B0094889D7d6A92bA0Bf2DEa
   address internal constant sUSDe_STATA_TOKEN = 0x54D612b000697bd8B0094889D7d6A92bA0Bf2DEa;
+
+  // https://etherscan.io/address/0x18084fbA666a33d37592fA2633fD49a74DD93a88
+  address internal constant tBTC_UNDERLYING = 0x18084fbA666a33d37592fA2633fD49a74DD93a88;
+
+  uint8 internal constant tBTC_DECIMALS = 18;
+
+  // https://etherscan.io/address/0x10Ac93971cdb1F5c778144084242374473c350Da
+  address internal constant tBTC_A_TOKEN = 0x10Ac93971cdb1F5c778144084242374473c350Da;
+
+  // https://etherscan.io/address/0xAC50890a80A2731eb1eA2e9B4F29569CeB06D960
+  address internal constant tBTC_V_TOKEN = 0xAC50890a80A2731eb1eA2e9B4F29569CeB06D960;
+
+  // https://etherscan.io/address/0xCcf8413F9cA3bAE07EEF05E265D238d60abCb8Ca
+  address internal constant tBTC_S_TOKEN = 0xCcf8413F9cA3bAE07EEF05E265D238d60abCb8Ca;
+
+  // https://etherscan.io/address/0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c
+  address internal constant tBTC_ORACLE = 0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c;
+
+  // https://etherscan.io/address/0x847A3364Cc5fE389283bD821cfC8A477288D9e82
+  address internal constant tBTC_INTEREST_RATE_STRATEGY =
+    0x847A3364Cc5fE389283bD821cfC8A477288D9e82;
+
+  // https://etherscan.io/address/0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf
+  address internal constant cbBTC_UNDERLYING = 0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf;
+
+  uint8 internal constant cbBTC_DECIMALS = 8;
+
+  // https://etherscan.io/address/0x5c647cE0Ae10658ec44FA4E11A51c96e94efd1Dd
+  address internal constant cbBTC_A_TOKEN = 0x5c647cE0Ae10658ec44FA4E11A51c96e94efd1Dd;
+
+  // https://etherscan.io/address/0xeB284A70557EFe3591b9e6D9D720040E02c54a4d
+  address internal constant cbBTC_V_TOKEN = 0xeB284A70557EFe3591b9e6D9D720040E02c54a4d;
+
+  // https://etherscan.io/address/0x0002BfcCE657a4BEB498E23201bd767FC5A0A0d5
+  address internal constant cbBTC_S_TOKEN = 0x0002BfcCE657a4BEB498E23201bd767FC5A0A0d5;
+
+  // https://etherscan.io/address/0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c
+  address internal constant cbBTC_ORACLE = 0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c;
+
+  // https://etherscan.io/address/0x847A3364Cc5fE389283bD821cfC8A477288D9e82
+  address internal constant cbBTC_INTEREST_RATE_STRATEGY =
+    0x847A3364Cc5fE389283bD821cfC8A477288D9e82;
 }
 
 library AaveV3EthereumEModes {
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index e34dc998..420e3ad7 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -157,6 +157,15 @@ export const ASSETS = {
     ORACLE: '0xFc4d1d7a8FD1E6719e361e16044b460737F12C44',
     STATA_TOKEN: '0x588159E0d360ffAA978330812f9234818ab46E8E',
   },
+  cbBTC: {
+    decimals: 8,
+    UNDERLYING: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    A_TOKEN: '0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6',
+    S_TOKEN: '0x839A515eB049237a6D4978F1735a00608a5A857D',
+    V_TOKEN: '0x05e08702028de6AaD395DC6478b554a56920b9AD',
+    INTEREST_RATE_STRATEGY: '0x46Da028a47Ed58026aCbFbE91eeA51CcB062134E',
+    ORACLE: '0x64c911996D3c6aC71f9b455B1E8E7266BcbD848F',
+  },
 } as const;
 export const E_MODES = {
   NONE: 0,
diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts
index 3244440a..ad7e7137 100644
--- a/src/ts/AaveV3Ethereum.ts
+++ b/src/ts/AaveV3Ethereum.ts
@@ -421,6 +421,24 @@ export const ASSETS = {
     ORACLE: '0xb37aE8aBa6C0C1Bf2c509fc06E11aa4AF29B665A',
     STATA_TOKEN: '0x54D612b000697bd8B0094889D7d6A92bA0Bf2DEa',
   },
+  tBTC: {
+    decimals: 18,
+    UNDERLYING: '0x18084fbA666a33d37592fA2633fD49a74DD93a88',
+    A_TOKEN: '0x10Ac93971cdb1F5c778144084242374473c350Da',
+    S_TOKEN: '0xCcf8413F9cA3bAE07EEF05E265D238d60abCb8Ca',
+    V_TOKEN: '0xAC50890a80A2731eb1eA2e9B4F29569CeB06D960',
+    INTEREST_RATE_STRATEGY: '0x847A3364Cc5fE389283bD821cfC8A477288D9e82',
+    ORACLE: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c',
+  },
+  cbBTC: {
+    decimals: 8,
+    UNDERLYING: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    A_TOKEN: '0x5c647cE0Ae10658ec44FA4E11A51c96e94efd1Dd',
+    S_TOKEN: '0x0002BfcCE657a4BEB498E23201bd767FC5A0A0d5',
+    V_TOKEN: '0xeB284A70557EFe3591b9e6D9D720040E02c54a4d',
+    INTEREST_RATE_STRATEGY: '0x847A3364Cc5fE389283bD821cfC8A477288D9e82',
+    ORACLE: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c',
+  },
 } as const;
 export const E_MODES = {
   NONE: 0,
diff --git a/src/ts/tokenlist.ts b/src/ts/tokenlist.ts
index 5fb80cc6..3cc1131d 100644
--- a/src/ts/tokenlist.ts
+++ b/src/ts/tokenlist.ts
@@ -2717,6 +2717,46 @@ export const tokenlist = {
         underlyingAToken: '0x4579a27aF00A62C0EB156349f31B345c08386419',
       },
     },
+    {
+      chainId: 1,
+      address: '0x18084fbA666a33d37592fA2633fD49a74DD93a88',
+      name: 'tBTC v2',
+      decimals: 18,
+      symbol: 'tBTC',
+      tags: ['underlying'],
+    },
+    {
+      chainId: 1,
+      address: '0x10Ac93971cdb1F5c778144084242374473c350Da',
+      name: 'Aave Ethereum tBTC',
+      decimals: 18,
+      symbol: 'aEthtBTC',
+      tags: ['aTokenV3', 'aaveV3'],
+      extensions: {
+        pool: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2',
+        underlying: '0x18084fbA666a33d37592fA2633fD49a74DD93a88',
+      },
+    },
+    {
+      chainId: 1,
+      address: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+      name: 'Coinbase Wrapped BTC',
+      decimals: 8,
+      symbol: 'cbBTC',
+      tags: ['underlying'],
+    },
+    {
+      chainId: 1,
+      address: '0x5c647cE0Ae10658ec44FA4E11A51c96e94efd1Dd',
+      name: 'Aave Ethereum cbBTC',
+      decimals: 8,
+      symbol: 'aEthcbBTC',
+      tags: ['aTokenV3', 'aaveV3'],
+      extensions: {
+        pool: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2',
+        underlying: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+      },
+    },
     {
       chainId: 137,
       address: '0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE',
@@ -3990,6 +4030,26 @@ export const tokenlist = {
         underlyingAToken: '0x7C307e128efA31F540F2E2d976C995E0B65F51F6',
       },
     },
+    {
+      chainId: 8453,
+      address: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+      name: 'Coinbase Wrapped BTC',
+      decimals: 8,
+      symbol: 'cbBTC',
+      tags: ['underlying'],
+    },
+    {
+      chainId: 8453,
+      address: '0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6',
+      name: 'Aave Base cbBTC',
+      decimals: 8,
+      symbol: 'aBascbBTC',
+      tags: ['aTokenV3', 'aaveV3'],
+      extensions: {
+        pool: '0xA238Dd80C259a72e81d7e4664a9801593F98d1c5',
+        underlying: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+      },
+    },
     {
       chainId: 1088,
       address: '0x4c078361FC9BbB78DF910800A991C7c3DD2F6ce0',
@@ -6569,6 +6629,6 @@ export const tokenlist = {
       },
     },
   ],
-  version: {major: 3, minor: 0, patch: 41},
-  timestamp: '2024-09-21T00:12:26.510Z',
+  version: {major: 3, minor: 0, patch: 42},
+  timestamp: '2024-09-24T01:03:38.390Z',
 };
diff --git a/tokenlist.json b/tokenlist.json
index 6d1ba521..1291427d 100644
--- a/tokenlist.json
+++ b/tokenlist.json
@@ -2698,6 +2698,46 @@
         "underlyingAToken": "0x4579a27aF00A62C0EB156349f31B345c08386419"
       }
     },
+    {
+      "chainId": 1,
+      "address": "0x18084fbA666a33d37592fA2633fD49a74DD93a88",
+      "name": "tBTC v2",
+      "decimals": 18,
+      "symbol": "tBTC",
+      "tags": ["underlying"]
+    },
+    {
+      "chainId": 1,
+      "address": "0x10Ac93971cdb1F5c778144084242374473c350Da",
+      "name": "Aave Ethereum tBTC",
+      "decimals": 18,
+      "symbol": "aEthtBTC",
+      "tags": ["aTokenV3", "aaveV3"],
+      "extensions": {
+        "pool": "0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2",
+        "underlying": "0x18084fbA666a33d37592fA2633fD49a74DD93a88"
+      }
+    },
+    {
+      "chainId": 1,
+      "address": "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf",
+      "name": "Coinbase Wrapped BTC",
+      "decimals": 8,
+      "symbol": "cbBTC",
+      "tags": ["underlying"]
+    },
+    {
+      "chainId": 1,
+      "address": "0x5c647cE0Ae10658ec44FA4E11A51c96e94efd1Dd",
+      "name": "Aave Ethereum cbBTC",
+      "decimals": 8,
+      "symbol": "aEthcbBTC",
+      "tags": ["aTokenV3", "aaveV3"],
+      "extensions": {
+        "pool": "0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2",
+        "underlying": "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf"
+      }
+    },
     {
       "chainId": 137,
       "address": "0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE",
@@ -3940,6 +3980,26 @@
         "underlyingAToken": "0x7C307e128efA31F540F2E2d976C995E0B65F51F6"
       }
     },
+    {
+      "chainId": 8453,
+      "address": "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf",
+      "name": "Coinbase Wrapped BTC",
+      "decimals": 8,
+      "symbol": "cbBTC",
+      "tags": ["underlying"]
+    },
+    {
+      "chainId": 8453,
+      "address": "0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6",
+      "name": "Aave Base cbBTC",
+      "decimals": 8,
+      "symbol": "aBascbBTC",
+      "tags": ["aTokenV3", "aaveV3"],
+      "extensions": {
+        "pool": "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5",
+        "underlying": "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf"
+      }
+    },
     {
       "chainId": 1088,
       "address": "0x4c078361FC9BbB78DF910800A991C7c3DD2F6ce0",
@@ -6477,6 +6537,6 @@
       }
     }
   ],
-  "version": { "major": 3, "minor": 0, "patch": 41 },
-  "timestamp": "2024-09-21T00:12:26.510Z"
+  "version": { "major": 3, "minor": 0, "patch": 42 },
+  "timestamp": "2024-09-24T01:03:38.390Z"
 }