Merge pull request #38 from argentlabs/feat/hydrogen

chore(config): add `hydrogen` env and update `dev` env
argentlabs · Nov 15, 2022 · 41bc368 · 41bc368
2 parents 1109267 + 67f2bfa
commit 41bc368
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 27 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,12 @@
+DEV_PKEY=0000000000000000000000000000000000000000000000000000000000000000
+HYDROGEN_PKEY=0000000000000000000000000000000000000000000000000000000000000000
+INFURA_KEY=00000000000000000000000000000000
+ALCHEMY_KEY=00000000000000000000000000000000
+S3_BUCKET_PREFIX="argent-smartcontracts"
+S3_BUCKET_SUFFIXES="dev:hydrogen:test:staging:prod"
+S3_CONFIG_KEY="backend/config.json"
+ETHERSCAN_API_KEY="0000000000000000000000000000000000"
+DEV_KMSID=
+TEST_KMSID="000000000000000000000000000000000000"
+PROD_KMSID="000000000000000000000000000000000000"
+STAGING_KMSID="000000000000000000000000000000000000"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,6 +6,7 @@ jobs:
     env:
       ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
       DEV_PKEY: ${{ secrets.DEV_PKEY }}
+      HYDROGEN_PKEY: ${{ secrets.HYDROGEN_PKEY }}
       TEST_PKEY: ${{ secrets.TEST_PKEY }}
       STAGING_PKEY: ${{ secrets.STAGING_PKEY }}
       PROD_PKEY: ${{ secrets.PROD_PKEY }}

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -19,7 +19,7 @@ const scripts = [
   "deploy-maker.ts",
   "deploy-gro.ts",
   "deploy-paraswap.ts",
-  "deploy-argent.ts",
+  "deploy-registries.ts",
 ];
 
 task("deploy-all", "Deploy all scripts", async (args, hre) => {
@@ -43,9 +43,14 @@ const config: HardhatUserConfig = {
       },
     },
     dev: {
-      url: `https://eth-rinkeby.alchemyapi.io/v2/${process.env.ALCHEMY_KEY}`,
+      url: `https://eth-goerli.alchemyapi.io/v2/${process.env.ALCHEMY_KEY}`,
       accounts: [`0x${process.env.DEV_PKEY}`],
-      chainId: 4,
+      chainId: 5,
+    },
+    hydrogen: {
+      url: `https://eth-goerli.alchemyapi.io/v2/${process.env.ALCHEMY_KEY}`,
+      accounts: [`0x${process.env.HYDROGEN_PKEY}`],
+      chainId: 5,
     },
     test: {
       url: `https://eth-ropsten.alchemyapi.io/v2/${process.env.ALCHEMY_KEY}`,

diff --git a/scripts/config/dev.json b/scripts/config/dev.json
@@ -2,7 +2,7 @@
   "argent": {
     "refundCollector": "0x15a3361e61bee856f3204917330bc4446207f876",
     "tradeCommissionCollector": "0x15a3361e61bee856f3204917330bc4446207f876",
-    "multisig": "0x6f9EE21b3d83Bbf8527a3034f3bcE14d007890F2",
+    "multisig": "0x15a3361e61bee856f3204917330bc4446207f876",
     "managers": [
       "0x0267482c3de8d6fe7555d5d1756176f7f90f116d",
       "0x50fee4f130688593ced4fd6aa3357e2a6d924312",
@@ -11,15 +11,15 @@
       "0x5ca379a4ab7d375966f82284279667a9d04f5021"
     ],
     "ens": {
-      "manager": "0x5cCe8f81Ca37Dd2998FE2a0d7f8EfFABd8010901",
-      "managerFilter": "0x2E84B11B76c4Aa5892B047bf9359834575199a19"
+      "manager": "0xD11eF7ac3A2680DbaB4A4F563305A84B88175585",
+      "managerFilter": "0x6cee7d0aA4fA7A22FB2ea47E8856698B5F1181c7"
     }
   },
   "dappRegistry": {
     "timelock": 0,
-    "address": "0x804eeC59D7AbA121417730a2974ff3CD3C18D2C1"
+    "address": "0x39838ad6FF54A3A0C586ff8C3b888Ed51b265e19"
   },
   "zkSync": {
-    "address": "0x82F67958A5474e40E1485742d648C0b0686b6e5D"
+    "address": "0xb97b410cd92151ff645f80b653b519df1c0198ae"
   }
 }
diff --git a/scripts/config/hydrogen.json b/scripts/config/hydrogen.json
@@ -0,0 +1,32 @@
+{
+  "argent": {
+    "refundCollector": "0x15a3361e61bee856f3204917330bc4446207f876",
+    "tradeCommissionCollector": "0x15a3361e61bee856f3204917330bc4446207f876",
+    "multisig": {
+      "address": "0x7119744781Cf98125d2bc609Da3550a3aA55986C",
+      "autosign": true
+    },
+    "managers": [
+      "0xe1d13a5007ef4f75bf2dcc266091c345421cb1f2",
+      "0x198b094fd347f6fa4f6c77d47c65205ebd60917a",
+      "0xbcb86619b4eaec33884d0871931e82a6def60687",
+      "0x94ab847da28a13340adeb23a2cf335afd232df0a",
+      "0x52a3b4ba1eb7c0ccb69b4507b3f691cfd98350f5"
+    ],
+    "ens": {
+      "manager": "0x5cCe8f81Ca37Dd2998FE2a0d7f8EfFABd8010901",
+      "managerFilter": "0x923fe3e094a82ab019B509311B6f65700FBA5349"
+    }
+  },
+  "dappRegistry": {
+    "timelock": 0,
+    "address": "0x3a934C06d713eeB79a7f8628c6e0EF022Fe70e3e"
+  },
+  "tokenRegistry": {
+    "address": "0x8B012eA0c1c6b60Cc28999482399166C97564A23"
+  },
+  "zkSync": {
+    "address": "0xb97b410cd92151ff645f80b653b519df1c0198ae",
+    "filter": "0xe8231bf2Af7a48113bad3691c670E7427ECdc7Cd"
+  }
+}
diff --git a/scripts/deploy-argent.ts → scripts/configure-registries.ts b/scripts/deploy-argent.ts → scripts/configure-registries.ts
@@ -11,6 +11,7 @@ export async function main() {
   const configLoader = new ConfigLoader(hre.network.name);
   const config = configLoader.load();
   const configUpdate = clonedeep(config);
+  const multisigAddress = config.argent.multisig;
 
   /////////////////////////////////
   // DappRegistry
@@ -22,6 +23,10 @@ export async function main() {
   // Temporarily give ownership of DappRegistry to deployment account if needed
   const registryOwner = await dappRegistry.registryOwners(TRUSTLIST);
   if (registryOwner != deployer.address) {
+    if (multisigAddress !== registryOwner) {
+      throw new Error(`multisig address ${multisigAddress} != registry owner ${registryOwner}`);
+    }
+
     const multisigExecutor = new MultisigExecutor();
     await multisigExecutor.connect(registryOwner);
     await multisigExecutor.executeCall(dappRegistry, "changeOwner", [TRUSTLIST, deployer.address]);
@@ -45,26 +50,29 @@ export async function main() {
   console.log(`Added Argent ENS Manager filter ${argentEnsFilter.address} for Argent ENS Manager ${config.argent.ens.manager}`);
 
   // Transfer ownership to Argent multisig
-  await dappRegistry.changeOwner(TRUSTLIST, config.argent.multisig);
-  console.log(`Transfered ownership of trustlist 0 to Argent multisig ${config.argent.multisig}`);
+  await dappRegistry.changeOwner(TRUSTLIST, multisigAddress);
+  console.log(`Transfered ownership of trustlist 0 to Argent multisig ${multisigAddress}`);
+
+
+  // The following isn't part of our current model but leaving it commented here for legacy purposes
 
   /////////////////////////////////
   // TokenRegistry
   /////////////////////////////////
 
-  const TokenRegistry = await ethers.getContractFactory("TokenRegistry");
-  const tokenRegistry = await TokenRegistry.attach(config.tokenRegistry.address);
+  // const TokenRegistry = await ethers.getContractFactory("TokenRegistry");
+  // const tokenRegistry = await TokenRegistry.attach(config.tokenRegistry.address);
 
-  // Add Argent backend EOAs as managers to the TokenRegistry
-  for (const idx in config.argent.managers) {
-    const manager = config.argent.managers[idx];
-    console.log(`Adding ${manager} as a manager of the token registry`);
-    await tokenRegistry.addManager(manager);
-  }
+  // // Add Argent backend EOAs as managers to the TokenRegistry
+  // for (const idx in config.argent.managers) {
+  //   const manager = config.argent.managers[idx];
+  //   console.log(`Adding ${manager} as a manager of the token registry`);
+  //   await tokenRegistry.addManager(manager);
+  // }
 
-  // Transfer ownership to Argent multisig
-  await tokenRegistry.changeOwner(config.argent.multisig);
-  console.log(`Transfered ownership of toekn registry to Argent multisig ${config.argent.multisig}`);
+  // // Transfer ownership to Argent multisig
+  // await tokenRegistry.changeOwner(multisigAddress);
+  // console.log(`Transfered ownership of toekn registry to Argent multisig ${multisigAddress}`);
 
   /////////////////////////////////
   // Update the config

diff --git a/scripts/deploy-registries.ts b/scripts/deploy-registries.ts
@@ -16,12 +16,12 @@ export async function main() {
   configUpdate.dappRegistry.address = dappRegistry.address;
   console.log(`Deployed DappRegistry ${dappRegistry.address} with timelock ${config.dappRegistry.timelock}`);
 
-  // Deploy new TokenRegistry
-  const TokenRegistry = await ethers.getContractFactory("TokenRegistry");
-  const tokenRegistry = await TokenRegistry.deploy();
-  await tokenRegistry.deployed();
-  console.log("Deployed TokenRegistry ", tokenRegistry.address);
-  configUpdate.tokenRegistry.address = tokenRegistry.address;
+  // // Deploy new TokenRegistry
+  // const TokenRegistry = await ethers.getContractFactory("TokenRegistry");
+  // const tokenRegistry = await TokenRegistry.deploy();
+  // await tokenRegistry.deployed();
+  // console.log("Deployed TokenRegistry ", tokenRegistry.address);
+  // configUpdate.tokenRegistry.address = tokenRegistry.address;
 
   configLoader.save(configUpdate);
 }