Migrating to Base

wannabehero · May 9, 2024 · 1f9638f · 1f9638f
1 parent f910eb4
commit 1f9638f
Show file tree

Hide file tree

Showing 18 changed files with 4,203 additions and 798 deletions.
diff --git a/backend/fly.toml b/backend/fly.toml
@@ -3,13 +3,12 @@
 app = "zkwordo-backend"
 kill_signal = "SIGINT"
 kill_timeout = 5
-mounts = []
 primary_region = "lhr"
 processes = []
 
 [env]
   PORT = "8080"
-  ZK_WORDO_ADDRESS = "0x4b79635f3cd08c704db30181ca2b4d1415b472da"
+  ZK_WORDO_ADDRESS = "0x02a2c1Eab5740eA8660CeBeCc99CB43ed0b1f295"
   WORDS_PATH = "/app/data/words.json"
   ZK_WASM_PATH = "/app/data/zkwordo.wasm"
   ZK_ZKEY_PATH = "/app/data/zkwordo.zkey"

diff --git a/backend/src/main.ts b/backend/src/main.ts
@@ -5,7 +5,7 @@ import { AppModule } from './app.module';
 async function bootstrap() {
   const app = await NestFactory.create(AppModule, {
     cors: {
-      origin: ['https://zkwordo.xyz', 'http://localhost:5173'],
+      origin: ['https://zkwordo.xyz', /http:\/\/localhost:\d+/],
     },
   });
   app.setGlobalPrefix('api');

diff --git a/backend/src/proof/proof.service.ts b/backend/src/proof/proof.service.ts
@@ -72,7 +72,7 @@ export class ProofService {
     const hashedWords = words.map((word, idx) => hashFunc(word, BigInt(idx)));
     const hashedWord = hashFunc(preparedWord, day);
 
-    const rootAndPath = await calculateMerkleRootAndPath({
+    const { root, pathElements, pathIndices } = calculateMerkleRootAndPath({
       hashFunc,
       levels: 6,
       elements: hashedWords,
@@ -82,11 +82,11 @@ export class ProofService {
     const payload = {
       day,
       nullifier,
-      root: rootAndPath.root,
+      root,
 
+      pathIndices,
+      pathElements,
       word: preparedWord,
-      pathElements: rootAndPath.pathElements,
-      pathIndices: rootAndPath.pathIndices,
     };
 
     const { proof, publicSignals } = await snarkjs.plonk.fullProve(

diff --git a/backend/src/web3/web3.module.ts b/backend/src/web3/web3.module.ts
@@ -1,7 +1,7 @@
 import { Global, Module } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { createPublicClient, http } from 'viem';
-import { polygon } from 'viem/chains';
+import { base } from 'viem/chains';
 
 import { VIEM_CLIENT } from './consts';
 
@@ -13,7 +13,7 @@ import { VIEM_CLIENT } from './consts';
       inject: [ConfigService],
       useFactory: (config: ConfigService) =>
         createPublicClient({
-          chain: polygon,
+          chain: base,
           transport: http(config.get('RPC_URL')),
         }),
     },

diff --git a/data/words.json.gpg b/data/words.json.gpg
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -37,6 +37,14 @@ const config: HardhatUserConfig = {
     truffle: {
       url: "http://localhost:24012/rpc",
     },
+    "base-sepolia": {
+      accounts,
+      url: "https://sepolia.base.org",
+    },
+    base: {
+      accounts,
+      url: "https://mainnet.base.org",
+    }
   },
   etherscan: {
     apiKey: process.env.ETHERSCAN_KEY,
@@ -48,6 +56,22 @@ const config: HardhatUserConfig = {
           apiURL: "https://testnet-zkevm.polygonscan.com/api",
           browserURL: "https://testnet-zkevm.polygonscan.com"
         }
+      },
+      {
+        network: "base-sepolia",
+        chainId: 84532,
+        urls: {
+         apiURL: "https://api-sepolia.basescan.org/api",
+         browserURL: "https://sepolia.basescan.org"
+        }
+      },
+      {
+        network: "base",
+        chainId: 8453,
+        urls: {
+         apiURL: "https://api.basescan.org/api",
+         browserURL: "https://basescan.org"
+        }
       }
     ]
   }