chore: deploy 1.3.0-rc0 to arbitrum and arbitrumGoerli (#499)

* fix(subgraph): update to @graphprotocol/[email protected] (#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 <[email protected]> --------- Co-authored-by: Mathias Scherer <[email protected]> * 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: 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 <[email protected]> * chore: fix merge --------- Co-authored-by: Mathias Scherer <[email protected]>
aragon · Nov 30, 2023 · a7c9315 · a7c9315
1 parent 7ce76e6
commit a7c9315
Show file tree

Hide file tree

Showing 22 changed files with 244 additions and 56 deletions.
diff --git a/DEPLOYMENT_CHECKLIST.md b/DEPLOYMENT_CHECKLIST.md
@@ -4,6 +4,8 @@ This checklist is seen as a guide to deploy the stack to a new chain.
 
 ## Pre-Deployment
 
+- [ ] Verify that the deployers wallet has enough funds.
+- [ ] Check that the subgraph hoster supports the network OSx is deployed to.
 - [ ] Make sure you are using Node v16
 - [ ] Bump the OSx protocol version in the `ProtocolVersion.sol` file.
 - [ ] Check that version tags are set correctly in the plugin repo deploy scripts `packages/contracts/deploy/new/30_plugins/10_plugin-repos` to ensure synchronized version numbers across all supported networks.
@@ -50,26 +52,28 @@ To deploy run `yarn deploy --network NETWORK` in `packages/contracts` and replac
   - [ ] If the proxies are not verified with the `Similar Match Source Code` feature
     - [ ] Verify one of the proxies
     - [ ] Check if the other proxies are now verified with `Similar Match Source Code`
+  - [ ] If it is a `PluginSetup`, check that the implementation is verified.
 
 ### Configurations
 
-- [ ] Check if the managing DAO set in the `DAO_ENSSubdomainRegistrar`
-- [ ] Check if the managing DAO set in the `Plugin_ENSSubdomainRegistrar`
-- [ ] Check if the managing DAO set in the `DAORegistry`
-- [ ] Check if the `DAO_ENSSubdomainRegistrar` set in the `DAORegistry`
+- [ ] Check that all managing DAO signers are members of the managing DAO multisig and no one else.
+- [ ] Check if the managing DAO is set in the `DAO_ENSSubdomainRegistrar`
+- [ ] Check if the managing DAO is set in the `Plugin_ENSSubdomainRegistrar`
+- [ ] Check if the managing DAO is set in the `DAORegistry`
+- [ ] Check if the `DAO_ENSSubdomainRegistrar` is set in the `DAORegistry`
 - [ ] Check if the managing DAO set in the `PluginRepoRegistry`
-- [ ] Check if the `Plugin_ENSSubdomainRegistrar` set in the `PluginRepoRegistry`
+- [ ] Check if the `Plugin_ENSSubdomainRegistrar` is set in the `PluginRepoRegistry`
 - [ ] Check if the `PluginRepoRegistry` is set in the `PluginRepoFactory`
-- [ ] Check if the `PluginRepoRegistry` set in the `PluginSetupProcessor`
-- [ ] Check if the `DAORegistry` set in the `DAOFactory`
-- [ ] Check if the `PluginSetupProcessor` set in the `DAOFactory`
+- [ ] Check if the `PluginRepoRegistry` is set in the `PluginSetupProcessor`
+- [ ] Check if the `DAORegistry` is set in the `DAOFactory`
+- [ ] Check if the `PluginSetupProcessor` is set in the `DAOFactory`
 - [ ] Check that the versions (and eventual `PlaceholderSetup` builds) are published correctly in the `token-voting-repo`, `address-list-voting-repo`, `multisig-repo`, and `admin-repo` and are synchronized across all supported networks.
 
 ### Permissions
 
 - [ ] Check that the deployer has not the ROOT permission on the managing DAO
-- [ ] Check if `DAO_ENSSubdomainRegistrar` is approved for all for the DAO' ENS domain. Call `isApprovedForAll` on the ENS registry
-- [ ] Check if `Plugin_ENSSubdomainRegistrar` is approved for all for the plugin' ENS domain. Call `isApprovedForAll` on the ENS registry
+- [ ] Check if `DAO_ENSSubdomainRegistrar` is approved for all for the DAO' ENS domain. Call `isApprovedForAll` on the ENS registry with the managing DAO as the owner and the `DAO_ENSSubdomainRegistrar` as the operator.
+- [ ] Check if `Plugin_ENSSubdomainRegistrar` is approved for all for the plugin' ENS domain. Call `isApprovedForAll` on the ENS registry with the managing DAO as the owner and the `Plugin_ENSSubdomainRegistrar` as the operator.
 - [ ] Check if the `DAORegistry` has `REGISTER_ENS_SUBDOMAIN_PERMISSION` on `DAO_ENSSubdomainRegistrar`
 - [ ] Check if the `PluginRepoRegistry` has `REGISTER_ENS_SUBDOMAIN_PERMISSION` on `Plugin_ENSSubdomainRegistrar`
 - [ ] Check if the `DAOFactory` has `REGISTER_DAO_PERMISSION` on `DAORegistry`

diff --git a/active_contracts.json b/active_contracts.json
@@ -1,4 +1,60 @@
 {
+  "arbitrum": {
+    "managingDAOImplementation": "0x741061B01d3A95a7734B594f1884b6c30E0fDA96",
+    "managingDAO": "0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA",
+    "ENSRegistry": "0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18",
+    "PublicResolver": "0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0xBe6eAC1bA0b2d20AEA9e7924EFEE8E72D6193246",
+    "DAO_ENSSubdomainRegistrar": "0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445",
+    "Plugin_ENSSubdomainRegistrar": "0x6115b7F05cCeF2D883AB64c88ba7e4BD1b877215",
+    "DAORegistry_Implementation": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA",
+    "DAORegistry": "0xB5146Fd572C669ABC353902e43F47fda4609E38A",
+    "PluginRepoRegistry_Implementation": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7",
+    "PluginRepoRegistry": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3",
+    "PluginRepoFactory": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB",
+    "PluginSetupProcessor": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
+    "DAOFactory": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57",
+    "AddresslistVotingSetup": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e",
+    "GovernanceERC20": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF",
+    "GovernanceWrappedERC20": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
+    "TokenVotingSetup": "0x96E54098317631641703404C06A5afAD89da7373",
+    "AdminSetup": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
+    "MultisigSetup": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
+    "PlaceholderSetup": "0x6E924eA5864044D8642385683fFA5AD42FB687f2",
+    "address-list-voting-repo": "0xf415FF95166EF5D365fFB3bc6d1701f9e9ed7Df7",
+    "token-voting-repo": "0x1AeD2BEb470aeFD65B43f905Bd5371b1E4749d18",
+    "admin-repo": "0x326A2aee6A8eE78D79E7E956DE60C6E452f76a8e",
+    "multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2"
+  },
+  "arbitrumGoerli": {
+    "managingDAOImplementation": "0x741061B01d3A95a7734B594f1884b6c30E0fDA96",
+    "managingDAO": "0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA",
+    "ENSRegistry": "0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18",
+    "PublicResolver": "0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0xBe6eAC1bA0b2d20AEA9e7924EFEE8E72D6193246",
+    "DAO_ENSSubdomainRegistrar": "0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445",
+    "Plugin_ENSSubdomainRegistrar": "0x6115b7F05cCeF2D883AB64c88ba7e4BD1b877215",
+    "DAORegistry_Implementation": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA",
+    "DAORegistry": "0xB5146Fd572C669ABC353902e43F47fda4609E38A",
+    "PluginRepoRegistry_Implementation": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7",
+    "PluginRepoRegistry": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3",
+    "PluginRepoFactory": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB",
+    "PluginSetupProcessor": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
+    "DAOFactory": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57",
+    "AddresslistVotingSetup": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e",
+    "GovernanceERC20": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF",
+    "GovernanceWrappedERC20": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
+    "TokenVotingSetup": "0x96E54098317631641703404C06A5afAD89da7373",
+    "AdminSetup": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
+    "MultisigSetup": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
+    "PlaceholderSetup": "0x6E924eA5864044D8642385683fFA5AD42FB687f2",
+    "address-list-voting-repo": "0xf415FF95166EF5D365fFB3bc6d1701f9e9ed7Df7",
+    "token-voting-repo": "0x1AeD2BEb470aeFD65B43f905Bd5371b1E4749d18",
+    "admin-repo": "0x326A2aee6A8eE78D79E7E956DE60C6E452f76a8e",
+    "multisig-repo": "0x7553E6Fb020c5740768cF289e603770AA09b7aE2"
+  },
   "sepolia": {
     "managingDAOImplementation": "0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19",
     "managingDAO": "0xCa834B3F404c97273f34e108029eEd776144d324",

diff --git a/packages/contracts/.env.example b/packages/contracts/.env.example
@@ -8,26 +8,40 @@ COINMARKETCAP_API_KEY=<Coinmarketcap-Api-Key>
 
 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>
+ARBITRUM_DAO_ENS_DOMAIN=<ENS-Domain example: dao.eth>
+ARBITRUMGOERLI_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>
 
-MAINNET_PLUGIN_ENS_DOMAIN=<ENS-Domain example: dao.eth>
-GOERLI_PLUGIN_ENS_DOMAIN=<ENS-Domain example: dao.eth>
-LOCALHOST_PLUGIN_ENS_DOMAIN=<ENS-Domain example: dao.eth>
-HARDHAT_PLUGIN_ENS_DOMAIN=<ENS-Domain example: dao.eth>
+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>
+ARBITRUM_PLUGIN_ENS_DOMAIN=<ENS-Domain example: plugin.dao.eth>
+ARBITRUMGOERLI_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>
 
 MANAGINGDAO_SUBDOMAIN=<ENS-Subdomain example: "management">
 MANAGINGDAO_MULTISIG_APPROVERS=<list of addresses seperated by coma. example: "0x...01,0x...02">
 MANAGINGDAO_MULTISIG_MINAPPROVALS=<Minimum approvals. example: "1">
 MANAGINGDAO_MULTISIG_LISTEDONLY=<Listed Only. example: "true">
 
-SEPOLIA_MANAGINGDAO_MULTISIG=0xfcEAd61339e3e73090B587968FcE8b090e0600EF
-GOERLI_MANAGINGDAO_MULTISIG=0x3263de63e70157c4b607982721026ffaa20e596c
-MUMBAI_MANAGINGDAO_MULTISIG=0x944b067ccdbded94e64826747a5d72d4adcdf50a
 MAINNET_MANAGINGDAO_MULTISIG=0x0673c13d48023efa609c20e5e351763b99dd67de
+GOERLI_MANAGINGDAO_MULTISIG=0x3263de63e70157c4b607982721026ffaa20e596c
+SEPOLIA_MANAGINGDAO_MULTISIG=0xfcEAd61339e3e73090B587968FcE8b090e0600EF
 POLYGON_MANAGINGDAO_MULTISIG=0x5db93850d843af581d8b87c350aa849a13a88e40
+MUMBAI_MANAGINGDAO_MULTISIG=0x944b067ccdbded94e64826747a5d72d4adcdf50a
 BASEGOERLI_MANAGINGDAO_MULTISIG=0x0deE00170c57161e629f5975F3B51b73B3770C06
 BASEMAINNET_MANAGINGDAO_MULTISIG=0x549B739731dFDfe256f9A3014b30035C05b6D1a6
+ARBITRUM_MANAGINGDAO_MULTISIG=0x02bBc496BEBC9a06C239670Cea663C43ceAd899F
+ARBITRUMGOERLI_MANAGINGDAO_MULTISIG=0x02bBc496BEBC9a06C239670Cea663C43ceAd899F
 
 HARDHAT_MANAGINGDAO_MULTISIG=0xe3ADd897e69010709498738e5116C06B4D81e672 # Changes with each new version
 

diff --git a/packages/contracts/Releases.md b/packages/contracts/Releases.md
@@ -1,6 +1,67 @@
 # Contract Releases
 
+Commit: [2a02e0b32492ea1267139f6608310cec16551f05](https://github.com/aragon/osx/commit/2a02e0b32492ea1267139f6608310cec16551f05)  
+Network: arbitrum  
+Managing DAO Implementation: 0x741061B01d3A95a7734B594f1884b6c30E0fDA96  
+Managing DAO: 0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA  
+ENSRegistry: 0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18  
+PublicResolver: 0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3  
+DAO_ENSSubdomainRegistrar_Implementation: 0xBe6eAC1bA0b2d20AEA9e7924EFEE8E72D6193246  
+DAO_ENSSubdomainRegistrar: 0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905  
+Plugin_ENSSubdomainRegistrar_Implementation: 0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445  
+Plugin_ENSSubdomainRegistrar: 0x6115b7F05cCeF2D883AB64c88ba7e4BD1b877215  
+DAORegistry_Implementation: 0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA  
+DAORegistry: 0xB5146Fd572C669ABC353902e43F47fda4609E38A  
+PluginRepoRegistry_Implementation: 0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7  
+PluginRepoRegistry: 0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3  
+PluginRepoFactory: 0xE640Da5AD169630555A86D9b6b9C145B4961b1EB  
+PluginSetupProcessor: 0x308a1DC5020c4B5d992F5543a7236c465997fecB  
+DAOFactory: 0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57  
+AddresslistVotingSetup: 0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e  
+GovernanceERC20: 0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF  
+GovernanceWrappedERC20: 0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f  
+TokenVotingSetup: 0x96E54098317631641703404C06A5afAD89da7373  
+AdminSetup: 0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f  
+MultisigSetup: 0xA03C2182af8eC460D498108C92E8638a580b94d4  
+PlaceholderSetup: 0x6E924eA5864044D8642385683fFA5AD42FB687f2  
+address-list-voting-repo: 0xf415FF95166EF5D365fFB3bc6d1701f9e9ed7Df7  
+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  
+Managing DAO: 0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA  
+ENSRegistry: 0x9277acd65B5dc0F85867Dfd40f5488Be8d47AD18  
+PublicResolver: 0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3  
+DAO_ENSSubdomainRegistrar_Implementation: 0xBe6eAC1bA0b2d20AEA9e7924EFEE8E72D6193246  
+DAO_ENSSubdomainRegistrar: 0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905  
+Plugin_ENSSubdomainRegistrar_Implementation: 0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445  
+Plugin_ENSSubdomainRegistrar: 0x6115b7F05cCeF2D883AB64c88ba7e4BD1b877215  
+DAORegistry_Implementation: 0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA  
+DAORegistry: 0xB5146Fd572C669ABC353902e43F47fda4609E38A  
+PluginRepoRegistry_Implementation: 0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7  
+PluginRepoRegistry: 0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3  
+PluginRepoFactory: 0xE640Da5AD169630555A86D9b6b9C145B4961b1EB  
+PluginSetupProcessor: 0x308a1DC5020c4B5d992F5543a7236c465997fecB  
+DAOFactory: 0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57  
+AddresslistVotingSetup: 0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e  
+GovernanceERC20: 0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF  
+GovernanceWrappedERC20: 0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f  
+TokenVotingSetup: 0x96E54098317631641703404C06A5afAD89da7373  
+AdminSetup: 0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f  
+MultisigSetup: 0xA03C2182af8eC460D498108C92E8638a580b94d4  
+PlaceholderSetup: 0x6E924eA5864044D8642385683fFA5AD42FB687f2  
+address-list-voting-repo: 0xf415FF95166EF5D365fFB3bc6d1701f9e9ed7Df7  
+token-voting-repo: 0x1AeD2BEb470aeFD65B43f905Bd5371b1E4749d18  
+admin-repo: 0x326A2aee6A8eE78D79E7E956DE60C6E452f76a8e  
+multisig-repo: 0x7553E6Fb020c5740768cF289e603770AA09b7aE2
+
+---
+
 Commit: [39dcba1d10b335445724ae006322f584fc1fc9c5](https://github.aragon/osx/commit/39dcba1d10b335445724ae006322f584fc1fc9c5)  
+Network: sepolia  
 managingDAOImplementation: 0xCa834B3F404c97273f34e108029eEd776144d324  
 managingDAO: 0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19  
 ENSRegistry: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8  

diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
@@ -93,10 +93,10 @@ const config: HardhatUserConfig = {
       sepolia: process.env.ETHERSCAN_KEY || '',
       polygon: process.env.POLYGONSCAN_KEY || '',
       polygonMumbai: process.env.POLYGONSCAN_KEY || '',
-      arbitrumOne: process.env.ARBISCAN_KEY || '',
-      arbitrumTestnet: process.env.ARBISCAN_KEY || '',
       baseMainnet: process.env.BASESCAN_KEY || '',
       baseGoerli: process.env.BASESCAN_KEY || '',
+      arbitrumOne: process.env.ARBISCAN_KEY || '',
+      arbitrumGoerli: process.env.ARBISCAN_KEY || '',
     },
     customChains: [
       {

diff --git a/packages/contracts/networks.json b/packages/contracts/networks.json
@@ -1,4 +1,10 @@
 {
+  "mainnet": {
+    "url": "https://mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
+    "isTestnet": false,
+    "chainId": 1,
+    "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
+  },
   "goerli": {
     "url": "https://goerli.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
     "isTestnet": true,
@@ -11,17 +17,6 @@
     "chainId": 11155111,
     "deploy": ["./deploy/new", "./deploy/verification"]
   },
-  "mainnet": {
-    "url": "https://mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
-    "isTestnet": false,
-    "chainId": 1,
-    "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
-  },
-  "arbitrum": {
-    "url": "https://arbitrum-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
-    "isTestnet": false,
-    "chainId": 42161
-  },
   "polygon": {
     "url": "https://polygon-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
     "isTestnet": false,
@@ -49,5 +44,17 @@
     "chainId": 84531,
     "deploy": ["./deploy/new", "./deploy/verification"],
     "gasPrice": 1000000
+  },
+  "arbitrum": {
+    "url": "https://arbitrum-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
+    "isTestnet": false,
+    "chainId": 42161,
+    "deploy": ["./deploy/new", "./deploy/verification"]
+  },
+  "arbitrumGoerli": {
+    "url": "https://arbitrum-goerli.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
+    "isTestnet": true,
+    "chainId": 421613,
+    "deploy": ["./deploy/new", "./deploy/verification"]
   }
 }
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@aragon/osx-ethers-v1.2.0": "npm:@aragon/[email protected]",
     "@aragon/osx-v1.0.1": "npm:@aragon/[email protected]",
-    "@aragon/osx-v1.3.0-rc0.2": "npm:@aragon/[email protected].2",
+    "@aragon/osx-v1.3.0-rc0.4": "npm:@aragon/[email protected].4",
     "@defi-wonderland/smock": "^2.3.4",
     "@ensdomains/ens-contracts": "0.0.11",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.5",

diff --git a/packages/contracts/scripts/osx-versions-aliases.ts b/packages/contracts/scripts/osx-versions-aliases.ts
@@ -7,5 +7,5 @@
  */
 export const OSX_VERSION_ALIASES = [
   '@aragon/osx-v1.0.1/',
-  '@aragon/osx-v1.3.0-rc0.2/',
+  '@aragon/osx-v1.3.0-rc0.4/',
 ];