diff --git a/active_contracts.json b/active_contracts.json index 4c8d34b11..a6238a7f9 100644 --- a/active_contracts.json +++ b/active_contracts.json @@ -115,7 +115,7 @@ "admin-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", "multisig-repo": "0x9e7956C8758470dE159481e5DD0d08F8B59217A2", "multisig-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3" - }, + }, "sepolia": { "managingDAO": "0xCa834B3F404c97273f34e108029eEd776144d324", "managingDAO_Implementation": "0x57e24f85ceacda3ef4f0fd04005589b88dc01a19", @@ -156,7 +156,7 @@ }, "goerli": { "managingDAO": "0xB76F8d3512497040a96E77141c951a5374F24Eb9", - "managingDAO_Implementation" :"0x53d483975773a2a9e5d9e84d9cd42cee85e90d97", + "managingDAO_Implementation": "0x53d483975773a2a9e5d9e84d9cd42cee85e90d97", "DAO_ENSSubdomainRegistrar_Implementation": "0x394B49Cc32Dc81B8EaCdeb62A6Fa66F31D1D022c", "DAO_ENSSubdomainRegistrar": "0xC62820f3E74cC82F89100032Ad7F04682F9EdaE0", "Plugin_ENSSubdomainRegistrar_Implementation": "0xbcE9b6fE957464aF2B739337bd1a936EbFCB5B48", @@ -191,7 +191,7 @@ }, "mainnet": { "managingDAO": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA", - "managingDAO_Implementation": "0x52Af16664155608b845BE18aa29620EbF6eA2D3a", + "managingDAO_Implementation": "0x52Af16664155608b845BE18aa29620EbF6eA2D3a", "DAO_ENSSubdomainRegistrar_Implementation": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3", "DAO_ENSSubdomainRegistrar": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB", "Plugin_ENSSubdomainRegistrar_Implementation": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57", @@ -294,6 +294,46 @@ "multisig-repo": "0x5A5035E7E8aeff220540F383a9cf8c35929bcF31", "multisig-repo_Implementation": "0xe8Bdf8b7befFeC07269B1404ea34Def70D55ad68" }, + "baseSepolia": { + "managingDAO": "0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3", + "managingDAO_Implementation": "0x9277acd65b5dc0f85867dfd40f5488be8d47ad18", + "DAORegistry": "0x308a1DC5020c4B5d992F5543a7236c465997fecB", + "DAORegistry_Implementation": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB", + "DAO_ENSSubdomainRegistrar": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA", + "DAO_ENSSubdomainRegistrar_Implementation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8", + "managingDAOImplementation": "0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18", + "ENSRegistry": "0x308fCC274A5dc405feED1e4d10c1dEf265219bCA", + "PluginRepoFactory": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4", + "PluginRepoRegistry": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee", + "PluginRepoRegistry_Implementation": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57", + "PluginSetupProcessor": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f", + "Plugin_ENSSubdomainRegistrar": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7", + "Plugin_ENSSubdomainRegistrar_Implementation": "0xB5146Fd572C669ABC353902e43F47fda4609E38A", + "PublicResolver": "0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19", + "DAOFactory": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF", + "AddresslistVotingSetup": "0xA03C2182af8eC460D498108C92E8638a580b94d4", + "GovernanceERC20": "0x6E924eA5864044D8642385683fFA5AD42FB687f2", + "GovernanceWrappedERC20": "0xadAdd899F1096B77B6fE601748be1A7a9ADB714B", + "TokenVotingSetup": "0xB2CCCB4d7ec56F992219BCF4abe2E7F02003443e", + "AdminSetup": "0x360586dB62DA31327B2462BA27bEb3e48ebbf396", + "MultisigSetup": "0xB2A2b32b9d885C85d5b229C0509341c37CaE7483", + "PlaceholderSetup": "0xBFD541bc4fcE14adf1Fb9258574D3cBF5f55a894", + "address-list-voting-repo": "0xdfA1fBeC1Cad92597101A4f4A18e1340c5eA55C1", + "token-voting-repo": "0x424F4cA6FA9c24C03f2396DF0E96057eD11CF7dF", + "admin-repo": "0x152c9E28995E418870b85cbbc0AEE4e53020edb2", + "multisig-repo": "0x9e7956C8758470dE159481e5DD0d08F8B59217A2", + "PluginRepoBase": "0x917C2Ab96c40aDEfD08d240409485D8b606423E3", + "DAOBase": "0xb261e8B006f5220D1cADEBCE5e6B63BD6dff5c6f", + "AddresslistVotingSetupImplementation": "0x60cD484f4A1B12a652f8ef71D2f55f6d76e64e4A", + "TokenVotingSetupImplementation": "0xbD9C68950Ab6B7Ec9E3F493Ec701Dd587a056e2a", + "AdminSetupImplementation": "0x3225bb58d6e483B0A2E91265c2b679005F578812", + "MultisigSetupImplementation": "0xfD3c7c2B4E71fCcce7587a9e1C93C706759e689f", + "PlaceholderSetupImplementation": "0x0000000000000000000000000000000000000000", + "address-list-voting-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", + "token-voting-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", + "admin-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", + "multisig-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3" + }, "baseGoerli": { "managingDAO": "0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6", "managingDAO_Implementation": "0x82abafbf46759358c705c7e323543a7be47abaf0", diff --git a/packages/contracts/.env.example b/packages/contracts/.env.example index fcd3df2b7..3e1a479e6 100644 --- a/packages/contracts/.env.example +++ b/packages/contracts/.env.example @@ -10,9 +10,9 @@ MAINNET_DAO_ENS_DOMAIN= GOERLI_DAO_ENS_DOMAIN= SEPOLIOA_DAO_ENS_DOMAIN= BASEMAINNET_DAO_ENS_DOMAIN= -BASEGOERLI_DAO_ENS_DOMAIN= +BASESEPOLIA_DAO_ENS_DOMAIN= ARBITRUM_DAO_ENS_DOMAIN= -ARBITRUMGOERLI_DAO_ENS_DOMAIN= +ARBITRUMSEPOLIA_DAO_ENS_DOMAIN= # LOCALHOST_DAO_ENS_DOMAIN= HARDHAT_DAO_ENS_DOMAIN= @@ -21,9 +21,9 @@ MAINNET_PLUGIN_ENS_DOMAIN= GOERLI_PLUGIN_ENS_DOMAIN= SEPOLIOA_PLUGIN_ENS_DOMAIN= BASEMAINNET_PLUGIN_ENS_DOMAIN= -BASEGOERLI_PLUGIN_ENS_DOMAIN= +BASESEPOLIA_PLUGIN_ENS_DOMAIN= ARBITRUM_PLUGIN_ENS_DOMAIN= -ARBITRUMGOERLI_PLUGIN_ENS_DOMAIN= +ARBITRUMSEPOLIA_PLUGIN_ENS_DOMAIN= # LOCALHOST_PLUGIN_ENS_DOMAIN= HARDHAT_PLUGIN_ENS_DOMAIN= @@ -38,10 +38,10 @@ GOERLI_MANAGINGDAO_MULTISIG=0x3263de63e70157c4b607982721026ffaa20e596c SEPOLIA_MANAGINGDAO_MULTISIG=0xfcEAd61339e3e73090B587968FcE8b090e0600EF POLYGON_MANAGINGDAO_MULTISIG=0x5db93850d843af581d8b87c350aa849a13a88e40 MUMBAI_MANAGINGDAO_MULTISIG=0x944b067ccdbded94e64826747a5d72d4adcdf50a -BASEGOERLI_MANAGINGDAO_MULTISIG=0x0deE00170c57161e629f5975F3B51b73B3770C06 +BASESEPOLIA_MANAGINGDAO_MULTISIG=0xBFa3Ea5Bf7C6491b7f24f2a3658fF1d9eAE11c01 BASEMAINNET_MANAGINGDAO_MULTISIG=0x549B739731dFDfe256f9A3014b30035C05b6D1a6 ARBITRUM_MANAGINGDAO_MULTISIG=0x02bBc496BEBC9a06C239670Cea663C43ceAd899F -ARBITRUMGOERLI_MANAGINGDAO_MULTISIG=0x02bBc496BEBC9a06C239670Cea663C43ceAd899F +ARBITRUMSEPOLIA_MANAGINGDAO_MULTISIG=0xfcEAd61339e3e73090B587968FcE8b090e0600EF HARDHAT_MANAGINGDAO_MULTISIG=0xe3ADd897e69010709498738e5116C06B4D81e672 # Changes with each new version diff --git a/packages/contracts/Releases.md b/packages/contracts/Releases.md index bcb6a445a..c98dd6ac8 100644 --- a/packages/contracts/Releases.md +++ b/packages/contracts/Releases.md @@ -1,5 +1,35 @@ # Contract Releases +Commit: [7c48725049c54a020b0f93a52870f2ddcb11b1e7](https://github.com/aragon/osx/commit/7c48725049c54a020b0f93a52870f2ddcb11b1e7) +Network: baseSepolia +managingDAO: 0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3 +DAORegistry: 0x308a1DC5020c4B5d992F5543a7236c465997fecB +DAORegistry_Implementation: 0xE640Da5AD169630555A86D9b6b9C145B4961b1EB +DAO_ENSSubdomainRegistrar: 0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA +DAO_ENSSubdomainRegistrar_Implementation: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8 +managingDAOImplementation: 0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18 +ENSRegistry: 0x308fCC274A5dc405feED1e4d10c1dEf265219bCA +PluginRepoFactory: 0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4 +PluginRepoRegistry: 0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee +PluginRepoRegistry_Implementation: 0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57 +PluginSetupProcessor: 0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f +Plugin_ENSSubdomainRegistrar: 0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7 +Plugin_ENSSubdomainRegistrar_Implementation: 0xB5146Fd572C669ABC353902e43F47fda4609E38A +PublicResolver: 0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19 +DAOFactory: 0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF +AddresslistVotingSetup: 0xA03C2182af8eC460D498108C92E8638a580b94d4 +GovernanceERC20: 0x6E924eA5864044D8642385683fFA5AD42FB687f2 +GovernanceWrappedERC20: 0xadAdd899F1096B77B6fE601748be1A7a9ADB714B +TokenVotingSetup: 0xB2CCCB4d7ec56F992219BCF4abe2E7F02003443e +AdminSetup: 0x360586dB62DA31327B2462BA27bEb3e48ebbf396 +MultisigSetup: 0xB2A2b32b9d885C85d5b229C0509341c37CaE7483 +PlaceholderSetup: 0xBFD541bc4fcE14adf1Fb9258574D3cBF5f55a894 +address-list-voting-repo: 0xdfA1fBeC1Cad92597101A4f4A18e1340c5eA55C1 +token-voting-repo: 0x424F4cA6FA9c24C03f2396DF0E96057eD11CF7dF +admin-repo: 0x152c9E28995E418870b85cbbc0AEE4e53020edb2 +multisig-repo: 0x9e7956C8758470dE159481e5DD0d08F8B59217A2 + + Commit: [7c48725049c54a020b0f93a52870f2ddcb11b1e7](https://github.com/aragon/osx/commit/7c48725049c54a020b0f93a52870f2ddcb11b1e7) Network: arbitrumSepolia managingDAOImplementation: 0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18 diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts index a508b7856..bacbdec76 100644 --- a/packages/contracts/hardhat.config.ts +++ b/packages/contracts/hardhat.config.ts @@ -97,8 +97,10 @@ const config: HardhatUserConfig = { polygonMumbai: process.env.POLYGONSCAN_KEY || '', baseMainnet: process.env.BASESCAN_KEY || '', baseGoerli: process.env.BASESCAN_KEY || '', + baseSepolia: process.env.BASESCAN_KEY || '', arbitrumOne: process.env.ARBISCAN_KEY || '', arbitrumGoerli: process.env.ARBISCAN_KEY || '', + arbitrumSepolia: process.env.ARBISCAN_KEY || '', }, customChains: [ { @@ -117,6 +119,22 @@ const config: HardhatUserConfig = { browserURL: 'https://goerli.basescan.org', }, }, + { + network: 'baseSepolia', + chainId: 84532, + urls: { + apiURL: 'https://api-sepolia.basescan.org/api', + browserURL: 'https://sepolia.basescan.org', + }, + }, + { + network: 'arbitrumSepolia', + chainId: 421614, + urls: { + apiURL: 'https://api-sepolia.arbiscan.io/api', + browserURL: 'https://sepolia.arbiscan.io', + }, + }, ], }, namedAccounts: { diff --git a/packages/contracts/networks.json b/packages/contracts/networks.json index 40c51f665..bdaf6e33e 100644 --- a/packages/contracts/networks.json +++ b/packages/contracts/networks.json @@ -32,18 +32,24 @@ "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"] }, "baseMainnet": { - "url": "https://developer-access-mainnet.base.org", + "url": "https://base-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48", "isTestnet": false, "chainId": 8453, "deploy": ["./deploy/new", "./deploy/verification"], "gasPrice": 1000 }, "baseGoerli": { - "url": "https://goerli.base.org", + "url": "https://base-goerli.infura.io/v3/481a4cdc7c774286b8627f21c6827f48", "isTestnet": true, "chainId": 84531, + "deploy": ["./deploy/new", "./deploy/verification"] + }, + "baseSepolia": { + "url": "https://base-sepolia.infura.io/v3/481a4cdc7c774286b8627f21c6827f48", + "isTestnet": true, + "chainId": 84532, "deploy": ["./deploy/new", "./deploy/verification"], - "gasPrice": 1000000 + "gasPrice": 1000 }, "arbitrum": { "url": "https://arbitrum-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48", @@ -56,5 +62,11 @@ "isTestnet": true, "chainId": 421613, "deploy": ["./deploy/new", "./deploy/verification"] + }, + "arbitrumSepolia": { + "url": "https://arbitrum-sepolia.infura.io/v3/481a4cdc7c774286b8627f21c6827f48", + "isTestnet": true, + "chainId": 421614, + "deploy": ["./deploy/new", "./deploy/verification"] } } diff --git a/packages/subgraph/manifest/data/baseSepolia.json b/packages/subgraph/manifest/data/baseSepolia.json new file mode 100644 index 000000000..272a58630 --- /dev/null +++ b/packages/subgraph/manifest/data/baseSepolia.json @@ -0,0 +1,23 @@ +{ + "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest", + "network": "base-sepolia", + "dataSources": { + "DAORegistry": { + "name": "DAORegistry", + "address": "0x308a1DC5020c4B5d992F5543a7236c465997fecB", + "startBlock": 3654388 + }, + "PluginRepoRegistry": { + "name": "PluginRepoRegistry", + "address": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee", + "startBlock": 3654394 + }, + "PluginSetupProcessors": [ + { + "name": "PluginSetupProcessor", + "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f", + "startBlock": 3654401 + } + ] + } +}