Skip to content

Commit

Permalink
feat: deploys on base and arbitrum sepolia (merge back) (#517)
Browse files Browse the repository at this point in the history 
* 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 <mathias@aragon.org>

---------

Co-authored-by: Mathias Scherer <mathias@aragon.org>

* 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 <mathias@aragon.org>

---------

Co-authored-by: Mathias Scherer <mathias@aragon.org>

* release: deploy v1.3.0 (#509)

* 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

* fix: build and release metadata mixups (#507)

* fix: build and release metadata where swapped

* fix: publish an empty JSON object to silence the EmptyReleaseMetadata error

* docs: improve checklists

* deploy: adds fqn to contract verification

* deploy: corrects false fqds

* chore: applies prettier formatting

* chore: adds arbitrum sepolia deployment

* deploy(subgraph): changes node endpoint to alchemy

* feat: deploys base sepolia
fix: sets fixed gas price for base networks
fix: fixes wrong multisig address for arbitrum sepolia management dao

* chore: adds release.md hr line

Co-authored-by: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com>

* style: applies prettier formatting

---------

Co-authored-by: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com>
  • Loading branch information
@mathewmeconry @heueristik
mathewmeconry and heueristik authored Jan 4, 2024
1 parent f48c1cb commit f86bd39
Show file tree
Hide file tree
Showing 21 changed files with 300 additions and 29 deletions.
79 changes: 79 additions & 0 deletions active_contracts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,45 @@
"multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2",
"multisig-repo_Implementation": "0x78744a9664d6a4ddbcd7b73c120535667e739ee3"
},
"arbitrumSepolia": {
"managingDAO_Implementation": "0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18",
"managingDAO": "0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3",
"ENSRegistry": "0x308fCC274A5dc405feED1e4d10c1dEf265219bCA",
"PublicResolver": "0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19",
"DAO_ENSSubdomainRegistrar_Implementation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8",
"DAO_ENSSubdomainRegistrar": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA",
"Plugin_ENSSubdomainRegistrar_Implementation": "0xB5146Fd572C669ABC353902e43F47fda4609E38A",
"Plugin_ENSSubdomainRegistrar": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7",
"DAORegistry_Implementation": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB",
"DAORegistry": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
"PluginRepoRegistry_Implementation": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57",
"PluginRepoRegistry": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee",
"PluginRepoFactory": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4",
"PluginRepoBase": "0x917C2Ab96c40aDEfD08d240409485D8b606423E3",
"PluginSetupProcessor": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
"DAOFactory": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e",
"DAOBase": "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",
"admin-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3",
"multisig-repo": "0x9e7956C8758470dE159481e5DD0d08F8B59217A2",
"multisig-repo_Implementation": "0x917c2ab96c40adefd08d240409485d8b606423e3"
},
"sepolia": {
"managingDAO": "0xCa834B3F404c97273f34e108029eEd776144d324",
"managingDAO_Implementation": "0x57e24f85ceacda3ef4f0fd04005589b88dc01a19",
Expand Down Expand Up @@ -255,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",
Expand Down
12 changes: 8 additions & 4 deletions packages/contracts/.env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ MAINNET_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
GOERLI_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
SEPOLIOA_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
BASEMAINNET_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
BASEGOERLI_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
BASESEPOLIA_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
ARBITRUM_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
ARBITRUMGOERLI_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
ARBITRUMSEPOLIA_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>

#
LOCALHOST_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
HARDHAT_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
Expand All @@ -21,9 +22,10 @@ MAINNET_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
GOERLI_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
SEPOLIOA_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
BASEMAINNET_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
BASEGOERLI_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
BASESEPOLIA_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
ARBITRUM_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
ARBITRUMGOERLI_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
ARBITRUMSEPOLIA_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>

#
LOCALHOST_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
HARDHAT_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
Expand All @@ -38,10 +40,12 @@ GOERLI_MANAGINGDAO_MULTISIG=0x3263de63e70157c4b607982721026ffaa20e596c
SEPOLIA_MANAGINGDAO_MULTISIG=0xfcEAd61339e3e73090B587968FcE8b090e0600EF
POLYGON_MANAGINGDAO_MULTISIG=0x5db93850d843af581d8b87c350aa849a13a88e40
MUMBAI_MANAGINGDAO_MULTISIG=0x944b067ccdbded94e64826747a5d72d4adcdf50a
BASESEPOLIA_MANAGINGDAO_MULTISIG=0xBFa3Ea5Bf7C6491b7f24f2a3658fF1d9eAE11c01
BASEGOERLI_MANAGINGDAO_MULTISIG=0x0deE00170c57161e629f5975F3B51b73B3770C06
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

Expand Down
68 changes: 68 additions & 0 deletions packages/contracts/Releases.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
# 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
managingDAO: 0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3
ENSRegistry: 0x308fCC274A5dc405feED1e4d10c1dEf265219bCA
PublicResolver: 0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19
DAO_ENSSubdomainRegistrar_Implementation: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8
DAO_ENSSubdomainRegistrar: 0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA
Plugin_ENSSubdomainRegistrar_Implementation: 0xB5146Fd572C669ABC353902e43F47fda4609E38A
Plugin_ENSSubdomainRegistrar: 0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7
DAORegistry_Implementation: 0xE640Da5AD169630555A86D9b6b9C145B4961b1EB
DAORegistry: 0x308a1DC5020c4B5d992F5543a7236c465997fecB
PluginRepoRegistry_Implementation: 0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57
PluginRepoRegistry: 0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee
PluginRepoFactory: 0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4
PluginSetupProcessor: 0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f
DAOFactory: 0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e
AddresslistVotingSetup: 0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f
GovernanceERC20: 0xA03C2182af8eC460D498108C92E8638a580b94d4
GovernanceWrappedERC20: 0x6E924eA5864044D8642385683fFA5AD42FB687f2
TokenVotingSetup: 0xadAdd899F1096B77B6fE601748be1A7a9ADB714B
AdminSetup: 0xB2CCCB4d7ec56F992219BCF4abe2E7F02003443e
MultisigSetup: 0x360586dB62DA31327B2462BA27bEb3e48ebbf396
PlaceholderSetup: 0xB2A2b32b9d885C85d5b229C0509341c37CaE7483
address-list-voting-repo: 0xdfA1fBeC1Cad92597101A4f4A18e1340c5eA55C1
token-voting-repo: 0x424F4cA6FA9c24C03f2396DF0E96057eD11CF7dF
admin-repo: 0x152c9E28995E418870b85cbbc0AEE4e53020edb2
multisig-repo: 0x9e7956C8758470dE159481e5DD0d08F8B59217A2

---

Commit: [40f342b5906681e0050ec8bb984fc331070b932a](https://github.com/aragon/osx/commit/40f342b5906681e0050ec8bb984fc331070b932a)
Network: polygon
DAOFactory: 0x392f0FdfF3283b9f026CfFeC7f9c2De443af3E7C
Expand All @@ -10,6 +72,8 @@ GovernanceWrappedERC20: 0x8f2088E83F007B1567E8E1187380DFfdC83079d4
TokenVotingSetup: 0xf65268ed4501391b69540268f461a7e2351d9e4f
AddresslistVotingSetup: 0xc096770a17b24CEFa725122E4c823F450aBEa7b4

---

Commit: [40f342b5906681e0050ec8bb984fc331070b932a](https://github.com/aragon/osx/commit/40f342b5906681e0050ec8bb984fc331070b932a)
Network: mainnet
DAOFactory: 0xf96e6FD76BD0A15580604e1Ea5818D448b1041C0
Expand All @@ -20,6 +84,8 @@ GovernanceWrappedERC20: 0xCC925a32fA4fa41c42a7d5585D69C980b6Fa9342
TokenVotingSetup: 0x644D3bA8A335F5b1a6afFe63e551306D0C933582
AddresslistVotingSetup: 0x8f2088E83F007B1567E8E1187380DFfdC83079d4

---

Commit: [2a02e0b32492ea1267139f6608310cec16551f05](https://github.com/aragon/osx/commit/2a02e0b32492ea1267139f6608310cec16551f05)
Network: arbitrum
Managing DAO Implementation: 0x741061B01d3A95a7734B594f1884b6c30E0fDA96
Expand Down Expand Up @@ -49,6 +115,8 @@ token-voting-repo: 0x1AeD2BEb470aeFD65B43f905Bd5371b1E4749d18
admin-repo: 0x326A2aee6A8eE78D79E7E956DE60C6E452f76a8e
multisig-repo: 0x7553E6Fb020c5740768cF289e603770AA09b7aE2

---

Commit: [2a02e0b32492ea1267139f6608310cec16551f05](https://github.com/aragon/osx/commit/2a02e0b32492ea1267139f6608310cec16551f05)
Network: arbitrumGoerli
Managing DAO Implementation: 0x741061B01d3A95a7734B594f1884b6c30E0fDA96
Expand Down
16 changes: 10 additions & 6 deletions packages/contracts/deploy/new/10_framework/09_ens_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,19 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
hre.aragonToVerifyContracts.push(
await deployments.get('DAO_ENSSubdomainRegistrar')
);
hre.aragonToVerifyContracts.push(
await deployments.get('DAO_ENSSubdomainRegistrar_Implementation')
);
hre.aragonToVerifyContracts.push({
contract:
'src/framework/utils/ens/ENSSubdomainRegistrar.sol:ENSSubdomainRegistrar',
...(await deployments.get('DAO_ENSSubdomainRegistrar_Implementation')),
});
hre.aragonToVerifyContracts.push(
await deployments.get('Plugin_ENSSubdomainRegistrar')
);
hre.aragonToVerifyContracts.push(
await deployments.get('Plugin_ENSSubdomainRegistrar_Implementation')
);
hre.aragonToVerifyContracts.push({
contract:
'src/framework/utils/ens/ENSSubdomainRegistrar.sol:ENSSubdomainRegistrar',
...(await deployments.get('Plugin_ENSSubdomainRegistrar_Implementation')),
});
};

export default func;
Expand Down
7 changes: 4 additions & 3 deletions packages/contracts/deploy/new/10_framework/11_dao-registry_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
const {deployments} = hre;

hre.aragonToVerifyContracts.push(await deployments.get('DAORegistry_Proxy'));
hre.aragonToVerifyContracts.push(
await deployments.get('DAORegistry_Implementation')
);
hre.aragonToVerifyContracts.push({
contract: 'src/framework/dao/DAORegistry.sol:DAORegistry',
...(await deployments.get('DAORegistry_Implementation')),
});
};

export default func;
Expand Down
8 changes: 5 additions & 3 deletions packages/contracts/deploy/new/10_framework/21_plugin-repo-registry_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
hre.aragonToVerifyContracts.push(
await deployments.get('PluginRepoRegistry_Proxy')
);
hre.aragonToVerifyContracts.push(
await deployments.get('PluginRepoRegistry_Implementation')
);
hre.aragonToVerifyContracts.push({
contract:
'src/framework/plugin/repo/PluginRepoRegistry.sol:PluginRepoRegistry',
...(await deployments.get('PluginRepoRegistry_Implementation')),
});
};

export default func;
Expand Down
7 changes: 6 additions & 1 deletion packages/contracts/deploy/new/10_framework/31_repo-factory_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
deployer
);

hre.aragonToVerifyContracts.push(pluginRepoFactoryDeployment);
hre.aragonToVerifyContracts.push({
contract:
'src/framework/plugin/repo/PluginRepoFactory.sol:PluginRepoFactory',
...pluginRepoFactoryDeployment,
});
hre.aragonToVerifyContracts.push({
contract: 'src/framework/plugin/repo/PluginRepo.sol:PluginRepo',
address: await pluginRepoFactory.pluginRepoBase(),
args: [],
});
Expand Down
6 changes: 5 additions & 1 deletion packages/contracts/deploy/new/10_framework/51_dao-factory-conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
deployer
);

hre.aragonToVerifyContracts.push(DAOFactoryDeployment);
hre.aragonToVerifyContracts.push({
contract: 'src/framework/dao/DAOFactory.sol:DAOFactory',
...DAOFactoryDeployment,
});
hre.aragonToVerifyContracts.push({
contract: 'src/core/dao/DAO.sol:DAO',
address: await daoFactory.daoBase(),
args: [],
});
Expand Down
8 changes: 7 additions & 1 deletion .../contracts/deploy/new/30_plugins/00_plugin-setups/01_addresslist_voting_setup_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
await setTimeout(30000);
}

hre.aragonToVerifyContracts.push(AddresslistVotingSetupDeployment);
hre.aragonToVerifyContracts.push({
contract:
'src/plugins/governance/majority-voting/addresslist/AddresslistVotingSetup.sol:AddresslistVotingSetup',
...AddresslistVotingSetupDeployment,
});
hre.aragonToVerifyContracts.push({
contract:
'src/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol:AddresslistVoting',
address: await addresslistVotingSetup.implementation(),
args: [],
});
Expand Down
8 changes: 7 additions & 1 deletion packages/contracts/deploy/new/30_plugins/00_plugin-setups/11_token_voting_setup_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
await hre.deployments.get('GovernanceWrappedERC20')
);

hre.aragonToVerifyContracts.push(TokenVotingSetupDeployment);
hre.aragonToVerifyContracts.push({
contract:
'src/plugins/governance/majority-voting/token/TokenVotingSetup.sol:TokenVotingSetup',
...TokenVotingSetupDeployment,
});
hre.aragonToVerifyContracts.push({
contract:
'src/plugins/governance/majority-voting/token/TokenVoting.sol:TokenVoting',
address: await tokenVotingSetup.implementation(),
args: [],
});
Expand Down
6 changes: 5 additions & 1 deletion packages/contracts/deploy/new/30_plugins/00_plugin-setups/21_admin_setup_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
await setTimeout(30000);
}

hre.aragonToVerifyContracts.push(AdminSetupDeployment);
hre.aragonToVerifyContracts.push({
contract: 'src/plugins/governance/admin/AdminSetup.sol:AdminSetup',
...AdminSetupDeployment,
});
hre.aragonToVerifyContracts.push({
contract: 'src/plugins/governance/admin/Admin.sol:Admin',
address: await adminSetup.implementation(),
args: [],
});
Expand Down
6 changes: 5 additions & 1 deletion packages/contracts/deploy/new/30_plugins/00_plugin-setups/31_multisig_setup_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
await setTimeout(30000);
}

hre.aragonToVerifyContracts.push(MultisigSetupDeployment);
hre.aragonToVerifyContracts.push({
contract: 'src/plugins/governance/multisig/MultisigSetup.sol:MultisigSetup',
...MultisigSetupDeployment,
});
hre.aragonToVerifyContracts.push({
contract: 'src/plugins/governance/multisig/Multisig.sol:Multisig',
address: await multisigSetup.implementation(),
args: [],
});
Expand Down
6 changes: 5 additions & 1 deletion packages/contracts/deploy/new/30_plugins/00_plugin-setups/41_placeholder_setup_conclude.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
const {deployments} = hre;

const PlaceholderSetupDeployment = await deployments.get('PlaceholderSetup');
hre.aragonToVerifyContracts.push(PlaceholderSetupDeployment);
hre.aragonToVerifyContracts.push({
contract:
'src/plugins/placeholder-version/PlaceholderSetup.sol:PlaceholderSetup',
...PlaceholderSetupDeployment,
});
};

export default func;
Expand Down
Loading

0 comments on commit f86bd39

Please sign in to comment.