fix: Update guardians (#661)

* fix: Update guardians * fix: updated tests
bgd-labs · Oct 25, 2024 · 5d6bac1 · 5d6bac1
1 parent 178dd45
commit 5d6bac1
Show file tree

Hide file tree

Showing 74 changed files with 247 additions and 105 deletions.
diff --git a/safe.csv b/safe.csv
diff --git a/scripts/configs/governance/arbitrum.ts b/scripts/configs/governance/arbitrum.ts
@@ -9,5 +9,6 @@ export const governanceConfigArbitrum: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0x89644CA1bB8064760312AE4F03ea41b05dA3637C',
     PC_DATA_HELPER: '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A',
     GRANULAR_GUARDIAN: '0x4922093c476CfbCF903C7C4082d2D64bAE8A37cE',
+    GOVERNANCE_GUARDIAN: '0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b',
   },
 };
diff --git a/scripts/configs/governance/avalanche.ts b/scripts/configs/governance/avalanche.ts
@@ -22,5 +22,6 @@ export const governanceConfigAvalanche: GovernanceConfig = {
     PC_DATA_HELPER: '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A',
     VM_DATA_HELPER: '0x77976B51569896523EE215962Ee91ff236Fa50E8',
     GRANULAR_GUARDIAN: '0xc1162BCb2E5E3ca4725512008c7522dF8C8B7B65',
+    GOVERNANCE_GUARDIAN: '0x360c0a69Ed2912351227a0b745f890CB2eBDbcFe',
   },
 };
diff --git a/scripts/configs/governance/base.ts b/scripts/configs/governance/base.ts
@@ -9,5 +9,6 @@ export const governanceConfigBase: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0x2DC219E716793fb4b21548C0f009Ba3Af753ab01',
     PC_DATA_HELPER: '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A',
     GRANULAR_GUARDIAN: '0xa1c6aF35E0205f42256382C05243C543FEDBf4bB',
+    GOVERNANCE_GUARDIAN: '0x360c0a69Ed2912351227a0b745f890CB2eBDbcFe',
   },
 };
diff --git a/scripts/configs/governance/bnb.ts b/scripts/configs/governance/bnb.ts
@@ -10,5 +10,6 @@ export const governanceConfigBNB: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0xE5EF2Dd06755A97e975f7E282f828224F2C3e627',
     PC_DATA_HELPER: '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A',
     GRANULAR_GUARDIAN: '0xe4FB5e3F506BE0095f38004f993D16fdA8224383',
+    GOVERNANCE_GUARDIAN: '0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b',
   },
 };
diff --git a/scripts/configs/governance/ethereum.ts b/scripts/configs/governance/ethereum.ts
@@ -34,5 +34,6 @@ export const governanceConfigMainnet: GovernanceConfig = {
     EMERGENCY_REGISTRY: '0x73C6Fb358dDA8e84D50e98A98F7c0dF32e15C7e9',
     GOVERNANCE_POWER_STRATEGY: '0xa198Fac58E02A5C5F8F7e877895d50cFa9ad1E04',
     GRANULAR_GUARDIAN: '0x4457cA11E90f416Cc1D3a8E1cA41C0cdEcC251d4',
+    GOVERNANCE_GUARDIAN: '0xCe52ab41C40575B072A18C9700091Ccbe4A06710',
   },
 };
diff --git a/scripts/configs/governance/gnosis.ts b/scripts/configs/governance/gnosis.ts
@@ -10,5 +10,6 @@ export const governanceConfigGnosis: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0x9A1F491B86D09fC1484b5fab10041B189B60756b',
     PC_DATA_HELPER: '0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672',
     GRANULAR_GUARDIAN: '0x4A9F571E3C1f2F13567bb59e38988e74d7d72602',
+    GOVERNANCE_GUARDIAN: '0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b',
   },
 };
diff --git a/scripts/configs/governance/metis.ts b/scripts/configs/governance/metis.ts
@@ -9,5 +9,6 @@ export const governanceConfigMetis: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0x2233F8A66A728FBa6E1dC95570B25360D07D5524',
     PC_DATA_HELPER: '0x81d32B36380e6266e1BDd490eAC56cdB300afBe0',
     GRANULAR_GUARDIAN: '0x61BE97d3a0550549f67CA7421725fA73Fa2036B5',
+    GOVERNANCE_GUARDIAN: '0x360c0a69Ed2912351227a0b745f890CB2eBDbcFe',
   },
 };
diff --git a/scripts/configs/governance/optimism.ts b/scripts/configs/governance/optimism.ts
@@ -9,5 +9,6 @@ export const governanceConfigOptimism: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4',
     PC_DATA_HELPER: '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A',
     GRANULAR_GUARDIAN: '0x6c5264C380C7022e54f585c4E354ffb6f221a03b',
+    GOVERNANCE_GUARDIAN: '0x360c0a69Ed2912351227a0b745f890CB2eBDbcFe',
   },
 };
diff --git a/scripts/configs/governance/polygon.ts b/scripts/configs/governance/polygon.ts
@@ -12,5 +12,6 @@ export const governanceConfigPolygon: GovernanceConfig = {
     PC_DATA_HELPER: '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A',
     VM_DATA_HELPER: '0x77976B51569896523EE215962Ee91ff236Fa50E8',
     GRANULAR_GUARDIAN: '0x0D2CccD3dD420dC6DE2f24DB44aA22fADE290a02',
+    GOVERNANCE_GUARDIAN: '0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b',
   },
 };
diff --git a/scripts/configs/governance/scroll.ts b/scripts/configs/governance/scroll.ts
@@ -9,5 +9,6 @@ export const governanceConfigScroll: GovernanceConfig = {
     PAYLOADS_CONTROLLER: '0x6b6B41c0f8C223715f712BE83ceC3c37bbfDC3fE',
     PC_DATA_HELPER: '0xf438e33dCCEE260ee4371F9dceF408b0d7DBe424',
     GRANULAR_GUARDIAN: '0xa835707d28e6C37C49d661742f2Fb5987367cEd4',
+    GOVERNANCE_GUARDIAN: '0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b',
   },
 };
diff --git a/scripts/configs/networks/arbitrum.ts b/scripts/configs/networks/arbitrum.ts
@@ -15,7 +15,7 @@ export const arbitrumAddresses: NetworkAddresses<{
     PROXY_ADMIN: '0xD3cF979e676265e4f6379749DECe4708B9A22476',
     CREATE_3_FACTORY: '0x3b56998Ec06477704622ca8e2eA1b4db134cec32',
     AAVE_CL_ROBOT_OPERATOR: '0xaa944aD95e51CB83C1f35FAEEDfC7d2c31B0BB4d',
-    PROTOCOL_GUARDIAN: '0xbbd9f90699c1fa0d7a65870d241dd1f1217c96eb',
+    PROTOCOL_GUARDIAN: '0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6',
     wstETH_stETH_AGGREGATOR: '0xB1552C5e96B312d0Bf8b554186F846C40614a540',
     rETH_ETH_AGGREGATOR: '0xF3272CAfe65b190e76caAF483db13424a3e23dD2',
     GHO_CCIP_TOKEN_POOL: '0xF168B83598516A532a85995b52504a2Fa058C068',

diff --git a/scripts/configs/networks/avalanche.ts b/scripts/configs/networks/avalanche.ts
@@ -10,7 +10,7 @@ export const avalancheAddresses: NetworkAddresses = {
     PROXY_ADMIN: '0xD3cF979e676265e4f6379749DECe4708B9A22476',
     CREATE_3_FACTORY: '0x3b56998Ec06477704622ca8e2eA1b4db134cec32',
     AAVE_CL_ROBOT_OPERATOR: '0x06d958772304e7220fc3E463756CE01Ed0D24db2',
-    PROTOCOL_GUARDIAN: '0xa35b76E4935449E33C56aB24b23fcd3246f13470',
+    PROTOCOL_GUARDIAN: '0x56C1a4b54921DEA9A344967a8693C7E661D72968',
     AAVE_MERKLE_DISTRIBUTOR: '0xA065d5A299E618CD84a87641d5eEbC7916Fdf32E',
   },
 };

diff --git a/scripts/configs/networks/base.ts b/scripts/configs/networks/base.ts
@@ -15,7 +15,7 @@ export const baseAddresses: NetworkAddresses<{
     PROXY_ADMIN: '0xc85b1E333aecc99340b2320493Fe2d22b8734795',
     CREATE_3_FACTORY: '0x3b56998Ec06477704622ca8e2eA1b4db134cec32',
     AAVE_CL_ROBOT_OPERATOR: '0x88db99eeBb390a2a4DcAC2E1DDb09c07E911C5C3',
-    PROTOCOL_GUARDIAN: '0x9e10C0A1Eb8FF6a0AaA53a62C7a338f35D7D9a2A',
+    PROTOCOL_GUARDIAN: '0x56C1a4b54921DEA9A344967a8693C7E661D72968',
     wstETH_stETH_AGGREGATOR: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061',
     cbETH_ETH_AGGREGATOR: '0x868a501e68F3D1E89CfC0D22F6b22E8dabce5F04',
     LEGACY_BRIDGE_EXECUTOR: '0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45',

diff --git a/scripts/configs/networks/bnb.ts b/scripts/configs/networks/bnb.ts
@@ -6,7 +6,7 @@ export const bnbAddresses: NetworkAddresses = {
   chainId: ChainId.bnb,
   addresses: {
     TRANSPARENT_PROXY_FACTORY: '0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A',
-    PROTOCOL_GUARDIAN: '0x25170e9Ed4077ABA7D3DD03cf4A9F45Dc6D0fcCD',
+    PROTOCOL_GUARDIAN: '0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6',
     PARASWAP_FEE_CLAIMER: '0xAe940e61E9863178b71500c9B5faE2a04Da361a1',
     PROXY_ADMIN: '0x39EBFfc7679c62Dfcc4A3E2c09Bcb0be255Ae63c',
     CREATE_3_FACTORY: '0x3b56998Ec06477704622ca8e2eA1b4db134cec32',

diff --git a/scripts/configs/networks/ethereum.ts b/scripts/configs/networks/ethereum.ts
@@ -33,7 +33,7 @@ export const ethereumAddresses: NetworkAddresses<{
     PROXY_ADMIN: '0xD3cF979e676265e4f6379749DECe4708B9A22476',
     CREATE_3_FACTORY: '0xcc3C54B95f3f1867A43009B80ed4DD930E3cE2F7',
     AAVE_CL_ROBOT_OPERATOR: '0x1cDF8879eC8bE012bA959EB515b11008E0cb6323',
-    PROTOCOL_GUARDIAN: '0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633',
+    PROTOCOL_GUARDIAN: '0x2CFe3ec4d5a6811f4B8067F0DE7e47DfA938Aa30',
     AAVE_MERKLE_DISTRIBUTOR: '0xa88c6D90eAe942291325f9ae3c66f3563B93FE10',
     GHO_TOKEN: '0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f',
     GHO_FLASHMINTER_FACILITATOR: '0xb639D208Bcf0589D54FaC24E655C79EC529762B8',

diff --git a/scripts/configs/networks/gnosis.ts b/scripts/configs/networks/gnosis.ts
@@ -9,7 +9,7 @@ export const gnosisAddresses: NetworkAddresses<{wstETH_stETH_AGGREGATOR: Hex}> =
     TRANSPARENT_PROXY_FACTORY: '0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A',
     PROXY_ADMIN: '0xe892E40C92c2E4D281Be59b2E6300F271d824E75',
     CREATE_3_FACTORY: '0x2cC41488f4494c5e11cB6cbA82199442B9f495B6',
-    PROTOCOL_GUARDIAN: '0xF163b8698821cefbD33Cf449764d69Ea445cE23D',
+    PROTOCOL_GUARDIAN: '0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6',
     wstETH_stETH_AGGREGATOR: '0x0064AC007fF665CF8D0D3Af5E0AD1c26a3f853eA',
   },
 };
diff --git a/scripts/configs/networks/metis.ts b/scripts/configs/networks/metis.ts
@@ -11,7 +11,7 @@ export const metisAddresses: NetworkAddresses<{
     TRANSPARENT_PROXY_FACTORY: '0x1dad86dC5990BCE5bFe3A150A4E0ece990d6EBcB',
     PROXY_ADMIN: '0x1CabD986cBAbDf12E00128DFf03C80ee62C4fd97',
     CREATE_3_FACTORY: '0x2e649f6b54B07E210b31c9cC2eB8a0d5997c3D4A',
-    PROTOCOL_GUARDIAN: '0xF6Db48C5968A9eBCB935786435530f28e32Cc501',
+    PROTOCOL_GUARDIAN: '0x56C1a4b54921DEA9A344967a8693C7E661D72968',
     LEGACY_BRIDGE_EXECUTOR: '0x8EC77963068474a45016938Deb95E603Ca82a029',
   },
 };
diff --git a/scripts/configs/networks/optimism.ts b/scripts/configs/networks/optimism.ts
@@ -15,7 +15,7 @@ export const optimismAddresses: NetworkAddresses<{
     PROXY_ADMIN: '0xD3cF979e676265e4f6379749DECe4708B9A22476',
     CREATE_3_FACTORY: '0x3b56998Ec06477704622ca8e2eA1b4db134cec32',
     AAVE_CL_ROBOT_OPERATOR: '0x55Cf9583D7D30DC4936bAee1f747591dBECe5df7',
-    PROTOCOL_GUARDIAN: '0xe50c8c619d05ff98b22adf991f17602c774f785c',
+    PROTOCOL_GUARDIAN: '0x56C1a4b54921DEA9A344967a8693C7E661D72968',
     AAVE_MERKLE_DISTRIBUTOR: '0x1685D81212580DD4cDA287616C2f6F4794927e18',
     wstETH_stETH_AGGREGATOR: '0xe59EBa0D492cA53C6f46015EEa00517F2707dc77',
     rETH_ETH_AGGREGATOR: '0x22F3727be377781d1579B7C9222382b21c9d1a8f',

diff --git a/scripts/configs/networks/polygon.ts b/scripts/configs/networks/polygon.ts
@@ -18,7 +18,7 @@ export const polygonAddresses: NetworkAddresses<{
     PROXY_ADMIN: '0xD3cF979e676265e4f6379749DECe4708B9A22476',
     CREATE_3_FACTORY: '0x3b56998Ec06477704622ca8e2eA1b4db134cec32',
     AAVE_CL_ROBOT_OPERATOR: '0xB4C212f5cD17E200019b07e6B1fDf124d35DBCf5',
-    PROTOCOL_GUARDIAN: '0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58',
+    PROTOCOL_GUARDIAN: '0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6',
     AAVE_MERKLE_DISTRIBUTOR: '0x7A9ff54A6eE4a21223036890bB8c4ea2D62c686b',
     wstETH_stETH_AGGREGATOR: '0x3Ea1eC855fBda8bA0396975eC260AD2e9B2Bc01c',
     MaticX_RATE_PROVIDER: '0xeE652bbF72689AA59F0B8F981c9c90e2A8Af8d8f',

diff --git a/scripts/configs/networks/scroll.ts b/scripts/configs/networks/scroll.ts
@@ -11,7 +11,7 @@ export const scrollAddresses: NetworkAddresses<{
     TRANSPARENT_PROXY_FACTORY: '0xFa2eeb2d0054C3Db2A606E2cd9EE111b62707D1e',
     PROXY_ADMIN: '0x782559e349b084bB7C07c08404aE6E3436cDAE2E',
     CREATE_3_FACTORY: '0xC6f44D0daC966658Db36742f5153bDa0EBbb45ab',
-    PROTOCOL_GUARDIAN: '0x63B20270b695E44Ac94Ad7592D5f81E3575b93e7',
+    PROTOCOL_GUARDIAN: '0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6',
     wstETH_stETH_AGGREGATOR: '0xE61Da4C909F7d86797a0D06Db63c34f76c9bCBDC',
   },
 };
diff --git a/src/AaveV2Avalanche.sol b/src/AaveV2Avalanche.sol
@@ -41,8 +41,8 @@ library AaveV2Avalanche {
   // https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
   address internal constant POOL_ADMIN = 0x3C06dce358add17aAf230f2234bCCC4afd50d090;
 
-  // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
-  address internal constant EMERGENCY_ADMIN = 0xa35b76E4935449E33C56aB24b23fcd3246f13470;
+  // https://snowtrace.io/address/0x56C1a4b54921DEA9A344967a8693C7E661D72968
+  address internal constant EMERGENCY_ADMIN = 0x56C1a4b54921DEA9A344967a8693C7E661D72968;
 
   // https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
   ICollector internal constant COLLECTOR = ICollector(0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0);

diff --git a/src/AaveV2Ethereum.sol b/src/AaveV2Ethereum.sol
@@ -41,8 +41,8 @@ library AaveV2Ethereum {
   // https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
   address internal constant POOL_ADMIN = 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A;
 
-  // https://etherscan.io/address/0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633
-  address internal constant EMERGENCY_ADMIN = 0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633;
+  // https://etherscan.io/address/0x2CFe3ec4d5a6811f4B8067F0DE7e47DfA938Aa30
+  address internal constant EMERGENCY_ADMIN = 0x2CFe3ec4d5a6811f4B8067F0DE7e47DfA938Aa30;
 
   // https://etherscan.io/address/0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c
   ICollector internal constant COLLECTOR = ICollector(0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c);

diff --git a/src/AaveV2EthereumAMM.sol b/src/AaveV2EthereumAMM.sol
@@ -41,8 +41,8 @@ library AaveV2EthereumAMM {
   // https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
   address internal constant POOL_ADMIN = 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A;
 
-  // https://etherscan.io/address/0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633
-  address internal constant EMERGENCY_ADMIN = 0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633;
+  // https://etherscan.io/address/0x2CFe3ec4d5a6811f4B8067F0DE7e47DfA938Aa30
+  address internal constant EMERGENCY_ADMIN = 0x2CFe3ec4d5a6811f4B8067F0DE7e47DfA938Aa30;
 
   // https://etherscan.io/address/0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c
   ICollector internal constant COLLECTOR = ICollector(0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c);

diff --git a/src/AaveV2Polygon.sol b/src/AaveV2Polygon.sol
@@ -41,8 +41,8 @@ library AaveV2Polygon {
   // https://polygonscan.com/address/0xDf7d0e6454DB638881302729F5ba99936EaAB233
   address internal constant POOL_ADMIN = 0xDf7d0e6454DB638881302729F5ba99936EaAB233;
 
-  // https://polygonscan.com/address/0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58
-  address internal constant EMERGENCY_ADMIN = 0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58;
+  // https://polygonscan.com/address/0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6
+  address internal constant EMERGENCY_ADMIN = 0xCb45E82419baeBCC9bA8b1e5c7858e48A3B26Ea6;
 
   // https://polygonscan.com/address/0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383
   ICollector internal constant COLLECTOR = ICollector(0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383);
@@ -105,8 +105,8 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0x08EDd9E1DF3b0b8498864C60a2FD6cDb13148885
   address internal constant DAI_ORACLE = 0x08EDd9E1DF3b0b8498864C60a2FD6cDb13148885;
 
-  // https://polygonscan.com/address/0x5c9B09Bb260BCa51f4C5476013eE5949F2C4f397
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0x5c9B09Bb260BCa51f4C5476013eE5949F2C4f397;
+  // https://polygonscan.com/address/0xDa6b70b725404A0c6bb116B1584fb88Eb7d7ED6d
+  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xDa6b70b725404A0c6bb116B1584fb88Eb7d7ED6d;
 
   // https://polygonscan.com/address/0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174
   address internal constant USDC_UNDERLYING = 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174;
@@ -122,9 +122,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xB611AA5E98112C7c3711Ca3a5187dC025B83C8e4
   address internal constant USDC_ORACLE = 0xB611AA5E98112C7c3711Ca3a5187dC025B83C8e4;
 
-  // https://polygonscan.com/address/0xf98258ea0C095157c2c390E9f6d914847d7fbACf
+  // https://polygonscan.com/address/0x4309B0d719a0Dfb526EE9C0E58b77635B2971cC4
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0xf98258ea0C095157c2c390E9f6d914847d7fbACf;
+    0x4309B0d719a0Dfb526EE9C0E58b77635B2971cC4;
 
   // https://polygonscan.com/address/0xc2132D05D31c914a87C6611C10748AEb04B58e8F
   address internal constant USDT_UNDERLYING = 0xc2132D05D31c914a87C6611C10748AEb04B58e8F;
@@ -140,9 +140,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xf840c80932908EF206056dF0882bC595e7150607
   address internal constant USDT_ORACLE = 0xf840c80932908EF206056dF0882bC595e7150607;
 
-  // https://polygonscan.com/address/0xDC220F1d8EA6910BDBbb48c4AdFb7cE565500D08
+  // https://polygonscan.com/address/0xAb85FD7DCBFdD40e822321DAc4D5fD3cf08b2542
   address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0xDC220F1d8EA6910BDBbb48c4AdFb7cE565500D08;
+    0xAb85FD7DCBFdD40e822321DAc4D5fD3cf08b2542;
 
   // https://polygonscan.com/address/0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6
   address internal constant WBTC_UNDERLYING = 0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6;
@@ -158,9 +158,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xA338e0492B2F944E9F8C0653D3AD1484f2657a37
   address internal constant WBTC_ORACLE = 0xA338e0492B2F944E9F8C0653D3AD1484f2657a37;
 
-  // https://polygonscan.com/address/0xbbEA829b9E104733Cf69b6e96E7Ff810cBcfae38
+  // https://polygonscan.com/address/0x3465528BE493a61629234C259b62b9539817d8e7
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
-    0xbbEA829b9E104733Cf69b6e96E7Ff810cBcfae38;
+    0x3465528BE493a61629234C259b62b9539817d8e7;
 
   // https://polygonscan.com/address/0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619
   address internal constant WETH_UNDERLYING = 0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619;
@@ -173,9 +173,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xeDe17e9d79fc6f9fF9250D9EEfbdB88Cc18038b5
   address internal constant WETH_V_TOKEN = 0xeDe17e9d79fc6f9fF9250D9EEfbdB88Cc18038b5;
 
-  // https://polygonscan.com/address/0x9C9f4C39952848FBA513d44B356c7855F504B1cd
+  // https://polygonscan.com/address/0xd141820D89840C9A3b0AE46c041D70B98F15928F
   address internal constant WETH_INTEREST_RATE_STRATEGY =
-    0x9C9f4C39952848FBA513d44B356c7855F504B1cd;
+    0xd141820D89840C9A3b0AE46c041D70B98F15928F;
 
   // https://polygonscan.com/address/0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270
   address internal constant WPOL_UNDERLYING = 0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270;
@@ -191,9 +191,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0x327e23A4855b6F663a28c5161541d69Af8973302
   address internal constant WPOL_ORACLE = 0x327e23A4855b6F663a28c5161541d69Af8973302;
 
-  // https://polygonscan.com/address/0x79715aB77F637C95a8c28804F56f98946B332851
+  // https://polygonscan.com/address/0xAF5917cFc2F376eCD6c4df91C9AC5965Beaf5AfA
   address internal constant WPOL_INTEREST_RATE_STRATEGY =
-    0x79715aB77F637C95a8c28804F56f98946B332851;
+    0xAF5917cFc2F376eCD6c4df91C9AC5965Beaf5AfA;
 
   // https://polygonscan.com/address/0xD6DF932A45C0f255f85145f286eA0b292B21C90B
   address internal constant AAVE_UNDERLYING = 0xD6DF932A45C0f255f85145f286eA0b292B21C90B;

diff --git a/src/AaveV3BaseSepolia.sol b/src/AaveV3BaseSepolia.sol
@@ -131,6 +131,27 @@ library AaveV3BaseSepoliaAssets {
   // https://sepolia.basescan.org/address/0xff1DB744F1275f8e04A62A7E5D663575F3a774B6
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xff1DB744F1275f8e04A62A7E5D663575F3a774B6;
+
+  // https://sepolia.basescan.org/address/0x3e138010792d63e4af70dD7F2401C9cdE0eaf3C8
+  address internal constant USDX_UNDERLYING = 0x3e138010792d63e4af70dD7F2401C9cdE0eaf3C8;
+
+  uint8 internal constant USDX_DECIMALS = 18;
+
+  // https://sepolia.basescan.org/address/0x7E60de07156fdA16A74F3700725e2bbB5CFC8CB8
+  address internal constant USDX_A_TOKEN = 0x7E60de07156fdA16A74F3700725e2bbB5CFC8CB8;
+
+  // https://sepolia.basescan.org/address/0xed47C3087a7B41a4F2cA93747DDDc368f8EcDE47
+  address internal constant USDX_V_TOKEN = 0xed47C3087a7B41a4F2cA93747DDDc368f8EcDE47;
+
+  // https://sepolia.basescan.org/address/0xd30e2101a97dcbAeBCBC04F14C3f624E67A35165
+  address internal constant USDX_ORACLE = 0xd30e2101a97dcbAeBCBC04F14C3f624E67A35165;
+
+  // https://sepolia.basescan.org/address/0xff1DB744F1275f8e04A62A7E5D663575F3a774B6
+  address internal constant USDX_INTEREST_RATE_STRATEGY =
+    0xff1DB744F1275f8e04A62A7E5D663575F3a774B6;
+
+  // https://sepolia.basescan.org/address/0xb17966889E3D914CCf9A11bA0Fd71870B03727AF
+  address internal constant USDX_STATA_TOKEN = 0xb17966889E3D914CCf9A11bA0Fd71870B03727AF;
 }
 
 library AaveV3BaseSepoliaEModes {

diff --git a/src/AaveV3Fuji.sol b/src/AaveV3Fuji.sol
@@ -128,6 +128,27 @@ library AaveV3FujiAssets {
   // https://testnet.snowtrace.io/address/0xd5DDE725b0A2dE43fBDb4E488A7fdA389210d461
   address internal constant WAVAX_INTEREST_RATE_STRATEGY =
     0xd5DDE725b0A2dE43fBDb4E488A7fdA389210d461;
+
+  // https://testnet.snowtrace.io/address/0x22913D4E21D44EF7662B118A6540450e25fE09a9
+  address internal constant USDX_UNDERLYING = 0x22913D4E21D44EF7662B118A6540450e25fE09a9;
+
+  uint8 internal constant USDX_DECIMALS = 18;
+
+  // https://testnet.snowtrace.io/address/0x687b7a6Ea699E0652552Cd8C86aA764eF33f285d
+  address internal constant USDX_A_TOKEN = 0x687b7a6Ea699E0652552Cd8C86aA764eF33f285d;
+
+  // https://testnet.snowtrace.io/address/0x8ECa241b42f89EcA1F790A1Bd908a0F73F8e1A11
+  address internal constant USDX_V_TOKEN = 0x8ECa241b42f89EcA1F790A1Bd908a0F73F8e1A11;
+
+  // https://testnet.snowtrace.io/address/0x97FE42a7E96640D932bbc0e1580c73E705A8EB73
+  address internal constant USDX_ORACLE = 0x97FE42a7E96640D932bbc0e1580c73E705A8EB73;
+
+  // https://testnet.snowtrace.io/address/0xd5DDE725b0A2dE43fBDb4E488A7fdA389210d461
+  address internal constant USDX_INTEREST_RATE_STRATEGY =
+    0xd5DDE725b0A2dE43fBDb4E488A7fdA389210d461;
+
+  // https://testnet.snowtrace.io/address/0x17Bb5B12D6716FC96565dB996DAFC7F7a731731F
+  address internal constant USDX_STATA_TOKEN = 0x17Bb5B12D6716FC96565dB996DAFC7F7a731731F;
 }
 
 library AaveV3FujiEModes {

diff --git a/src/GovernanceV3Arbitrum.sol b/src/GovernanceV3Arbitrum.sol
@@ -18,6 +18,9 @@ library GovernanceV3Arbitrum {
   // https://arbiscan.io/address/0x4922093c476CfbCF903C7C4082d2D64bAE8A37cE
   address internal constant GRANULAR_GUARDIAN = 0x4922093c476CfbCF903C7C4082d2D64bAE8A37cE;
 
+  // https://arbiscan.io/address/0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b
+  address internal constant GOVERNANCE_GUARDIAN = 0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b;
+
   // https://arbiscan.io/address/0xFF1137243698CaA18EE364Cc966CF0e02A4e6327
   address internal constant EXECUTOR_LVL_1 = 0xFF1137243698CaA18EE364Cc966CF0e02A4e6327;
 }