Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GHO CCIP & GSM Stewards #815

Merged
merged 4 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions safe.csv
Original file line number Diff line number Diff line change
Expand Up @@ -768,8 +768,12 @@ address,name,chainId
0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2,AaveV3EthereumLido WALLET_BALANCE_PROVIDER,1
0x0B8C700917a6991FEa7198dDFC80bc8962b5055D,AaveV3EthereumLido WETH_GATEWAY,1
0x43eDB797834151D041619EEF833Edc784B509dAE,AaveV3EthereumLido WITHDRAW_SWAP_ADAPTER,1
0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34,GhoEthereum GHO_AAVE_CORE_STEWARD,1
0x46Aa1063e5265b43663E81329333B47c517A5409,GhoEthereum GHO_BUCKET_STEWARD,1
0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39,GhoEthereum GHO_CCIP_STEWARD,1
0x06179f7C1be40863405f374E7f5F8806c728660A,GhoEthereum GHO_CCIP_TOKEN_POOL,1
0xb639D208Bcf0589D54FaC24E655C79EC529762B8,GhoEthereum GHO_FLASHMINTER_FACILITATOR,1
0xD1E856a947CdF56b4f000ee29d34F5808E0A6848,GhoEthereum GHO_GSM_STEWARD,1
0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b,GhoEthereum GHO_LIQUIDITY_COMMITTEE,1
0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f,GhoEthereum GHO_TOKEN,1
0x167527DB01325408696326e3580cd8e55D99Dc1A,GhoEthereum GSM_REGISTRY,1
Expand Down Expand Up @@ -1859,7 +1863,11 @@ address,name,chainId
0xBc790382B3686abffE4be14A030A96aC6154023a,AaveV3Arbitrum WALLET_BALANCE_PROVIDER,42161
0x5760E34c4003752329bC77790B1De44C2799F8C3,AaveV3Arbitrum WETH_GATEWAY,42161
0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9,AaveV3Arbitrum WITHDRAW_SWAP_ADAPTER,42161
0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De,GhoArbitrum GHO_AAVE_CORE_STEWARD,42161
0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2,GhoArbitrum GHO_BUCKET_STEWARD,42161
0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db,GhoArbitrum GHO_CCIP_STEWARD,42161
0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB,GhoArbitrum GHO_CCIP_TOKEN_POOL,42161
0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33,GhoArbitrum GHO_TOKEN,42161
0xCbFB78a3Eeaa611b826E37c80E4126c8787D29f0,GovernanceV3Arbitrum CROSS_CHAIN_CONTROLLER,42161
0xFF1137243698CaA18EE364Cc966CF0e02A4e6327,GovernanceV3Arbitrum EXECUTOR_LVL_1,42161
0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b,GovernanceV3Arbitrum GOVERNANCE_GUARDIAN,42161
Expand Down
4 changes: 4 additions & 0 deletions scripts/configs/gho/arbitrum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ export const ghoArbitrum: GhoAddresses = {
name: 'Arbitrum',
chainId: ChainId.arbitrum,
addresses: {
GHO_TOKEN: '0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33',
GHO_CCIP_TOKEN_POOL: '0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB',
DhairyaSethi marked this conversation as resolved.
Show resolved Hide resolved
GHO_AAVE_CORE_STEWARD: '0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De',
GHO_BUCKET_STEWARD: '0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2',
GHO_CCIP_STEWARD: '0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db',
},
};
4 changes: 4 additions & 0 deletions scripts/configs/gho/ethereum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const ghoEthereum: GhoAddresses = {
GHO_CCIP_TOKEN_POOL: '0x06179f7C1be40863405f374E7f5F8806c728660A',
GHO_FLASHMINTER_FACILITATOR: '0xb639D208Bcf0589D54FaC24E655C79EC529762B8',
GHO_LIQUIDITY_COMMITTEE: '0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b',
GHO_GSM_STEWARD: '0xD1E856a947CdF56b4f000ee29d34F5808E0A6848',
// TODO: perhaps makes sense to create a generator for GSM to automatically pull GSMs, for now let's see how this evolves
GSM_REGISTRY: '0x167527DB01325408696326e3580cd8e55D99Dc1A',
GSM_USDC: '0x0d8eFfC11dF3F229AA1EA0509BC9DFa632A13578',
Expand All @@ -19,5 +20,8 @@ export const ghoEthereum: GhoAddresses = {
GSM_USDT_PRICE_STRATEGY: '0x4c707764cbFB4FFa078e169e6b8A6AdbE7526a2c',
GSM_USDC_ORACLE_SWAP_FREEZER: '0xef6beCa8D9543eC007bceA835aF768B58F730C1f',
GSM_USDT_ORACLE_SWAP_FREEZER: '0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5',
GHO_AAVE_CORE_STEWARD: '0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34',
GHO_BUCKET_STEWARD: '0x46Aa1063e5265b43663E81329333B47c517A5409',
GHO_CCIP_STEWARD: '0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39',
DhairyaSethi marked this conversation as resolved.
Show resolved Hide resolved
},
};
12 changes: 12 additions & 0 deletions src/GhoArbitrum.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
pragma solidity >=0.6.0;

library GhoArbitrum {
// https://arbiscan.io/address/0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33
address internal constant GHO_TOKEN = 0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33;

// https://arbiscan.io/address/0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB
address internal constant GHO_CCIP_TOKEN_POOL = 0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB;

// https://arbiscan.io/address/0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De
address internal constant GHO_AAVE_CORE_STEWARD = 0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De;

// https://arbiscan.io/address/0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2
address internal constant GHO_BUCKET_STEWARD = 0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2;

// https://arbiscan.io/address/0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db
address internal constant GHO_CCIP_STEWARD = 0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db;
}
12 changes: 12 additions & 0 deletions src/GhoEthereum.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ library GhoEthereum {
// https://etherscan.io/address/0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b
address internal constant GHO_LIQUIDITY_COMMITTEE = 0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b;

// https://etherscan.io/address/0xD1E856a947CdF56b4f000ee29d34F5808E0A6848
address internal constant GHO_GSM_STEWARD = 0xD1E856a947CdF56b4f000ee29d34F5808E0A6848;

// https://etherscan.io/address/0x167527DB01325408696326e3580cd8e55D99Dc1A
address internal constant GSM_REGISTRY = 0x167527DB01325408696326e3580cd8e55D99Dc1A;

Expand Down Expand Up @@ -44,4 +47,13 @@ library GhoEthereum {
// https://etherscan.io/address/0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5
address internal constant GSM_USDT_ORACLE_SWAP_FREEZER =
0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5;

// https://etherscan.io/address/0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34
address internal constant GHO_AAVE_CORE_STEWARD = 0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34;

// https://etherscan.io/address/0x46Aa1063e5265b43663E81329333B47c517A5409
address internal constant GHO_BUCKET_STEWARD = 0x46Aa1063e5265b43663E81329333B47c517A5409;

// https://etherscan.io/address/0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39
address internal constant GHO_CCIP_STEWARD = 0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39;
}
12 changes: 12 additions & 0 deletions src/ts/GhoArbitrum.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
// https://arbiscan.io/address/0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33
export const GHO_TOKEN = '0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33';

// https://arbiscan.io/address/0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB
export const GHO_CCIP_TOKEN_POOL = '0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB';

// https://arbiscan.io/address/0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De
export const GHO_AAVE_CORE_STEWARD = '0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De';

// https://arbiscan.io/address/0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2
export const GHO_BUCKET_STEWARD = '0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2';

// https://arbiscan.io/address/0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db
export const GHO_CCIP_STEWARD = '0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db';

export const CHAIN_ID = 42161;
12 changes: 12 additions & 0 deletions src/ts/GhoEthereum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export const GHO_FLASHMINTER_FACILITATOR = '0xb639D208Bcf0589D54FaC24E655C79EC52
// https://etherscan.io/address/0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b
export const GHO_LIQUIDITY_COMMITTEE = '0xA1c93D2687f7014Aaf588c764E3Ce80aF016229b';

// https://etherscan.io/address/0xD1E856a947CdF56b4f000ee29d34F5808E0A6848
export const GHO_GSM_STEWARD = '0xD1E856a947CdF56b4f000ee29d34F5808E0A6848';

// https://etherscan.io/address/0x167527DB01325408696326e3580cd8e55D99Dc1A
export const GSM_REGISTRY = '0x167527DB01325408696326e3580cd8e55D99Dc1A';

Expand Down Expand Up @@ -38,4 +41,13 @@ export const GSM_USDC_ORACLE_SWAP_FREEZER = '0xef6beCa8D9543eC007bceA835aF768B58
// https://etherscan.io/address/0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5
export const GSM_USDT_ORACLE_SWAP_FREEZER = '0x71381e6718b37C12155CB961Ca3D374A8BfFa0e5';

// https://etherscan.io/address/0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34
export const GHO_AAVE_CORE_STEWARD = '0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34';

// https://etherscan.io/address/0x46Aa1063e5265b43663E81329333B47c517A5409
export const GHO_BUCKET_STEWARD = '0x46Aa1063e5265b43663E81329333B47c517A5409';

// https://etherscan.io/address/0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39
export const GHO_CCIP_STEWARD = '0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39';

export const CHAIN_ID = 1;
23 changes: 22 additions & 1 deletion tests/cache/verified.json
Original file line number Diff line number Diff line change
Expand Up @@ -2375,6 +2375,18 @@
},
"0x68aeB290C7727D899B47c56d1c96AEAC475cD0dD": {
"name": "InitializableImmutableAdminUpgradeabilityProxy"
},
"0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34": {
"name": "GhoAaveSteward"
},
"0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39": {
"name": "GhoCcipSteward"
},
"0x46Aa1063e5265b43663E81329333B47c517A5409": {
"name": "GhoBucketSteward"
},
"0xD1E856a947CdF56b4f000ee29d34F5808E0A6848": {
"name": "GhoGsmSteward"
}
},
"10": {
Expand Down Expand Up @@ -5832,6 +5844,15 @@
},
"0xEB0682d148e874553008730f0686ea89db7DA412": {
"name": "TransparentProxyFactory"
},
"0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De": {
"name": "GhoAaveSteward"
},
"0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2": {
"name": "GhoBucketSteward"
},
"0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db": {
"name": "GhoCcipSteward"
}
},
"43113": {
Expand Down Expand Up @@ -7118,4 +7139,4 @@
"name": "TransparentProxyFactory"
}
}
}
}