Update config files (#101)

Pool config changes, docker fixes
zkBob · Nov 27, 2023 · 810f69d · 810f69d
1 parent ffa5cc8
commit 810f69d
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 49 deletions.
diff --git a/client-config-full.json b/client-config-full.json
@@ -6,24 +6,24 @@
             "chainId": 137,
             "parameters": "prod",
             "poolAddress": "0x72e6B59D4a90ab232e55D4BB7ed2dD17494D62fB",
-            "tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+            "tokenAddress": "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
             "relayerUrls": ["https://relayer-mvp.zkbob.com"],
             "delegatedProverUrls": ["https://remoteprover-mvp.zkbob.com/"],
             "coldStorageConfigPath": "./assets/coldstorage/zkbob-polygon-coldstorage.cfg",
             "feeDecimals": 2,
-            "depositScheme": "usdc-polygon",
+            "depositScheme": "usdc",
             "ddSubgraph": "zkbob-usdc-polygon"
         },
-        "BOB-optimism": {
+        "USDC-optimism": {
             "chainId": 10,
             "parameters": "prod",
             "poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
-            "tokenAddress": "0xB0B195aEFA3650A6908f15CdaC7D92F8a5791B0B",
+            "tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
             "relayerUrls": ["https://relayer-optimism.zkbob.com/"],
             "delegatedProverUrls": [],
             "coldStorageConfigPath": "",
             "feeDecimals": 2,
-            "depositScheme": "permit",
+            "depositScheme": "usdc",
             "ddSubgraph": "zkbob-bob-optimism"
         },
         "WETH-optimism": {
@@ -135,7 +135,7 @@
         "137": {
             "rpcUrls": ["https://polygon-rpc.com", "https://rpc.ankr.com/polygon"]
         },
-	    "10": {
+        "10": {
             "rpcUrls": ["https://rpc.ankr.com/optimism", "https://mainnet.optimism.io"]
         },
         "11155111": {
@@ -175,7 +175,7 @@
             "tx": "https://polygonscan.com/tx/{{hash}}",
             "address": "https://polygonscan.com/address/{{addr}}"
         },
-	    "10": {
+        "10": {
             "tx": "https://optimistic.etherscan.io/tx/{{hash}}",
             "address": "https://optimistic.etherscan.io/address/{{addr}}"
         },
@@ -207,7 +207,7 @@
 
     "minters": {
         "USDC-polygon": "",
-        "BOB-optimism": "",
+        "USDC-optimism": "",
         "WETH-optimism": "",
         "BOB-sepolia": "0xb9988D599A64723462955BfC8441F1Af90335796",
         "BOB2USDC-goerli": "0x56c105D40f637eF3ac04905682b3DAEfF3F13D24",
@@ -221,7 +221,7 @@
 
     "cloudApi": {
         "USDC-polygon": "",
-	    "BOB-optimism": "",
+        "USDC-optimism": "",
         "WETH-optimism": "",
         "BOB-sepolia": "http://45.77.217.163:8701",
         "BOB2USDC-goerli": "",
@@ -235,7 +235,7 @@
 
     "redemptionUrls": {
         "USDC-polygon": "https://app.zkbob.com",
-	    "BOB-optimism": "https://app.zkbob.com",
+        "USDC-optimism": "https://app.zkbob.com",
         "WETH-optimism": "https://app.zkbob.com",
         "BOB-sepolia": "https://staging--zkbob.netlify.app",
         "BOB2USDC-goerli": "https://staging--zkbob.netlify.app",
@@ -263,6 +263,20 @@
                     "tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
                     "firstTimestamp": 0,
                     "lastTimestamp": 1689689468
+                },
+                "USDC.e": {
+                    "tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+                    "firstTimestamp": 1689689469,
+                    "lastTimestamp": 1700482210
+                }
+            }
+        },
+        "USDC-optimism": {
+            "oldTokens": {
+                "BOB": {
+                    "tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
+                    "firstTimestamp": 0,
+                    "lastTimestamp": 1696854269
                 }
             }
         }

diff --git a/client-config-prod.json b/client-config-prod.json
@@ -4,35 +4,35 @@
         "USDC-polygon": {
             "chainId": 137,
             "poolAddress": "0x72e6B59D4a90ab232e55D4BB7ed2dD17494D62fB",
-            "tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+            "tokenAddress": "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
             "relayerUrls": ["https://relayer-mvp.zkbob.com"],
             "delegatedProverUrls": ["https://remoteprover-mvp.zkbob.com/"],
             "coldStorageConfigPath": "./assets/coldstorage/zkbob-polygon-coldstorage.cfg",
             "feeDecimals": 2,
-            "depositScheme": "usdc-polygon",
+            "depositScheme": "usdc",
             "ddSubgraph": "zkbob-usdc-polygon"
         },
-        "BOB-optimism": {
-            "chainId": 10,
-            "poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
-            "tokenAddress": "0xB0B195aEFA3650A6908f15CdaC7D92F8a5791B0B",
-            "relayerUrls": ["https://relayer-optimism.zkbob.com/"],
-            "delegatedProverUrls": [],
-            "coldStorageConfigPath": "",
+	    "USDC-optimism": {
+    	    "chainId": 10,
+    	    "poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
+    	    "tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+    	    "relayerUrls": ["https://relayer-optimism.zkbob.com/"],
+    	    "delegatedProverUrls": [],
+    	    "coldStorageConfigPath": "",
             "feeDecimals": 2,
-            "depositScheme": "permit",
+            "depositScheme": "usdc",
             "ddSubgraph": "zkbob-bob-optimism"
         },
         "WETH-optimism": {
-            "chainId": 10,
-            "poolAddress": "0x58320A55bbc5F89E5D0c92108F762Ac0172C5992",
-            "tokenAddress": "0x4200000000000000000000000000000000000006",
-            "relayerUrls": ["https://relayer-eth-opt-mvp.zkbob.com/"],
-            "delegatedProverUrls": [],
-            "coldStorageConfigPath": "",
-            "isNative": true,
-            "minTxAmount": 0,
-            "depositScheme": "permit2",
+    	    "chainId": 10,
+    	    "poolAddress": "0x58320A55bbc5F89E5D0c92108F762Ac0172C5992",
+    	    "tokenAddress": "0x4200000000000000000000000000000000000006",
+    	    "relayerUrls": ["https://relayer-eth-opt-mvp.zkbob.com/"],
+    	    "delegatedProverUrls": [],
+    	    "coldStorageConfigPath": "",
+	        "isNative": true,
+    	    "minTxAmount": 0,
+    	    "depositScheme": "permit2",
             "ddSubgraph": "zkbob-eth-optimism"
         }
     },
@@ -60,17 +60,17 @@
     },
     "minters": {
         "USDC-polygon": "",
-        "BOB-optimism": "",
+        "USDC-optimism": "",
         "WETH-optimism": ""
     },
     "cloudApi": {
         "USDC-polygon": "",
-	    "BOB-optimism": "",
+	    "USDC-optimism": "",
         "WETH-optimism": ""
     },
     "redemptionUrls": {
         "USDC-polygon": "https://app.zkbob.com",
-	    "BOB-optimism": "https://app.zkbob.com",
+	    "USDC-optimism": "https://app.zkbob.com",
         "WETH-optimism": "https://app.zkbob.com"
     },
     "migrations": {
@@ -80,6 +80,20 @@
                     "tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
                     "firstTimestamp": 0,
                     "lastTimestamp": 1689689468
+                },
+		        "USDC.e": {
+                    "tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+                    "firstTimestamp": 1689689469,
+                    "lastTimestamp": 1700482210
+                }
+            }
+        },
+	    "USDC-optimism": {
+            "oldTokens": {
+                "BOB": {
+                    "tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
+                    "firstTimestamp": 0,
+                    "lastTimestamp": 1696854269
                 }
             }
         }

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -11,7 +11,7 @@ services:
       - "80:80"
     volumes:
       - ./assets:/usr/share/nginx/html/assets
-      - ./client-config.json:/usr/share/nginx/html/client-config.json
+      - ./client-config-full.json:/usr/share/nginx/html/client-config-full.json
     environment:
-      CONFIG_JSON: ./client-config.json
+      CONFIG_JSON: ./client-config-full.json
     command: yarn dev
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,5 @@ services:
     volumes:
       - ./src:/home/node/app/src
       - ./assets:/home/node/app/assets:ro
-      - ./client-config.json:/home/node/app/client-config.json
-    environment:
-      CONFIG_JSON: ./client-config.json
-    command: yarn dev
+      - ./client-config-prod.json:/home/node/app/client-config-prod.json
+    command: bash -c "echo CONFIG_JSON=./client-config-prod.json > /home/node/app/.env && yarn dev-docker"
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "scripts": {
     "dev": "webpack serve --config webpack.config.dev.js --mode=development --progress",
+    "dev-docker": "webpack serve --config webpack.config.dev.js --mode=development --host 0.0.0.0",
     "build:dev": "webpack --config webpack.config.dev.js",
     "build:prod": "webpack --config webpack.config.prod.js",
     "publish-docker": "VERSION=$npm_package_version TAG=latest ./scripts/publish-docker",

diff --git a/scripts/start-dev b/scripts/start-dev
@@ -1,17 +1,13 @@
 #!/usr/bin/env bash
-cd ../libzeropool-rs/libzeropool-rs-wasm && \
+cd ../libzkbob-rs/libzkbob-rs-wasm && \
 ./scripts/build && \
 cd -
 
-cd ../zeropool-api-js && \
-yarn upgrade libzeropool-rs-wasm-web && \
+cd ../zkbob-client-js && \
+yarn upgrade libzkbob-rs-wasm-web && \
+yarn upgrade libzkbob-rs-wasm-web-mt && \
 yarn build && \
 
 cd -
-export EVM_RPC=''
-export RELAYER_URL=''
-export TOKEN_ADDRESS=''
-export MINTER_ADDRESS=''
-export CONTRACT_ADDRESS=''
-yarn upgrade zeropool-api-js && \
+yarn upgrade zkbob-client-js && \
 yarn dev
diff --git a/scripts/start-local b/scripts/start-local
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-npm i && npm run dev
+yarn install && yarn dev
diff --git a/yarn.lock b/yarn.lock
@@ -13074,8 +13074,10 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-"zkbob-client-js@file:../zkbob-client-js":
+zkbob-client-js@5.4.0:
   version "5.4.0"
+  resolved "https://registry.yarnpkg.com/zkbob-client-js/-/zkbob-client-js-5.4.0.tgz#a4eb6fc03fe56aaa83038f9fb9548fb6ea13b094"
+  integrity sha512-kMlqGckUsr6pYLI0S+9sZI60vUkSnNHyZQfMFcZ+BT19qNOwlXu00TON7Ro2FIYDAKwKOj98Jz2ACAvEPrHvSw==
   dependencies:
     "@ethereumjs/util" "^8.0.2"
     "@graphprotocol/client-cli" "3.0.0"