chore: merge sepolia deployment and main changes into develop

active_contracts.json

@@ -1,4 +1,31 @@
 {
+  "sepolia": {
+    "managingDAOImplementation": "0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19",
+    "managingDAO": "0xCa834B3F404c97273f34e108029eEd776144d324",
+    "ENSRegistry": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8",
+    "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"
+  },  
   "goerli": {
     "managingDAO": "0xB76F8d3512497040a96E77141c951a5374F24Eb9",
     "DAO_ENSSubdomainRegistrar_Implementation": "0x394B49Cc32Dc81B8EaCdeb62A6Fa66F31D1D022c",
@@ -24,7 +51,7 @@
     "GovernanceWrappedERC20": "0xb16d3b1efed5540c5B96DbEDa58860b327CB0D12"
   },
   "mainnet": {
-    "managingDAOImplemenation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8",
+    "managingDAOImplementation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8",
     "managingDAO": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA",
     "DAO_ENSSubdomainRegistrar_Implementation": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3",
     "DAO_ENSSubdomainRegistrar": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB",
@@ -81,7 +108,7 @@
     "DAORegistry_Implementation": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
     "DAO_ENSSubdomainRegistrar": "0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4",
     "DAO_ENSSubdomainRegistrar_Implementation": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee",
-    "managingDAOImplemenation": "0xCa834B3F404c97273f34e108029eEd776144d324",
+    "managingDAOImplementation": "0xCa834B3F404c97273f34e108029eEd776144d324",
     "ENSRegistry": "0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905",
     "PluginRepoFactory": "0x6E924eA5864044D8642385683fFA5AD42FB687f2",
     "PluginRepoRegistry": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
@@ -98,7 +125,7 @@
     "multisig-repo": "0x5A5035E7E8aeff220540F383a9cf8c35929bcF31"
   },
   "baseGoerli": {
-    "managingDAOImplemenation": "0x82aBAfBf46759358c705c7E323543A7Be47AbAf0",
+    "managingDAOImplementation": "0x82aBAfBf46759358c705c7E323543A7Be47AbAf0",
     "managingDAO": "0xD63A8Cfb0eec960C3e70F96a9e3F3091f3FD70b6",
     "ENSRegistry": "0x9bD1EF0C495F6b078d9A82586A35F4d623384E97",
     "PublicResolver": "0x818428f875943eE7c0366de1AAa174a1225dC4eA",
@@ -126,7 +153,7 @@
     "multisig-repo": "0x3308fd88Db88e11c4d99EC805836d7E9F181CdE0"
   },
   "baseMainnet": {
-    "managingDAOImplemenation": "0x03445b197271CB3BE5E453745eD98a05793a4538",
+    "managingDAOImplementation": "0x03445b197271CB3BE5E453745eD98a05793a4538",
     "managingDAO": "0x264308C03feAfA071C97b73b09E911530CCCd216",
     "ENSRegistry": "0xE3625B9Ed80306f590Dcf8a0d50b193F28DB969E",
     "PublicResolver": "0x09AF4b83A9a7EA682A2Eb61d1d0B9e89103b1A06",

packages/contracts/.env.example

@@ -21,6 +21,7 @@ MANAGINGDAO_MULTISIG_APPROVERS=<list of addresses seperated by coma. example: "0
 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

packages/contracts/Releases.md

@@ -1,5 +1,32 @@
 # Contract Releases
 
+Commit: [39dcba1d10b335445724ae006322f584fc1fc9c5](https://github.aragon/osx/commit/39dcba1d10b335445724ae006322f584fc1fc9c5)  
+managingDAOImplementation: 0xCa834B3F404c97273f34e108029eEd776144d324  
+managingDAO: 0x57e24f85ceAcDa3Ef4F0fd04005589B88dc01A19  
+ENSRegistry: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8  
+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: [d429e77c68fcc972126bef6dd58d5d8b32118a09](https://github.com/aragon/osx/commit/d429e77c68fcc972126bef6dd58d5d8b32118a09)  
 Network: baseMainnet  
 ManagingDAOImplementation: 0x03445b197271CB3BE5E453745eD98a05793a4538  
@@ -63,7 +90,7 @@ multisig-repo: 0x3308fd88Db88e11c4d99EC805836d7E9F181CdE0
 Commit: [d429e77c68fcc972126bef6dd58d5d8b32118a09](https://github.com/aragon/osx/commit/d429e77c68fcc972126bef6dd58d5d8b32118a09)  
 Network: baseMainnet  
 managingDAO: 0xB93f5Be5900C2d5fBaE8e4F99B46FfB2Db52ee21  
-managingDAOImplemenation: 0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA  
+managingDAOImplementation: 0xF3AaA3372EbBf01b923a4Cc98Cd847126b3D73cA  
 ENSRegistry: 0xc4ddBd0472C2688F5d278dAFC02E66EE176C8DE3  
 PublicResolver: 0x85138280659cc0cA3f40579E2C8f2713fBAA8878  
 DAO_ENSSubdomainRegistrar_Implementation: 0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905  
@@ -96,7 +123,7 @@ Network: baseGoerli
 managingDAO: 0xCd74Cf89EB90f2abB444E2D1784ee473f338B76B  
 DAO_ENSSubdomainRegistrar: 0x6115b7F05cCeF2D883AB64c88ba7e4BD1b877215  
 DAO_ENSSubdomainRegistrar_Implementation: 0x74b3B3504B5d6D1c6247009c9b1e3D8cFF7bd445  
-managingDAOImplemenation: 0xB93f5Be5900C2d5fBaE8e4F99B46FfB2Db52ee21  
+managingDAOImplementation: 0xB93f5Be5900C2d5fBaE8e4F99B46FfB2Db52ee21  
 ENSRegistry: 0x85138280659cc0cA3f40579E2C8f2713fBAA8878  
 Plugin_ENSSubdomainRegistrar_Implementation: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8  
 PublicResolver: 0xfec29D921A138f819F4921b3E75A35d716aDdC3D  
@@ -155,7 +182,7 @@ DAORegistry: 0x96E54098317631641703404C06A5afAD89da7373
 DAORegistry_Implementation: 0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f  
 DAO_ENSSubdomainRegistrar: 0x07f49c49Ce2A99CF7C28F66673d406386BDD8Ff4  
 DAO_ENSSubdomainRegistrar_Implementation: 0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee  
-managingDAOImplemenation: 0xCa834B3F404c97273f34e108029eEd776144d324  
+managingDAOImplementation: 0xCa834B3F404c97273f34e108029eEd776144d324  
 ENSRegistry: 0x57bf333951967a0cC0afcD58FC7959Ca0Eae6905  
 PluginRepoFactory: 0x6E924eA5864044D8642385683fFA5AD42FB687f2  
 PluginRepoRegistry: 0xA03C2182af8eC460D498108C92E8638a580b94d4  
@@ -173,7 +200,7 @@ multisig-repo: 0x5A5035E7E8aeff220540F383a9cf8c35929bcF31
 
 Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)  
 Network: mumbai  
-managingDAOImplemenation: 0x5E993db91Fd2c713Df1110358396EAc60d54fE66  
+managingDAOImplementation: 0x5E993db91Fd2c713Df1110358396EAc60d54fE66  
 managingDAO: 0xE1De373E219a0d19a0500e599adb903477bCA0f9  
 ENSRegistry: 0xD24A78824dF3C29CA03661368e6437b767A5422D  
 PublicResolver: 0xdbFf6be618180E0FF0d74dd3B6BdC1b5de074273  
@@ -199,7 +226,7 @@ multisig-repo: 0x2c4690b8be39adAd4F15A69340d5035aC6E53eEF
 
 Commit: [054f89908fa881dba230b7f3815f081463138fed](https://github.com/aragon/osx/commit/054f89908fa881dba230b7f3815f081463138fed)  
 Network: mumbai  
-managingDAOImplemenation: 0x38e85D5A0A7F49EcfD24FF191E543a7c7001068d  
+managingDAOImplementation: 0x38e85D5A0A7F49EcfD24FF191E543a7c7001068d  
 managingDAO: 0xd3d5A6b2dB077B5eBBDe90f85eAF4b8466e7EA25  
 ENSRegistry: 0x42256AD2900d4eCd684ceAF2107f78a25433a526  
 PublicResolver: 0x9540237cb446979839AbeC89d5861ce327d4EF75  
@@ -226,7 +253,7 @@ multisig-repo: 0x6E8dA9b20078657c18397407d2a2671AC907F83B
 
 Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)  
 Network: mainnet  
-managingDAOImplemenation: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8  
+managingDAOImplementation: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8  
 managingDAO: 0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA  
 DAO_ENSSubdomainRegistrar_Implementation: 0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3  
 DAO_ENSSubdomainRegistrar: 0xE640Da5AD169630555A86D9b6b9C145B4961b1EB  
@@ -250,7 +277,7 @@ multisig-repo: 0x8c278e37D0817210E18A7958524b7D0a1fAA6F7b
 
 Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)  
 Network: goerli  
-managingDAOImplemenation: 0x99C83C89C59166f7f766A221D5D0Ee00D37170c3  
+managingDAOImplementation: 0x99C83C89C59166f7f766A221D5D0Ee00D37170c3  
 managingDAO: 0xB76F8d3512497040a96E77141c951a5374F24Eb9  
 DAO_ENSSubdomainRegistrar_Implementation: 0x394B49Cc32Dc81B8EaCdeb62A6Fa66F31D1D022c  
 DAO_ENSSubdomainRegistrar: 0xC62820f3E74cC82F89100032Ad7F04682F9EdaE0  
@@ -274,7 +301,7 @@ multisig-repo: 0x92C090cffC592B1bC321aCfAF735057B876375F8
 
 Commit: [f8aee0a0fa7ae5825130b9726a18ef6e36ddc121](https://github.com/aragon/osx/commit/f8aee0a0fa7ae5825130b9726a18ef6e36ddc121)  
 Network: goerli  
-managingDAOImplemenation: 0xF37d853fF9a8B4396fE4CcCc8C9DE744Ea3E7278  
+managingDAOImplementation: 0xF37d853fF9a8B4396fE4CcCc8C9DE744Ea3E7278  
 managingDAO: 0xE0f01b08002c202A8Ecba7b57A8CCEe428bd3a98  
 DAO_ENSSubdomainRegistrar_Implementation: 0xA5dF309eE52BFdC31f863Bc7492182EbD307A7F0  
 DAO_ENSSubdomainRegistrar: 0xcfF83b5fA46574fBc58f771787640a4cc76b329f  
@@ -298,7 +325,7 @@ multisig-repo: 0x160b35934f24B1b7eE238d37Ca2F495AB1a5a803
 
 Commit: [da1278afd8263f7cc13973853bd3b58a352a1ec8](https://github.com/aragon/osx/commit/da1278afd8263f7cc13973853bd3b58a352a1ec8)  
 Network: goerli  
-managingDAOImplemenation: 0x59f3159E8d0F445F711D4f5a1DeA6899cB048B9b  
+managingDAOImplementation: 0x59f3159E8d0F445F711D4f5a1DeA6899cB048B9b  
 managingDAO: 0x5EF485A707ed0437B457F52792bF5645b23ce36d  
 DAO_ENSSubdomainRegistrar_Implementation: 0xbF06efe19627fa4D694e362B8eB708D610f98481  
 DAO_ENSSubdomainRegistrar: 0x5C1f7Dca99dF07beBDD9B07507A002D1e4c67Dd2  

packages/contracts/deploy/helpers.ts

@@ -21,12 +21,14 @@ import {PluginRepoRegisteredEvent} from '../typechain/PluginRepoRegistry';
 // Make sure you own the ENS set in the {{NETWORK}}_ENS_DOMAIN variable in .env
 export const ENS_ADDRESSES: {[key: string]: string} = {
   mainnet: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
-  goerli: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e', // aragon.eth
+  goerli: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
+  sepolia: '0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e',
 };
 
 export const ENS_PUBLIC_RESOLVERS: {[key: string]: string} = {
   goerli: '0x19c2d5d0f035563344dbb7be5fd09c8dad62b001',
   mainnet: '0x4976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41',
+  sepolia: '0x8FADE66B79cC9f707aB26799354482EB93a5B7dD',
 };
 
 export const MANAGING_DAO_METADATA = {

packages/contracts/deploy/update/to_v1.3.0/90_ManagingDAO.ts

@@ -5,7 +5,7 @@ import {getContractAddress} from '../../helpers';
 import {IMPLICIT_INITIAL_PROTOCOL_VERSION} from '../../../test/test-utils/protocol-version';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  console.log('\nUpgrade the managing DAO to new implemenation');
+  console.log('\nUpgrade the managing DAO to new Implementation');
 
   const daoFactoryAddress = await getContractAddress('DAOFactory', hre);
   const newDaoImplementation = await DAOFactory__factory.connect(

packages/contracts/deploy/verification/99_conclude/00_save-contract-addresses.ts

@@ -19,7 +19,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
           console.log(`Managing DAO: ${deployedContracts[deployment].address}`);
           break;
         case 'DAO_Implementation':
-          deployedContractAddresses['managingDAOImplemenation'] =
+          deployedContractAddresses['managingDAOImplementation'] =
             deployedContracts[deployment].address;
           console.log(
             `Managing DAO Implementation: ${deployedContracts[deployment].address}`

packages/contracts/hardhat.config.ts

@@ -92,6 +92,7 @@ const config: HardhatUserConfig = {
       mainnet: process.env.ETHERSCAN_KEY || '',
       rinkeby: process.env.ETHERSCAN_KEY || '',
       goerli: process.env.ETHERSCAN_KEY || '',
+      sepolia: process.env.ETHERSCAN_KEY || '',
       polygon: process.env.POLYGONSCAN_KEY || '',
       polygonMumbai: process.env.POLYGONSCAN_KEY || '',
       arbitrumOne: process.env.ARBISCAN_KEY || '',

packages/contracts/networks.json

@@ -5,6 +5,12 @@
     "chainId": 5,
     "deploy": ["./deploy/update/to_v1.3.0", "./deploy/verification"]
   },
+  "sepolia": {
+    "url": "https://sepolia.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
+    "isTestnet": true,
+    "chainId": 11155111,
+    "deploy": ["./deploy/new", "./deploy/verification"]
+  },
   "mainnet": {
     "url": "https://mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
     "isTestnet": false,

packages/subgraph/manifest/data/sepolia.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": "sepolia",
+  "dataSources": {
+    "DAORegistry": {
+      "name": "DAORegistry",
+      "address": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
+      "startBlock": 4415294
+    },
+    "PluginRepoRegistry": {
+      "name": "PluginRepoRegistry",
+      "address": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee",
+      "startBlock": 4415294
+    },
+    "PluginSetupProcessors": [
+      {
+        "name": "PluginSetupProcessor",
+        "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
+        "startBlock": 4415294
+      }
+    ]
+  }
+}