chore: deploy 1.3.0-rc0 to base goerli and mainnet

DEPLOYMENT_CHECKLIST.md

@@ -4,8 +4,9 @@ This checklist is seen as a guide to deploy the stack to a new chain.
 
 ## Pre-Deployment
 
-- [ ] Make sure you are using Node v16 
+- [ ] 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.
 - [ ] Choose an ENS domain for DAOs
 - [ ] Choose an ENS domain for plugins
 - [ ] Check if there is an official ENS deployment for the chosen chain and if yes:
@@ -16,7 +17,7 @@ This checklist is seen as a guide to deploy the stack to a new chain.
 - [ ] Run `yarn build` in `packages/contracts` to make sure the contracts compile
   - [ ] Check that the compiler version in `hardhat.config.ts` is set to at least `0.8.17` and on the [known solidity bugs page](https://docs.soliditylang.org/en/latest/bugs.html) that no relevant vulnerabilities exist that are fixed in later versions. If the latter is not the case, consider updating the compiler pragmas to a safe version and rolling out fixes for affected contracts.
 - [ ] Run `yarn test` in `packages/contracts` to make sure the contract tests succeed
-- [ ] Run `yarn deploy --network hardhat --reset` to make sure the deploy scripts work
+- [ ] Run `yarn deploy --deploy-scripts deploy/new --network hardhat --reset` to make sure the deploy scripts work
 - [ ] Set `ETH_KEY` in `.env` to the deployers private key
 - [ ] Set the right API key for the chains blockchain explorer in `.env` (e.g. for mainnet it is `ETHERSCAN_KEY`)
 - [ ] Set the chosen DAO ENS domain (in step 1) to `NETWORK_DAO_ENS_DOMAIN` in `.env` and replace `NETWORK` with the correct network name (e.g. for mainnet it is `MAINNET_DAO_ENS_DOMAIN`)
@@ -61,6 +62,7 @@ To deploy run `yarn deploy --network NETWORK` in `packages/contracts` and replac
 - [ ] 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 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
 

active_contracts.json

@@ -98,31 +98,59 @@
     "multisig-repo": "0x5A5035E7E8aeff220540F383a9cf8c35929bcF31"
   },
   "baseGoerli": {
-    "managingDAO": "0xCd74Cf89EB90f2abB444E2D1784ee473f338B76B",
-    "DAO_ENSSubdomainRegistrar": "0x6115b7F05cCeF2D883AB64c88ba7e4BD1b877215",
-    "DAO_ENSSubdomainRegistrar_Implementation": "0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445",
-    "managingDAOImplemenation": "0xB93f5Be5900C2d5fBaE8e4F99B46FfB2Db52ee21",
-    "ENSRegistry": "0x85138280659cc0cA3f40579E2C8f2713fBAA8878",
-    "Plugin_ENSSubdomainRegistrar_Implementation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8",
-    "PublicResolver": "0xfec29D921A138f819F4921b3E75A35d716aDdC3D",
-    "Plugin_ENSSubdomainRegistrar": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA",
-    "DAORegistry_Implementation": "0x95D563382BeD5AcB458759EE05b27DF2CB019Cc7",
-    "DAORegistry": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3",
-    "PluginRepoRegistry_Implementation": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB",
-    "PluginRepoRegistry": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
-    "PluginRepoFactory": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57",
-    "PluginSetupProcessor": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee",
-    "DAOFactory": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4",
-    "AddresslistVotingSetup": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
-    "GovernanceERC20": "0x96E54098317631641703404C06A5afAD89da7373",
-    "GovernanceWrappedERC20": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
-    "TokenVotingSetup": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
-    "AdminSetup": "0x6E924eA5864044D8642385683fFA5AD42FB687f2",
-    "MultisigSetup": "0xadAdd899F1096B77B6fE601748be1A7a9ADB714B",
-    "PlaceholderSetup": "0xB2CCCB4d7ec56F992219BCF4abe2E7F02003443e",
-    "address-list-voting-repo": "0x13FF781A1c2e37C564243730BD63F0e24f57C0Da",
-    "token-voting-repo": "0x05bB93F57Dd2F8Cb1d4F443bb6bB77F32b183a15",
-    "admin-repo": "0x6abfe6280B3111E8a232577b2b09E74d89b000a0",
-    "multisig-repo": "0x22E2254eE764595bc4A79Ac997AFB251f03ff5Af"
+    "managingDAOImplemenation": "0x82aBAfBf46759358c705c7E323543A7Be47AbAf0",
+    "managingDAO": "0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6",
+    "ENSRegistry": "0x9bD1EF0C495F6b078d9A82586A35F4d623384E97",
+    "PublicResolver": "0x818428f875943eE7c0366de1AAa174a1225dC4eA",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0xD47f4ea555FFe3A16Bb997e90C2c4A51CC6d823A",
+    "DAO_ENSSubdomainRegistrar": "0xBB1F7ACf2068Ec3F669FDCB4d0Ad9a70E3E418d6",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0x78E839210aa3072ce638A2d6b08DA611ca361A0E",
+    "Plugin_ENSSubdomainRegistrar": "0x76d72457990e07dd889Bd8F19a02feB89d11A946",
+    "DAORegistry_Implementation": "0x21D9B7b3D7280e9DA46769f79FffEC4cdf64D1cc",
+    "DAORegistry": "0xB5eB5C011827C9F5787ceE3Abc72d247E36a5a0D",
+    "PluginRepoRegistry_Implementation": "0xE47C0B1Ea698F2914b6CC218cdC3A5Ca4FAcff18",
+    "PluginRepoRegistry": "0x91a851E9Ed7F2c6d41b15F76e4a88f5A37067cC9",
+    "PluginRepoFactory": "0x1B6632D1357D26055D6452E3b3BEBd1c1d982e86",
+    "PluginSetupProcessor": "0x6095b5004c59301f8Bb98768Bd395d0bc637C893",
+    "DAOFactory": "0x3E773BCb6a8C5ED2f23BF167284DF45D9A550fF6",
+    "AddresslistVotingSetup": "0x7870837ffe670E62d4e601393D454f1b8649F7f9",
+    "GovernanceERC20": "0x58cd7d773389F68250338C13A1BB5662CFBd0C9A",
+    "GovernanceWrappedERC20": "0xB815791c233807D39b7430127975244B36C19C8e",
+    "TokenVotingSetup": "0x399Ce2a71ef78bE6890EB628384dD09D4382a7f0",
+    "AdminSetup": "0xFcaBf5b75473447E4fde4043F8255B2DAdbF0782",
+    "MultisigSetup": "0x9148970d7C54FEF15565c1b6C41195d92962CA23",
+    "PlaceholderSetup": "0xb163e7606847E86A6ecd8c40432A3c75d27dBD80",
+    "address-list-voting-repo": "0x38177F525C4BC8427Fe5496fcEA567E7396f9Bba",
+    "token-voting-repo": "0x0bdd1C7dD81000777Efcba4BBCeAdBF75560e0b8",
+    "admin-repo": "0x64Ee23C65bFBfEC35d337Ae93fcf22137c2E9c13",
+    "multisig-repo": "0x3308fd88Db88e11c4d99EC805836d7E9F181CdE0"
+  },
+  "baseMainnet": {
+    "managingDAOImplemenation": "0x03445b197271CB3BE5E453745eD98a05793a4538",
+    "managingDAO": "0x264308C03feAfA071C97b73b09E911530CCCd216",
+    "ENSRegistry": "0xE3625B9Ed80306f590Dcf8a0d50b193F28DB969E",
+    "PublicResolver": "0x09AF4b83A9a7EA682A2Eb61d1d0B9e89103b1A06",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0x7DC8d6d35070A13192C754CF96CB046615f2a3E0",
+    "DAO_ENSSubdomainRegistrar": "0x91f190a6f6E38042e3398B3f78Eb7e0AF58Ac8c3",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0xD47f4ea555FFe3A16Bb997e90C2c4A51CC6d823A",
+    "Plugin_ENSSubdomainRegistrar": "0xBB1F7ACf2068Ec3F669FDCB4d0Ad9a70E3E418d6",
+    "DAORegistry_Implementation": "0x76d72457990e07dd889Bd8F19a02feB89d11A946",
+    "DAORegistry": "0xeB98a71d69a1e12B62c10368D9dA5364CE0f7178",
+    "PluginRepoRegistry_Implementation": "0x21D9B7b3D7280e9DA46769f79FffEC4cdf64D1cc",
+    "PluginRepoRegistry": "0xB5eB5C011827C9F5787ceE3Abc72d247E36a5a0D",
+    "PluginRepoFactory": "0xE47C0B1Ea698F2914b6CC218cdC3A5Ca4FAcff18",
+    "PluginSetupProcessor": "0x91a851E9Ed7F2c6d41b15F76e4a88f5A37067cC9",
+    "DAOFactory": "0x1B6632D1357D26055D6452E3b3BEBd1c1d982e86",
+    "AddresslistVotingSetup": "0xC8109e7B790346F662C6e4ef2bA863a9700cA8Eb",
+    "GovernanceERC20": "0xd8C229F3644576b200319cB3919B0E87716f47d8",
+    "GovernanceWrappedERC20": "0x7870837ffe670E62d4e601393D454f1b8649F7f9",
+    "TokenVotingSetup": "0x58cd7d773389F68250338C13A1BB5662CFBd0C9A",
+    "AdminSetup": "0xB815791c233807D39b7430127975244B36C19C8e",
+    "MultisigSetup": "0x399Ce2a71ef78bE6890EB628384dD09D4382a7f0",
+    "PlaceholderSetup": "0xFcaBf5b75473447E4fde4043F8255B2DAdbF0782",
+    "address-list-voting-repo": "0x0A5387021B2722E983842fA701D0BaD8B9279fE2",
+    "token-voting-repo": "0x2532570DcFb749A7F976136CC05648ef2a0f60b0",
+    "admin-repo": "0x212eF339C77B3390599caB4D46222D79fAabcb5c",
+    "multisig-repo": "0xcDC4b0BC63AEfFf3a7826A19D101406C6322A585"
   }
 }

packages/contracts-ethers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/osx-ethers",
-  "version": "1.3.0-rc0.1",
+  "version": "1.3.0-rc0.2",
   "description": "The Aragon OSx contract definitions for ethers.js",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",

packages/contracts/.env.example

@@ -25,7 +25,9 @@ GOERLI_MANAGINGDAO_MULTISIG=0x3263de63e70157c4b607982721026ffaa20e596c
 MUMBAI_MANAGINGDAO_MULTISIG=0x944b067ccdbded94e64826747a5d72d4adcdf50a
 MAINNET_MANAGINGDAO_MULTISIG=0x0673c13d48023efa609c20e5e351763b99dd67de
 POLYGON_MANAGINGDAO_MULTISIG=0x5db93850d843af581d8b87c350aa849a13a88e40
-BASEGOERLI_MANAGINGDAO_MULTISIG=0xCd74Cf89EB90f2abB444E2D1784ee473f338B76B
+BASEGOERLI_MANAGINGDAO_MULTISIG=0x0deE00170c57161e629f5975F3B51b73B3770C06
+BASEMAINNET_MANAGINGDAO_MULTISIG=0x549B739731dFDfe256f9A3014b30035C05b6D1a6
+
 HARDHAT_MANAGINGDAO_MULTISIG=0xe3ADd897e69010709498738e5116C06B4D81e672 # Changes with each new version
 
 # not using this variable will disable the feature. Anything else will enable it