Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decentralized deployment #106

Merged
merged 20 commits into from
Sep 9, 2024
Merged

Decentralized deployment #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2691427
Development libraries
EvgenKor Jan 18, 2024
2cb4248
Set default pool in config (USDC-goerli)
EvgenKor Jan 23, 2024
1b7404c
New fee format
EvgenKor Jan 23, 2024
9ea59aa
Preparing to local debug
EvgenKor Feb 5, 2024
7b34508
Updating library chain
EvgenKor Feb 12, 2024
eb6e8f7
Set valid proxy address
EvgenKor Feb 13, 2024
af36c0e
Relayer -> Sequencer
EvgenKor Feb 15, 2024
57a0ece
Refactoring, changing config format
EvgenKor Feb 16, 2024
05d83ee
Updating library
EvgenKor Feb 24, 2024
14fe8c6
Restoring old sepolia pool in config
EvgenKor Feb 29, 2024
b3dcae7
Displaying prover fee
EvgenKor Mar 23, 2024
30d7e28
Added new sepolia deployment (calldata with prover address)
EvgenKor Mar 29, 2024
62f55ae
Added `sequencer-list` and `sequencer-prioritize` commands
EvgenKor Apr 18, 2024
46bb9d5
minor fix
EvgenKor Apr 25, 2024
d6c763a
Fix the latest client library version
EvgenKor May 6, 2024
eaa81cf
Cosmetic fixes
EvgenKor May 16, 2024
9d91d98
Pending index in `root` command
EvgenKor May 30, 2024
7ce37a0
Updating library to support new DD ABI
EvgenKor Jul 11, 2024
6e51ccc
Bump client library version (6.0.0-beta10) and console version (4.0.0…
EvgenKor Sep 9, 2024
be8eb4c
Removing suffix beta before merging to develop
EvgenKor Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 52 additions & 61 deletions client-config-full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"defaultPool": "USDT-tron",
"defaultPool": "USDC-op-tenderly",

"pools": {
"USDC-polygon": {
Expand All @@ -20,8 +20,6 @@
"poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
"tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
"relayerUrls": ["https://relayer-optimism.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "usdc",
"ddSubgraph": "zkbob-bob-optimism"
Expand All @@ -32,31 +30,43 @@
"poolAddress": "0x58320A55bbc5F89E5D0c92108F762Ac0172C5992",
"tokenAddress": "0x4200000000000000000000000000000000000006",
"relayerUrls": ["https://relayer-eth-opt-mvp.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"isNative": true,
"minTxAmount": 0,
"depositScheme": "permit2",
"ddSubgraph": "zkbob-eth-optimism"
},
"BOB-sepolia": {
"chainId": 11155111,
"poolAddress": "0x3bd088C19960A8B5d72E4e01847791BD0DD1C9E6",
"poolAddress": "0x7D6BB1192c859fF5Cf9fC4a0dbFbD782F19aeE35",
"tokenAddress": "0x2C74B18e2f84B78ac67428d0c7a9898515f0c46f",
"relayerUrls": ["https://relayer.thgkjlr.website/"],
"delegatedProverUrls": ["https://prover-staging.thgkjlr.website/"],
"coldStorageConfigPath": "./assets/coldstorage/zkbob-sepolia-coldstorage.cfg",
"proxyUrls": ["http://127.0.0.1:8081", "https://sepolia-decentralized-relayer.thgkjlr.website/", "https://sepolia-proxy.zkbob.evgen.space"],
"feeDecimals": 2,
"depositScheme": "permit",
"ddSubgraph": "https://api.studio.thegraph.com/query/50398/zkbob-bob-sepolia/version/latest"
"depositScheme": "permit"
},
"USDC-op-tenderly": {
"chainId": 10,
"parameters": "prod",
"poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
"tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
"proxyUrls": ["https://sepolia-proxy.zkbob.evgen.space", "https://sepolia-decentralized-relayer.thgkjlr.website", "http://127.0.0.1:8081"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "usdc"
},
"BOB-sepolia-donotuse": {
"chainId": 11155111,
"poolAddress": "0x77f3D9Fb578a0F2B300347fb3Cd302dFd7eedf93",
"tokenAddress": "0x2C74B18e2f84B78ac67428d0c7a9898515f0c46f",
"proxyUrls": ["https://sepolia-decentralized-relayer.thgkjlr.website/"],
"feeDecimals": 2,
"depositScheme": "permit"
},
"BOB2USDC-goerli": {
"chainId": 5,
"poolAddress": "0x49661694a71B3Dab9F25E86D5df2809B170c56E6",
"tokenAddress": "0x28B531401Ee3f17521B3772c13EAF3f86C2Fe780",
"relayerUrls": ["https://dev-relayer.thgkjlr.website/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "usdc-polygon",
"ddSubgraph": "zkbob-bob-goerli"
Expand All @@ -66,8 +76,6 @@
"poolAddress": "0xf9dbCF4005497e042838dE9082C817fCa790e945",
"tokenAddress": "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6",
"relayerUrls": ["https://goerli-weth-relayer.thgkjlr.website/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"minTxAmount": 0,
"depositScheme": "permit2",
"isNative": true,
Expand All @@ -78,10 +86,7 @@
"poolAddress": "0xCF6446Deb67b2b56604657C67DAF54f884412531",
"tokenAddress": "0x28B531401Ee3f17521B3772c13EAF3f86C2Fe780",
"relayerUrls": ["https://goerli-usdc-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"minTxAmount": 50000,
"depositScheme": "usdc-polygon",
"ddSubgraph": "zkbob-usdc-goerli"
},
Expand All @@ -90,8 +95,6 @@
"poolAddress":"0x55B81b0730399974Ccad8AC858e766Cf54126596",
"tokenAddress":"0x0fA7E69b9344D6434Bd6b79c5950bb5234245a5F",
"relayerUrls":["https://gop-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "permit",
"ddSubgraph": "zkbob-bob-goerli-opt"
Expand All @@ -101,44 +104,34 @@
"poolAddress": "TLTyi81NhoeGfsq8Ef1STDYs6E7HFSAruV",
"tokenAddress": "TG3XXyExBkPp9nzdajDZsozEu4BkaSJozs",
"relayerUrls": ["https://shasta-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"minTxAmount": 50000,
"depositScheme": "approve"
},
"USDT-nile": {
"chainId": 3448148188,
"poolAddress": "TT8GgygLhEDh88kYwY8mYz38iEpJWw1YLG",
"tokenAddress": "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf",
"relayerUrls": ["https://tron-nile-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"minTxAmount": 50000,
"depositScheme": "approve"
},
"USDT-nile-guard": {
"chainId": 3448148188,
"poolAddress": "TJp4J3M2rEZ5euswTpGzUaVVEJxkXX66mL",
"poolAddress": "TVbFjwMgDuzVYqTmMMzrkGQxZkaTfDZ1Gn",
"tokenAddress": "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf",
"relayerUrls": ["https://tron-nile-mpc-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"minTxAmount": 50000,
"depositScheme": "approve"
},
"USDT-tron": {
"chainId": 728126428,
"poolAddress": "TXViaNRhEugXpAZApviBqBnbTSKUgejnR9",
"tokenAddress": "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
"relayerUrls": ["https://relayer-tron-mpc.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"minTxAmount": 50000,
"depositScheme": "approve",
"ddSubgraph": ""
"depositScheme": "approve"
}
},

Expand All @@ -147,6 +140,16 @@
"poolId": 16776968,
"prefix": "zkbob_nile_g",
"name": "USDT on Nile testnet (MPC guard contracts)"
},
{
"poolId": 16776969,
"prefix": "zkbob_sepolia_",
"name": "BOB on Sepolia testnet (decentralized sequencer, calldata without prover address)"
},
{
"poolId": 16776970,
"prefix": "zkbob_sepolia",
"name": "BOB on Sepolia testnet (decentralized sequencer)"
}
],

Expand All @@ -155,13 +158,13 @@
"rpcUrls": ["https://polygon-rpc.com", "https://rpc.ankr.com/polygon"]
},
"10": {
"rpcUrls": ["https://rpc.ankr.com/optimism", "https://mainnet.optimism.io"]
"rpcUrls": ["https://virtual.optimism.rpc.tenderly.co/fb1a77c3-e7f5-4622-aee5-85025a99a658"]
},
"11155111": {
"rpcUrls": ["https://sepolia.infura.io/v3/2a219563d6f8480db0e2ce66bcd8f29e", "https://eth-sepolia.public.blastapi.io", "https://rpc.sepolia.org"]
"rpcUrls": ["https://sepolia.drpc.org", "https://rpc.sepolia.org", "https://sepolia.infura.io/v3/2a219563d6f8480db0e2ce66bcd8f29e", "https://eth-sepolia.public.blastapi.io"]
},
"5": {
"rpcUrls": ["https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161"]
"rpcUrls": ["https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161", "https://goerli.gateway.tenderly.co", "https://goerli.blockpi.network/v1/rpc/public", "https://gateway.tenderly.co/public/goerli"]
},
"420": {
"rpcUrls": ["https://goerli.optimism.io"]
Expand Down Expand Up @@ -195,7 +198,7 @@
"address": "https://polygonscan.com/address/{{addr}}"
},
"10": {
"tx": "https://optimistic.etherscan.io/tx/{{hash}}",
"tx": "https://dashboard.tenderly.co/explorer/vnet/fb1a77c3-e7f5-4622-aee5-85025a99a658/tx/{{hash}}",
"address": "https://optimistic.etherscan.io/address/{{addr}}"
},
"11155111": {
Expand Down Expand Up @@ -225,36 +228,14 @@
},

"minters": {
"USDC-polygon": "",
"USDC-optimism": "",
"WETH-optimism": "",
"BOB-sepolia": "0xb9988D599A64723462955BfC8441F1Af90335796",
"BOB2USDC-goerli": "0x56c105D40f637eF3ac04905682b3DAEfF3F13D24",
"WETH-goerli": "",
"USDC-goerli": "0x56c105D40f637eF3ac04905682b3DAEfF3F13D24",
"BOB-op-goerli": "0x357cA353dbCad28418d5F3110727B2af62803F20",
"USDT-shasta": "",
"USDT-devnet": "TRdunaTZCKYM9xW3HGJjJLQYV6f89UHEkD",
"USDT-nile": "",
"USDT-nile-guard": "",
"USDT-tron": ""
"USDT-devnet": "TRdunaTZCKYM9xW3HGJjJLQYV6f89UHEkD"
},

"cloudApi": {
"USDC-polygon": "",
"USDC-optimism": "",
"WETH-optimism": "",
"BOB-sepolia": "http://45.77.217.163:8701",
"BOB2USDC-goerli": "",
"WETH-goerli": "",
"USDC-goerli": "",
"BOB-op-goerli": "",
"USDT-shasta": "",
"USDT-devnet": "",
"USDT-nile": "",
"USDT-nile-guard": "",
"USDT-tron": ""
},
"cloudApi": {},

"redemptionUrls": {
"USDC-polygon": "https://app.zkbob.com",
Expand All @@ -269,7 +250,8 @@
"USDT-devnet": "https://staging--zkbob.netlify.app",
"USDT-nile": "https://staging--zkbob.netlify.app",
"USDT-nile-guard": "https://staging--zkbob.netlify.app",
"USDT-tron": "https://tron.zkbob.com"
"USDT-tron": "https://tron.zkbob.com",
"USDC-op-tenderly": "https://app.zkbob.com"
},

"migrations": {
Expand Down Expand Up @@ -304,6 +286,15 @@
"lastTimestamp": 1696854269
}
}
},
"USDC-op-tenderly": {
"oldTokens": {
"BOB": {
"tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
"firstTimestamp": 0,
"lastTimestamp": 1696854269
}
}
}
}
}
34 changes: 19 additions & 15 deletions client-config-prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
"poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
"tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
"relayerUrls": ["https://relayer-optimism.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "usdc",
"ddSubgraph": "zkbob-bob-optimism"
Expand All @@ -28,12 +26,18 @@
"poolAddress": "0x58320A55bbc5F89E5D0c92108F762Ac0172C5992",
"tokenAddress": "0x4200000000000000000000000000000000000006",
"relayerUrls": ["https://relayer-eth-opt-mvp.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"isNative": true,
"minTxAmount": 0,
"depositScheme": "permit2",
"ddSubgraph": "zkbob-eth-optimism"
},
"USDT-tron": {
"chainId": 728126428,
"poolAddress": "TXViaNRhEugXpAZApviBqBnbTSKUgejnR9",
"tokenAddress": "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
"relayerUrls": ["https://relayer-tron-mpc.zkbob.com/"],
"coldStorageConfigPath": "",
"depositScheme": "approve"
}
},
"chains": {
Expand All @@ -42,6 +46,9 @@
},
"10": {
"rpcUrls": ["https://rpc.ankr.com/optimism", "https://mainnet.optimism.io"]
},
"728126428": {
"rpcUrls": ["https://api.trongrid.io"]
}
},
"blockExplorerUrls": {
Expand All @@ -52,26 +59,23 @@
"10": {
"tx": "https://optimistic.etherscan.io/tx/{{hash}}",
"address": "https://optimistic.etherscan.io/address/{{addr}}"
},
"728126428": {
"tx": "https://tronscan.org/#/transaction/{{hash}}",
"address": "https://tronscan.org/#/address/{{addr}}"
}
},
"globalSnarks": {
"transferParamsUrl": "./assets/transfer_params_prod.bin",
"transferVkUrl": "./assets/transfer_verification_key_prod.json"
},
"minters": {
"USDC-polygon": "",
"USDC-optimism": "",
"WETH-optimism": ""
},
"cloudApi": {
"USDC-polygon": "",
"USDC-optimism": "",
"WETH-optimism": ""
},
"minters": {},
"cloudApi": {},
"redemptionUrls": {
"USDC-polygon": "https://app.zkbob.com",
"USDC-optimism": "https://app.zkbob.com",
"WETH-optimism": "https://app.zkbob.com"
"WETH-optimism": "https://app.zkbob.com",
"USDT-tron": "https://tron.zkbob.com"
},
"migrations": {
"USDC-polygon": {
Expand Down
Loading
Loading