From 20c3434126a9f9f07638740e5d33335f49576c55 Mon Sep 17 00:00:00 2001 From: Mathias Scherer Date: Tue, 12 Dec 2023 15:47:00 +0100 Subject: [PATCH] release: v1.3.0 merge back to develop (#510) * fix(subgraph): update to @graphprotocol/graph-cli@0.52.0 (#453) * fix: missing virtual keyword (#452) * fix: added missing virtual keywords. * fix: correct misspelled filename * docs: improved NatSpec * chore: bump package versions * Update packages/contracts/CHANGELOG.md Co-authored-by: Mathias Scherer --------- Co-authored-by: Mathias Scherer * Deploy contracts and subgraph to sepolia (#475) * feat: deploy v1.3.0-rc0 to sepolia * feat: bump subgraph version to v1.3.0-rc0 feat: deploy sepolia subgraph * fix(OS-638): fixes typo in implementation * chore: fix formatting in helpers script * fix: ipfs returned an empty string (#485) (#495) * chore: deploy 1.3.0-rc0 to arbitrum and arbitrumGoerli (#496) * chore: prepared arbitrum deployment * chore: deployed v1.3.0 to arbitrumGoerli * docs: improved checklist * chore: deployed v1.3.0 to arbitrum * chore: deployed v1.3.0-rc0.4 npm packages * chore: added manifests for arbitrum and arbitrumGoerli * docs: improved deployment checklist * docs: improved deployment checklist * docs: fix typo Co-authored-by: Mathias Scherer --------- Co-authored-by: Mathias Scherer * docs(contracts): removes outdated step in upgrade checklist * deploy(contracts): adds v1.3.0 mainnet deployment * deploy(contracts): adds polygon deployment * fix: removes uncessary inconsistent managingDAOImplementation field from active_contracts.json * chore: bump package version to v1.3.0 * chore: updates version for osx package * chore(contracts): updates changelog * chore(contracts): updates active_contracts with implementations and bases * chore(contracts): moves line in changelog * style(contracts): applies prettier styling --------- Co-authored-by: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com> --- UPDATE_CHECKLIST.md | 1 - active_contracts.json | 145 ++++++++++++++++++++++++++------ packages/contracts/CHANGELOG.md | 7 +- packages/contracts/Releases.md | 20 +++++ 4 files changed, 142 insertions(+), 31 deletions(-) diff --git a/UPDATE_CHECKLIST.md b/UPDATE_CHECKLIST.md index f699e8cc4..2b3c976f6 100644 --- a/UPDATE_CHECKLIST.md +++ b/UPDATE_CHECKLIST.md @@ -16,7 +16,6 @@ This checklist is seen as a guide to update the existing deployment. - [ ] initialize the storage correctly - [ ] Make sure that the `deploy` property in `packages/contracts/networks.json` points to the correct update - [ ] Run `yarn` in the repository root to install the dependencies -- [ ] Run `yarn run build:contracts-versions` in `packages/contracts` to make sure the contracts compile - [ ] Run `yarn build` in `packages/contracts` to make sure the contracts compile - [ ] Run `yarn test` in `packages/contracts` to make sure the contract tests succeed - [ ] Set `ETH_KEY` in `.env` to the deployers private key. It doesn't have to be the previous deployer diff --git a/active_contracts.json b/active_contracts.json index 4ec7241ff..dbea0a463 100644 --- a/active_contracts.json +++ b/active_contracts.json @@ -1,7 +1,7 @@ { "arbitrum": { - "managingDAOImplementation": "0x741061B01d3A95a7734B594f1884b6c30E0fDA96", "managingDAO": "0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA", + "managingDAO_Implementation": "0x741061b01d3a95a7734b594f1884b6c30e0fda96", "ENSRegistry": "0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18", "PublicResolver": "0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3", "DAO_ENSSubdomainRegistrar_Implementation": "0xBe6eAC1bA0b2d20AEA9e7924EFEE8E72D6193246", @@ -13,23 +13,34 @@ "PluginRepoRegistry_Implementation": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7", "PluginRepoRegistry": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3", "PluginRepoFactory": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB", + "PluginRepoBase": "0x78744A9664D6A4dDbcd7B73c120535667E739ee3", "PluginSetupProcessor": "0x308a1DC5020c4B5d992F5543a7236c465997fecB", "DAOFactory": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57", + "DAOBase": "0xbf8b2c4062E1d1060c332bF3305EF03971C90859", "AddresslistVotingSetup": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e", + "AddresslistVotingSetupImplementation": "0x2C9c5e8F559DBBEc962f7CCd295DBc4183cd2168", "GovernanceERC20": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF", "GovernanceWrappedERC20": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f", "TokenVotingSetup": "0x96E54098317631641703404C06A5afAD89da7373", + "TokenVotingSetupImplementation": "0x4f40F01b2944359A0E507b509a868C8DbFAd215B", "AdminSetup": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f", + "AdminSetupImplementation": "0xe015E365572c1d778be7E3ACf16f6a0C06dE86f0", "MultisigSetup": "0xA03C2182af8eC460D498108C92E8638a580b94d4", + "MultisigSetupImplementation": "0x60cD484f4A1B12a652f8ef71D2f55f6d76e64e4A", "PlaceholderSetup": "0x6E924eA5864044D8642385683fFA5AD42FB687f2", + "PlaceholderSetupImplementation": "0x0000000000000000000000000000000000000000", "address-list-voting-repo": "0xf415FF95166EF5D365fFB3bc6d1701f9e9ed7Df7", + "address-list-voting-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", "token-voting-repo": "0x1AeD2BEb470aeFD65B43f905Bd5371b1E4749d18", + "token-voting-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", "admin-repo": "0x326A2aee6A8eE78D79E7E956DE60C6E452f76a8e", - "multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2" + "admin-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", + "multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2", + "multisig-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3" }, "arbitrumGoerli": { - "managingDAOImplementation": "0x741061B01d3A95a7734B594f1884b6c30E0fDA96", "managingDAO": "0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA", + "managingDAO_Implementation": "0x741061b01d3a95a7734b594f1884b6c30e0fda96", "ENSRegistry": "0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18", "PublicResolver": "0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3", "DAO_ENSSubdomainRegistrar_Implementation": "0xBe6eAC1bA0b2d20AEA9e7924EFEE8E72D6193246", @@ -41,23 +52,34 @@ "PluginRepoRegistry_Implementation": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7", "PluginRepoRegistry": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3", "PluginRepoFactory": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB", + "PluginRepoBase": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", "PluginSetupProcessor": "0x308a1DC5020c4B5d992F5543a7236c465997fecB", "DAOFactory": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57", + "DAOBase": "0xbf8b2c4062e1d1060c332bf3305ef03971c90859", "AddresslistVotingSetup": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e", + "AddresslistVotingSetupImplementation": "0x2c9c5e8f559dbbec962f7ccd295dbc4183cd2168", "GovernanceERC20": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF", "GovernanceWrappedERC20": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f", "TokenVotingSetup": "0x96E54098317631641703404C06A5afAD89da7373", + "TokenVotingSetupImplementation": "0x4f40f01b2944359a0e507b509a868c8dbfad215b", "AdminSetup": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f", + "AdminSetupImplementation": "0xe015e365572c1d778be7e3acf16f6a0c06de86f0", "MultisigSetup": "0xA03C2182af8eC460D498108C92E8638a580b94d4", + "MultisigSetupImplementation": "0x60cd484f4a1b12a652f8ef71d2f55f6d76e64e4a", "PlaceholderSetup": "0x6E924eA5864044D8642385683fFA5AD42FB687f2", + "PlaceholderSetupImplementation": "0x0000000000000000000000000000000000000000", "address-list-voting-repo": "0xf415FF95166EF5D365fFB3bc6d1701f9e9ed7Df7", + "address-list-voting-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", "token-voting-repo": "0x1AeD2BEb470aeFD65B43f905Bd5371b1E4749d18", + "token-voting-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", "admin-repo": "0x326A2aee6A8eE78D79E7E956DE60C6E452f76a8e", - "multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2" + "admin-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3", + "multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2", + "multisig-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3" }, "sepolia": { - "managingDAOImplementation": "0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19", "managingDAO": "0xCa834B3F404c97273f34e108029eEd776144d324", + "managingDAO_Implementation": "0x57e24f85ceacda3ef4f0fd04005589b88dc01a19", "ENSRegistry": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8", "DAO_ENSSubdomainRegistrar_Implementation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8", "DAO_ENSSubdomainRegistrar": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA", @@ -68,22 +90,34 @@ "PluginRepoRegistry_Implementation": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57", "PluginRepoRegistry": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee", "PluginRepoFactory": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4", + "PluginRepoBase": "0x917C2Ab96c40aDEfD08d240409485D8b606423E3", "PluginSetupProcessor": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f", "DAOFactory": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e", + "DAOFactoryBase": "0x2C9c5e8F559DBBEc962f7CCd295DBc4183cd2168", "AddresslistVotingSetup": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f", + "AddresslistVotingSetupImplementation": "0xe015E365572c1d778be7E3ACf16f6a0C06dE86f0", "GovernanceERC20": "0xA03C2182af8eC460D498108C92E8638a580b94d4", "GovernanceWrappedERC20": "0x6E924eA5864044D8642385683fFA5AD42FB687f2", "TokenVotingSetup": "0xadAdd899F1096B77B6fE601748be1A7a9ADB714B", + "TokenVotingSetupImplementation": "0x0749047B49B472a7f80C1c8f0a4dbBcecBc54339", "AdminSetup": "0xB2CCCB4d7ec56F992219BCF4abe2E7F02003443e", + "AdminSetupImplementation": "0xbD9C68950Ab6B7Ec9E3F493Ec701Dd587a056e2a", "MultisigSetup": "0x360586dB62DA31327B2462BA27bEb3e48ebbf396", + "MultisigSetupImplementation": "0x3225bb58d6e483B0A2E91265c2b679005F578812", "PlaceholderSetup": "0xB2A2b32b9d885C85d5b229C0509341c37CaE7483", + "PlaceholderSetupImplementation": "0x0000000000000000000000000000000000000000", "address-list-voting-repo": "0xdfA1fBeC1Cad92597101A4f4A18e1340c5eA55C1", + "address-list-voting-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", "token-voting-repo": "0x424F4cA6FA9c24C03f2396DF0E96057eD11CF7dF", + "token-voting-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", "admin-repo": "0x152c9E28995E418870b85cbbc0AEE4e53020edb2", - "multisig-repo": "0x9e7956C8758470dE159481e5DD0d08F8B59217A2" + "admin-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3", + "multisig-repo": "0x9e7956C8758470dE159481e5DD0d08F8B59217A2", + "multisig-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3" }, "goerli": { "managingDAO": "0xB76F8d3512497040a96E77141c951a5374F24Eb9", + "managingDAO_Implementation": "0x53d483975773a2a9e5d9e84d9cd42cee85e90d97", "DAO_ENSSubdomainRegistrar_Implementation": "0x394B49Cc32Dc81B8EaCdeb62A6Fa66F31D1D022c", "DAO_ENSSubdomainRegistrar": "0xC62820f3E74cC82F89100032Ad7F04682F9EdaE0", "Plugin_ENSSubdomainRegistrar_Implementation": "0xbcE9b6fE957464aF2B739337bd1a936EbFCB5B48", @@ -93,22 +127,32 @@ "PluginRepoRegistry_Implementation": "0x3861Ef32c1bFcdd53E9AaE4af1C9f47390c17fBf", "PluginRepoRegistry": "0x970Eb7Dd57c9F0dc4c5a10c06653d1103946b508", "PluginRepoFactory": "0x477EB3b39C92c38B43778266b09471285e0F7808", + "PluginRepoBase": "0xC8dc65fEb5922F30881f2942a059420fe0591a7b", "PluginSetupProcessor": "0xE8B5d8D66a02CD1b9Bd32a4064D7ABa45F51305e", "DAOFactory": "0x1E4350A3c9aFbDbd70FA30B9B2350B9E8182449a", + "DAOBase": "0x53d483975773A2a9E5D9e84d9CD42cee85e90D97", "AddresslistVotingSetup": "0x0B295EDeDF122E5A57d0661E1993f617dE1bEDF4", + "AddresslistVotingSetupImplementation": "0x6C52B040A022bA8e04f2aC46CefE106069fea419", "TokenVotingSetup": "0x23a21113719ADaf2F360408b82E5cF73c3aA8217", + "TokenVotingSetupImplementation": "0x9c378C58F35165b492EC2bC7806FE11FB62beBE3", "AdminSetup": "0x633845bB511DE83EA31b8717614d88fa7b569694", + "AdminSetupImplementation": "0x6aD27533762C085c405B04bb1b58285D39E99f25", "MultisigSetup": "0x27469edD65132751aAA4d313d79Ff1b2Fa286380", + "MultisigSetupImplementation": "0xB701FbCdC8c706CB15dA0c61e123e3B4ecBF0C8e", "address-list-voting-repo": "0xbD293e27226EF2b85E84FADCF2d5135AbC52e50A", + "address-list-voting-repo_Implementation": "0xc8dc65feb5922f30881f2942a059420fe0591a7b", "token-voting-repo": "0xFCc843C48BD44e5dA5976a2f2d85772D59C5959E", + "token-voting-repo_Implementation": "0xc8dc65feb5922f30881f2942a059420fe0591a7b", "admin-repo": "0xF66348E9865bb0f29B889E7c0FE1BCf4acAb5f54", + "admin-repo_Implementation": "0xc8dc65feb5922f30881f2942a059420fe0591a7b", "multisig-repo": "0x92C090cffC592B1bC321aCfAF735057B876375F8", + "multisig-repo_Implementation": "0xc8dc65feb5922f30881f2942a059420fe0591a7b", "GovernanceERC20": "0x40d30f08d5F8F1D63FD87309f9e2a6b61EB3dd6D", "GovernanceWrappedERC20": "0xb16d3b1efed5540c5B96DbEDa58860b327CB0D12" }, "mainnet": { - "managingDAOImplementation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8", "managingDAO": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA", + "managingDAO_Implementation": "0x52Af16664155608b845BE18aa29620EbF6eA2D3a", "DAO_ENSSubdomainRegistrar_Implementation": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3", "DAO_ENSSubdomainRegistrar": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB", "Plugin_ENSSubdomainRegistrar_Implementation": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57", @@ -117,20 +161,31 @@ "DAORegistry": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e", "PluginRepoRegistry_Implementation": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF", "PluginRepoRegistry": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f", - "PluginRepoFactory": "0x96E54098317631641703404C06A5afAD89da7373", + "PluginRepoFactory": "0xaac9E9cdb8C1eb42d881ADd59Ee9c53847a3a4f3", + "PluginRepoBase": "0x31f1CaF7Fa78A998Afa60BF1c7a951a98E6AE538", "PluginSetupProcessor": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f", - "DAOFactory": "0xA03C2182af8eC460D498108C92E8638a580b94d4", - "AddresslistVotingSetup": "0x360586dB62DA31327B2462BA27bEb3e48ebbf396", - "TokenVotingSetup": "0xB2A2b32b9d885C85d5b229C0509341c37CaE7483", + "DAOFactory": "0xf96e6FD76BD0A15580604e1Ea5818D448b1041C0", + "DAOBase": "0x52Af16664155608b845BE18aa29620EbF6eA2D3a", + "AddresslistVotingSetup": "0x8f2088E83F007B1567E8E1187380DFfdC83079d4", + "AddresslistVotingSetupImplementation": "0x86fDCD5a93BC638eFcb888930EA8b00558eDa407", + "TokenVotingSetup": "0x644D3bA8A335F5b1a6afFe63e551306D0C933582", + "TokenVotingSetupImplementation": "0xd4bfb6C688b2982A3b432F2Fc6C35117532A2C27", "AdminSetup": "0xBFD541bc4fcE14adf1Fb9258574D3cBF5f55a894", - "MultisigSetup": "0x8d6726Fe85Caa585d88FD8342ebEEE88d703E754", + "AdminSetupImplementation": "0x31EE445EF8404FF04D8f7BC3D94b2e4b61eE1186", + "MultisigSetup": "0x392f0FdfF3283b9f026CfFeC7f9c2De443af3E7C", + "MultisigSetupImplementation": "0xcEd33DF91AC49415c74BF1b5c218B83a2B8C2f3C", "address-list-voting-repo": "0xC207767d8A7a28019AFFAEAe6698F84B5526EbD7", + "address-list-voting-repo_Implementation": "0x31f1caf7fa78a998afa60bf1c7a951a98e6ae538", "token-voting-repo": "0xb7401cD221ceAFC54093168B814Cc3d42579287f", + "token-voting-repo_Implementation": "0x31f1caf7fa78a998afa60bf1c7a951a98e6ae538", "admin-repo": "0xA4371a239D08bfBA6E8894eccf8466C6323A52C3", - "multisig-repo": "0x8c278e37D0817210E18A7958524b7D0a1fAA6F7b" + "admin-repo_Implementation": "0x31f1caf7fa78a998afa60bf1c7a951a98e6ae538", + "multisig-repo": "0x8c278e37D0817210E18A7958524b7D0a1fAA6F7b", + "multisig-repo_Implementation": "0x31f1caf7fa78a998afa60bf1c7a951a98e6ae538" }, "mumbai": { "managingDAO": "0xE1De373E219a0d19a0500e599adb903477bCA0f9", + "managingDAO_Implementation": "0x5c61dae07318c86c1798891193c70ec0e91c2ee3", "ENSRegistry": "0xD24A78824dF3C29CA03661368e6437b767A5422D", "PublicResolver": "0xdbFf6be618180E0FF0d74dd3B6BdC1b5de074273", "DAO_ENSSubdomainRegistrar_Implementation": "0xD5baCA29C944A28f1f568F7e69B119030914c15D", @@ -142,47 +197,67 @@ "PluginRepoRegistry_Implementation": "0xab27e29F579C870F66F48F4825A4D294AE540818", "PluginRepoRegistry": "0xc796bB1AfEBc56daDF6CAcD2aDa78055e5381971", "PluginRepoFactory": "0x4E7c97ab08c046A8e43571f9839d768ae84492e4", + "PluginRepoBase": "0xAe1f68b9399cf01b0059F125F16B5e1E79C2479F", "PluginSetupProcessor": "0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc", "DAOFactory": "0xc715336B5E7F10294F36CA09f19A0493070E2eFB", + "DAOBase": "0x5C61DAe07318c86C1798891193c70ec0e91c2Ee3", "AddresslistVotingSetup": "0xfDB0E4AADEf463824F10D6a0455acdb50a81B746", + "AddresslistVotingSetupImplementation": "0xeA20dEb9bCEF0471b5EA894d10CC49715684f7FB", "TokenVotingSetup": "0xA8c6C249f4739A4d4d0949550a61de7A4b8FDa16", + "TokenVotingSetupImplementation": "0xADb2E0cC261fDFBf99fDd74306c91042a425e666", "AdminSetup": "0x40a3EF0f0780e044EbDDEdAa9AB225158f315afd", + "AdminSetupImplementation": "0x44be41dC6063a79031426240B09dfB2dc9f638F1", "MultisigSetup": "0x008472798D9818F8BfC08e7966bd9c5d8378FF6f", + "MultisigSetupImplementation": "0x9cf40B38e4913733710d0B28f692f8136DDA8170", "address-list-voting-repo": "0x71570268A86A80B5cCa3F5e430c2BAa3F4b26278", + "address-list-voting-repo_Implementation": "0xae1f68b9399cf01b0059f125f16b5e1e79c2479f", "token-voting-repo": "0xaCa70D8c462940B839DE386BcDD4CACf745632cA", + "token-voting-repo_Implementation": "0xae1f68b9399cf01b0059f125f16b5e1e79c2479f", "admin-repo": "0x0DF9b15550fF39149e491dDD154b28f587e0cD16", + "admin-repo_Implementation": "0xae1f68b9399cf01b0059f125f16b5e1e79c2479f", "multisig-repo": "0x2c4690b8be39adAd4F15A69340d5035aC6E53eEF", + "multisig-repo_Implementation": "0xae1f68b9399cf01b0059f125f16b5e1e79c2479f", "GovernanceERC20": "0x10482C2ba761283f516354c85c40450B52F03AAB", "GovernanceWrappedERC20": "0x861f2138632a2f8aC2B4CeA8A5Ab176543f78f5d" }, "polygon": { - "AddresslistVotingSetup": "0x622DB36633643E4A4075ecc3A309a4f0B942922a", + "AddresslistVotingSetup": "0xc096770a17b24CEFa725122E4c823F450aBEa7b4", + "AddresslistVotingSetupImplementation": "0x3bc989caBc27ECbaECaB10b387Ddb99bfd48F4bB", "AdminSetup": "0x82aBAfBf46759358c705c7E323543A7Be47AbAf0", + "AdminSetupImplementation": "0x3Abc6Cb233af7d7A91FB8CE2A2793f06C20b35A9", "managingDAO": "0x6d4FB6Ff01A172774f42789fcfcdd84E68c28494", - "DAOFactory": "0x51Ead12DEcD31ea75e1046EdFAda14dd639789b8", + "managingDAO_Implementation": "0xcEd33DF91AC49415c74BF1b5c218B83a2B8C2f3C", + "DAOFactory": "0x392f0FdfF3283b9f026CfFeC7f9c2De443af3E7C", + "DAOBase": "0xcEd33DF91AC49415c74BF1b5c218B83a2B8C2f3C", "DAORegistry": "0x96E54098317631641703404C06A5afAD89da7373", "DAORegistry_Implementation": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f", "DAO_ENSSubdomainRegistrar": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4", "DAO_ENSSubdomainRegistrar_Implementation": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee", - "managingDAOImplementation": "0xCa834B3F404c97273f34e108029eEd776144d324", "ENSRegistry": "0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905", - "PluginRepoFactory": "0x6E924eA5864044D8642385683fFA5AD42FB687f2", + "PluginRepoFactory": "0x868581Ee5991C6C08D2467132698fa4AB6C9c272", + "PluginRepoBase": "0xe8Bdf8b7befFeC07269B1404ea34Def70D55ad68", "PluginRepoRegistry": "0xA03C2182af8eC460D498108C92E8638a580b94d4", "PluginRepoRegistry_Implementation": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f", "PluginSetupProcessor": "0x879D9dfe3F36d7684BeC1a2bB4Aa8E8871A7245B", "Plugin_ENSSubdomainRegistrar": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e", "Plugin_ENSSubdomainRegistrar_Implementation": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f", "PublicResolver": "0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445", - "TokenVotingSetup": "0x03445b197271CB3BE5E453745eD98a05793a4538", - "MultisigSetup": "0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6", + "TokenVotingSetup": "0xf65268ed4501391b69540268f461a7e2351d9e4f", + "TokenVotingSetupImplementation": "0x8725b5f8247a0db0A5c6D86Db6Fb7A98F2Bd27f5", + "MultisigSetup": "0xCC925a32fA4fa41c42a7d5585D69C980b6Fa9342", + "MultisigSetupImplementation": "0x90eFFA56ecc3c9b947ee9C3c4c5fedf1c460B9a4", "address-list-voting-repo": "0x641DdEdc2139d9948e8dcC936C1Ab2314D9181E6", + "address-list-voting-repo_Implementation": "0xe8Bdf8b7befFeC07269B1404ea34Def70D55ad68", "token-voting-repo": "0xae67aea0B830ed4504B36670B5Fa70c5C386Bb58", + "token-voting-repo_Implementation": "0xe8Bdf8b7befFeC07269B1404ea34Def70D55ad68", "admin-repo": "0x7fF570473d0876db16A59e8F04EE7F17Ab117309", - "multisig-repo": "0x5A5035E7E8aeff220540F383a9cf8c35929bcF31" + "admin-repo_Implementation": "0xe8Bdf8b7befFeC07269B1404ea34Def70D55ad68", + "multisig-repo": "0x5A5035E7E8aeff220540F383a9cf8c35929bcF31", + "multisig-repo_Implementation": "0xe8Bdf8b7befFeC07269B1404ea34Def70D55ad68" }, "baseGoerli": { - "managingDAOImplementation": "0x82aBAfBf46759358c705c7E323543A7Be47AbAf0", "managingDAO": "0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6", + "managingDAO_Implementation": "0x82abafbf46759358c705c7e323543a7be47abaf0", "ENSRegistry": "0x9bD1EF0C495F6b078d9A82586A35F4d623384E97", "PublicResolver": "0x818428f875943eE7c0366de1AAa174a1225dC4eA", "DAO_ENSSubdomainRegistrar_Implementation": "0xD47f4ea555FFe3A16Bb997e90C2c4A51CC6d823A", @@ -194,23 +269,34 @@ "PluginRepoRegistry_Implementation": "0xE47C0B1Ea698F2914b6CC218cdC3A5Ca4FAcff18", "PluginRepoRegistry": "0x91a851E9Ed7F2c6d41b15F76e4a88f5A37067cC9", "PluginRepoFactory": "0x1B6632D1357D26055D6452E3b3BEBd1c1d982e86", + "PluginRepoBase": "0x6C5C467c94bcc594DeE61CFa0e8cCa24d835d894", "PluginSetupProcessor": "0x6095b5004c59301f8Bb98768Bd395d0bc637C893", "DAOFactory": "0x3E773BCb6a8C5ED2f23BF167284DF45D9A550fF6", + "DAOBase": "0x9d6db4c3DAfB0886A6B69F821EB69994a81Ab243", "AddresslistVotingSetup": "0x7870837ffe670E62d4e601393D454f1b8649F7f9", + "AddresslistVotingSetupImplementation": "0x3b4D91ed7F1A8a2648Cc72E8dE31f0d35A4f9A65", "GovernanceERC20": "0x58cd7d773389F68250338C13A1BB5662CFBd0C9A", "GovernanceWrappedERC20": "0xB815791c233807D39b7430127975244B36C19C8e", "TokenVotingSetup": "0x399Ce2a71ef78bE6890EB628384dD09D4382a7f0", + "TokenVotingSetupImplementation": "0xF48ba5bd1A0D89DdA002532c81B6Ed7d8b762C62", "AdminSetup": "0xFcaBf5b75473447E4fde4043F8255B2DAdbF0782", + "AdminSetupImplementation": "0x37fd7E045e92Ab57484eE490671E2601952D2334", "MultisigSetup": "0x9148970d7C54FEF15565c1b6C41195d92962CA23", + "MultisigSetupImplementation": "0x909a1e733B56D594036aCDbb33a90A76A28E3355", "PlaceholderSetup": "0xb163e7606847E86A6ecd8c40432A3c75d27dBD80", + "PlaceholderSetupImplementation": "0x0000000000000000000000000000000000000000", "address-list-voting-repo": "0x38177F525C4BC8427Fe5496fcEA567E7396f9Bba", + "address-list-voting-repo_Implementation": "0x6c5c467c94bcc594dee61cfa0e8cca24d835d894", "token-voting-repo": "0x0bdd1C7dD81000777Efcba4BBCeAdBF75560e0b8", + "token-voting-repo_Implementation": "0x6c5c467c94bcc594dee61cfa0e8cca24d835d894", "admin-repo": "0x64Ee23C65bFBfEC35d337Ae93fcf22137c2E9c13", - "multisig-repo": "0x3308fd88Db88e11c4d99EC805836d7E9F181CdE0" + "admin-repo_Implementation": "0x6c5c467c94bcc594dee61cfa0e8cca24d835d894", + "multisig-repo": "0x3308fd88Db88e11c4d99EC805836d7E9F181CdE0", + "multisig-repo_Implementation": "0x6c5c467c94bcc594dee61cfa0e8cca24d835d894" }, "baseMainnet": { - "managingDAOImplementation": "0x03445b197271CB3BE5E453745eD98a05793a4538", "managingDAO": "0x264308C03feAfA071C97b73b09E911530CCCd216", + "managingDAO_Implementation": "0x03445b197271cb3be5e453745ed98a05793a4538", "ENSRegistry": "0xE3625B9Ed80306f590Dcf8a0d50b193F28DB969E", "PublicResolver": "0x09AF4b83A9a7EA682A2Eb61d1d0B9e89103b1A06", "DAO_ENSSubdomainRegistrar_Implementation": "0x7DC8d6d35070A13192C754CF96CB046615f2a3E0", @@ -222,18 +308,29 @@ "PluginRepoRegistry_Implementation": "0x21D9B7b3D7280e9DA46769f79FffEC4cdf64D1cc", "PluginRepoRegistry": "0xB5eB5C011827C9F5787ceE3Abc72d247E36a5a0D", "PluginRepoFactory": "0xE47C0B1Ea698F2914b6CC218cdC3A5Ca4FAcff18", + "PluginRepoBase": "0x10a9F51c7e163ac2d061eE8EcD72557722126A81", "PluginSetupProcessor": "0x91a851E9Ed7F2c6d41b15F76e4a88f5A37067cC9", "DAOFactory": "0x1B6632D1357D26055D6452E3b3BEBd1c1d982e86", + "DAOBase": "0x6C5C467c94bcc594DeE61CFa0e8cCa24d835d894", "AddresslistVotingSetup": "0xC8109e7B790346F662C6e4ef2bA863a9700cA8Eb", + "AddresslistVotingSetupImplementation": "0x72e10e8c61E4509cdF1E85175B6b4031526082C4", "GovernanceERC20": "0xd8C229F3644576b200319cB3919B0E87716f47d8", "GovernanceWrappedERC20": "0x7870837ffe670E62d4e601393D454f1b8649F7f9", "TokenVotingSetup": "0x58cd7d773389F68250338C13A1BB5662CFBd0C9A", + "TokenVotingSetupImplementation": "0x908BB81ABeb86FfEa97f1b95b59c4AA8E71d84aA", "AdminSetup": "0xB815791c233807D39b7430127975244B36C19C8e", + "AdminSetupImplementation": "0x824d4AAD1cbF2327c4C429E3c97F968Ee19344F8", "MultisigSetup": "0x399Ce2a71ef78bE6890EB628384dD09D4382a7f0", + "MultisigSetupImplementation": "0xF48ba5bd1A0D89DdA002532c81B6Ed7d8b762C62", "PlaceholderSetup": "0xFcaBf5b75473447E4fde4043F8255B2DAdbF0782", + "PlaceholderSetupImplementation": "0x0000000000000000000000000000000000000000", "address-list-voting-repo": "0x0A5387021B2722E983842fA701D0BaD8B9279fE2", + "address-list-voting-repo_Implementation": "0x10a9f51c7e163ac2d061ee8ecd72557722126a81", "token-voting-repo": "0x2532570DcFb749A7F976136CC05648ef2a0f60b0", + "token-voting-repo_Implementation": "0x10a9f51c7e163ac2d061ee8ecd72557722126a81", "admin-repo": "0x212eF339C77B3390599caB4D46222D79fAabcb5c", - "multisig-repo": "0xcDC4b0BC63AEfFf3a7826A19D101406C6322A585" + "admin-repo_Implementation": "0x10a9f51c7e163ac2d061ee8ecd72557722126a81", + "multisig-repo": "0xcDC4b0BC63AEfFf3a7826A19D101406C6322A585", + "multisig-repo_Implementation": "0x10a9f51c7e163ac2d061ee8ecd72557722126a81" } } diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md index 4b39808c7..f2408ae72 100644 --- a/packages/contracts/CHANGELOG.md +++ b/packages/contracts/CHANGELOG.md @@ -29,12 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Removed the `SignatureValidatorSet` event from `IDAO`. - Removed the `setSignatureValidator` function and `signatureValidator` variable in `DAO`. In places, where the function must remain to not alter the `IDAO` interface ID, it will revert and explanatory notes are put in place.. -## v1.3.1 - -### Changed - -- Added `PermissionCondition` and `PermissionConditionUpgradeable` to have ERC-165 support for `IPermissionCondition` implementations. - ## v1.3.0 ### Added @@ -48,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Added missing `virtual` keyword to `PermissionCondition` and `PermissionConditionUpgradeable`. +- Added `PermissionCondition` and `PermissionConditionUpgradeable` to have ERC-165 support for `IPermissionCondition` implementations. - Changed `TokenVotingSetup` to receive the `GovernanceERC20` and `GovernanceWrappedERC20` base contracts as constructor arguments to reduce the `initCode` size because of limitations on the Goerli testnet. - Revert with errors (`ConditionNotAContract`, `ConditionInterfacNotSupported`) if the `grantWithCondition` function in `PermissionManager` is called with a condition address that is not a `IPermissionCondition` implementation. - `_grantWithCondition()` doesn't accept `ALLOW_FLAG` anymore as valid condition input. diff --git a/packages/contracts/Releases.md b/packages/contracts/Releases.md index 1b71e54a8..a6cfca265 100644 --- a/packages/contracts/Releases.md +++ b/packages/contracts/Releases.md @@ -1,5 +1,25 @@ # Contract Releases +Commit: [40f342b5906681e0050ec8bb984fc331070b932a](https://github.com/aragon/osx/commit/40f342b5906681e0050ec8bb984fc331070b932a) +Network: polygon +DAOFactory: 0x392f0FdfF3283b9f026CfFeC7f9c2De443af3E7C +PluginRepoFactory: 0x868581Ee5991C6C08D2467132698fa4AB6C9c272 +MultisigSetup: 0xCC925a32fA4fa41c42a7d5585D69C980b6Fa9342 +GovernanceERC20: 0x644D3bA8A335F5b1a6afFe63e551306D0C933582 +GovernanceWrappedERC20: 0x8f2088E83F007B1567E8E1187380DFfdC83079d4 +TokenVotingSetup: 0xf65268ed4501391b69540268f461a7e2351d9e4f +AddresslistVotingSetup: 0xc096770a17b24CEFa725122E4c823F450aBEa7b4 + +Commit: [40f342b5906681e0050ec8bb984fc331070b932a](https://github.com/aragon/osx/commit/40f342b5906681e0050ec8bb984fc331070b932a) +Network: mainnet +DAOFactory: 0xf96e6FD76BD0A15580604e1Ea5818D448b1041C0 +PluginRepoFactory: 0xaac9E9cdb8C1eb42d881ADd59Ee9c53847a3a4f3 +MultisigSetup: 0x392f0FdfF3283b9f026CfFeC7f9c2De443af3E7C +GovernanceERC20: 0x868581Ee5991C6C08D2467132698fa4AB6C9c272 +GovernanceWrappedERC20: 0xCC925a32fA4fa41c42a7d5585D69C980b6Fa9342 +TokenVotingSetup: 0x644D3bA8A335F5b1a6afFe63e551306D0C933582 +AddresslistVotingSetup: 0x8f2088E83F007B1567E8E1187380DFfdC83079d4 + Commit: [2a02e0b32492ea1267139f6608310cec16551f05](https://github.com/aragon/osx/commit/2a02e0b32492ea1267139f6608310cec16551f05) Network: arbitrum Managing DAO Implementation: 0x741061B01d3A95a7734B594f1884b6c30E0fDA96