deploy to ethereum, base, optimism chains

holic · Dec 30, 2023 · 0d08897 · 0d08897
1 parent 267dbce
commit 0d08897
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 59 deletions.
diff --git a/packages/deploy/deploys.json b/packages/deploy/deploys.json
@@ -1,11 +1,71 @@
 {
+  "1": {
+    "chainId": 1,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "18898263"
+      }
+    }
+  },
   "5": {
     "chainId": 5,
     "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
     "contracts": {
       "FileStore": {
-        "address": "0x6d78D0c4bC861EFad37071d00f4492C78b065706",
-        "blockNumber": "10269289"
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "10294380"
+      }
+    }
+  },
+  "10": {
+    "chainId": 10,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "114171031"
+      }
+    }
+  },
+  "420": {
+    "chainId": 420,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "19256388"
+      }
+    }
+  },
+  "8453": {
+    "chainId": 8453,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "8575423"
+      }
+    }
+  },
+  "17000": {
+    "chainId": 17000,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "634049"
+      }
+    }
+  },
+  "84531": {
+    "chainId": 84531,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "14373294"
       }
     }
   },
@@ -14,8 +74,18 @@
     "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
     "contracts": {
       "FileStore": {
-        "address": "0x6d78D0c4bC861EFad37071d00f4492C78b065706",
-        "blockNumber": "4955756"
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "4986686"
+      }
+    }
+  },
+  "11155420": {
+    "chainId": 11155420,
+    "deployer": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+    "contracts": {
+      "FileStore": {
+        "address": "0xFe1411d6864592549AdE050215482e4385dFa0FB",
+        "blockNumber": "6069158"
       }
     }
   }

diff --git a/packages/deploy/script/deployToAllChains.ts b/packages/deploy/script/deployToAllChains.ts
@@ -30,21 +30,23 @@ import { parseEnv } from "./parseEnv";
 const envSchema = z.object({
   DEPLOYER_PRIVATE_KEY: z.string().refine(isHex),
   ETHERSCAN_API_KEY: z.string(),
+  BASESCAN_API_KEY: z.string(),
+  OPTIMISM_ETHERSCAN_API_KEY: z.string(),
 });
 
 const env = parseEnv(envSchema);
 
 const chains = [
-  mainnet,
-  goerli,
-  sepolia,
-  holesky,
-  base,
-  baseGoerli,
-  baseSepolia,
-  optimism,
-  optimismGoerli,
-  optimismSepolia,
+  // mainnet,
+  // goerli,
+  // sepolia,
+  // holesky, // TODO: fix verification
+  // base,
+  // baseGoerli,
+  // baseSepolia, // TODO: https://github.com/safe-global/safe-singleton-factory/issues/312
+  // optimism,
+  // optimismGoerli,
+  // optimismSepolia,
   arbitrum,
   arbitrumGoerli,
   arbitrumSepolia,
@@ -65,7 +67,14 @@ async function deployToAllChains() {
       account,
     });
     console.log(`deploying to chain ${chain.id} (${chain.name})`);
-    const deployResult = await deploy(client, env.ETHERSCAN_API_KEY);
+    const deployResult = await deploy(
+      client,
+      chain.network.startsWith("base")
+        ? env.BASESCAN_API_KEY
+        : chain.network.startsWith("optimism")
+          ? env.OPTIMISM_ETHERSCAN_API_KEY
+          : env.ETHERSCAN_API_KEY,
+    );
     await writeDeploysJson(deployResult);
   }
 }

diff --git a/packages/deploy/src/deploy.ts b/packages/deploy/src/deploy.ts
@@ -39,8 +39,6 @@ export async function deploy(
   client: Client<Transport, Chain | undefined, Account>,
   etherscanApiKey: string,
 ): Promise<DeployResult> {
-  await contracts$`pnpm run build`;
-
   const chainId = client.chain?.id ?? (await getChainId(client));
   const deployer = await ensureDeployer(client);
 

diff --git a/packages/web/src/supportedChains.ts b/packages/web/src/supportedChains.ts
@@ -29,58 +29,58 @@ type SupportedChain = {
 
 export const supportedChains = [
   /* Ethereum */
-  // {
-  //   hostname: "ethfs.xyz",
-  //   chain: mainnet,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_1!,
-  // },
+  {
+    hostname: "ethfs.xyz",
+    chain: mainnet,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_1!,
+  },
   {
     hostname: "goerli.ethfs.xyz",
     chain: goerli,
     rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_5!,
   },
-  // {
-  //   hostname: "sepolia.ethfs.xyz",
-  //   chain: sepolia,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_11155111!,
-  // },
-  // {
-  //   hostname: "holesky.ethfs.xyz",
-  //   chain: holesky,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_17000!,
-  // },
+  {
+    hostname: "sepolia.ethfs.xyz",
+    chain: sepolia,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_11155111!,
+  },
+  {
+    hostname: "holesky.ethfs.xyz",
+    chain: holesky,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_17000!,
+  },
   /* Base */
-  // {
-  //   hostname: "base.ethfs.xyz",
-  //   chain: base,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_8453!,
-  // },
-  // {
-  //   hostname: "base-goerli.ethfs.xyz",
-  //   chain: baseGoerli,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_84531!,
-  // },
+  {
+    hostname: "base.ethfs.xyz",
+    chain: base,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_8453!,
+  },
+  {
+    hostname: "base-goerli.ethfs.xyz",
+    chain: baseGoerli,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_84531!,
+  },
   // {
   //   hostname: "base-sepolia.ethfs.xyz",
   //   chain: baseSepolia,
   //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_84532!,
   // },
   /* Optimism */
-  // {
-  //   hostname: "optimism.ethfs.xyz",
-  //   chain: optimism,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_10!,
-  // },
-  // {
-  //   hostname: "optimism-goerli.ethfs.xyz",
-  //   chain: optimismGoerli,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_420!,
-  // },
-  // {
-  //   hostname: "optimism-sepolia.ethfs.xyz",
-  //   chain: optimismSepolia,
-  //   rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_11155420!,
-  // },
+  {
+    hostname: "optimism.ethfs.xyz",
+    chain: optimism,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_10!,
+  },
+  {
+    hostname: "optimism-goerli.ethfs.xyz",
+    chain: optimismGoerli,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_420!,
+  },
+  {
+    hostname: "optimism-sepolia.ethfs.xyz",
+    chain: optimismSepolia,
+    rpcUrl: process.env.NEXT_PUBLIC_RPC_HTTP_URL_11155420!,
+  },
   /* Arbitrum */
   // {
   //   hostname: "arbitrum.ethfs.xyz",

diff --git a/shovel/config.json b/shovel/config.json
@@ -1,19 +1,85 @@
 {
   "pg_url": "$DATABASE_URL",
   "eth_sources": [
+    {
+      "name": "mainnet",
+      "chain_id": 1,
+      "url": "$RPC_HTTP_URL_1",
+      "batch_size": 10,
+      "concurrency": 2
+    },
     {
       "name": "goerli",
       "chain_id": 5,
       "url": "$RPC_HTTP_URL_5",
       "batch_size": 10,
       "concurrency": 2
+    },
+    {
+      "name": "sepolia",
+      "chain_id": 11155111,
+      "url": "$RPC_HTTP_URL_11155111",
+      "batch_size": 10,
+      "concurrency": 2
+    },
+    {
+      "name": "holesky",
+      "chain_id": 17000,
+      "url": "$RPC_HTTP_URL_17000",
+      "batch_size": 10,
+      "concurrency": 2
+    },
+    {
+      "name": "base",
+      "chain_id": 8453,
+      "url": "$RPC_HTTP_URL_8453",
+      "batch_size": 10,
+      "concurrency": 2
+    },
+    {
+      "name": "base-goerli",
+      "chain_id": 84531,
+      "url": "$RPC_HTTP_URL_84531",
+      "batch_size": 10,
+      "concurrency": 2
+    },
+    {
+      "name": "optimism",
+      "chain_id": 10,
+      "url": "$RPC_HTTP_URL_10",
+      "batch_size": 10,
+      "concurrency": 2
+    },
+    {
+      "name": "optimism-goerli",
+      "chain_id": 420,
+      "url": "$RPC_HTTP_URL_420",
+      "batch_size": 10,
+      "concurrency": 2
+    },
+    {
+      "name": "optimism-sepolia",
+      "chain_id": 11155420,
+      "url": "$RPC_HTTP_URL_11155420",
+      "batch_size": 10,
+      "concurrency": 2
     }
   ],
   "integrations": [
     {
       "name": "FileStore-FileCreated",
       "enabled": true,
-      "sources": [{ "name": "goerli", "start": 10269289 }],
+      "sources": [
+        { "name": "mainnet", "start": 18898263 },
+        { "name": "goerli", "start": 10294380 },
+        { "name": "sepolia", "start": 4986686 },
+        { "name": "holesky", "start": 634049 },
+        { "name": "base", "start": 8575423 },
+        { "name": "base-goerli", "start": 14373294 },
+        { "name": "optimism", "start": 114171031 },
+        { "name": "optimism-goerli", "start": 19256388 },
+        { "name": "optimism-sepolia", "start": 6069158 }
+      ],
       "table": {
         "name": "files_created",
         "columns": [
@@ -32,7 +98,7 @@
           "name": "log_addr",
           "column": "log_addr",
           "filter_op": "contains",
-          "filter_arg": ["0x6d78D0c4bC861EFad37071d00f4492C78b065706"]
+          "filter_arg": ["0xFe1411d6864592549AdE050215482e4385dFa0FB"]
         },
         { "name": "block_time", "column": "block_time" }
       ],