Skip to content

Commit

Permalink
Merging the develop branch into the main branch (v3.8.0)
Browse files Browse the repository at this point in the history 
- State updating progress (#94)
- Tron pool support (#95)
- Multiple SNARK params support (#96)
- Forced exit feature (#98)
- Minor bugs were fixed (#97)
  • Loading branch information
@EvgenKor
EvgenKor authored Nov 10, 2023
2 parents 97bd1ed + 25864ce commit ffa5cc8
Show file tree
Hide file tree
Showing 11 changed files with 2,462 additions and 1,025 deletions.
2 changes: 1 addition & 1 deletion .env
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CONFIG_JSON='./client-config.json'
CONFIG_JSON='./client-config-full.json'
270 changes: 270 additions & 0 deletions client-config-full.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
{
"defaultPool": "BOB2USDC-goerli",

"pools": {
"USDC-polygon": {
"chainId": 137,
"parameters": "prod",
"poolAddress": "0x72e6B59D4a90ab232e55D4BB7ed2dD17494D62fB",
"tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
"relayerUrls": ["https://relayer-mvp.zkbob.com"],
"delegatedProverUrls": ["https://remoteprover-mvp.zkbob.com/"],
"coldStorageConfigPath": "./assets/coldstorage/zkbob-polygon-coldstorage.cfg",
"feeDecimals": 2,
"depositScheme": "usdc-polygon",
"ddSubgraph": "zkbob-usdc-polygon"
},
"BOB-optimism": {
"chainId": 10,
"parameters": "prod",
"poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
"tokenAddress": "0xB0B195aEFA3650A6908f15CdaC7D92F8a5791B0B",
"relayerUrls": ["https://relayer-optimism.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "permit",
"ddSubgraph": "zkbob-bob-optimism"
},
"WETH-optimism": {
"chainId": 10,
"parameters": "prod",
"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",
"tokenAddress": "0x2C74B18e2f84B78ac67428d0c7a9898515f0c46f",
"relayerUrls": ["https://relayer.thgkjlr.website/"],
"delegatedProverUrls": ["https://prover-staging.thgkjlr.website/"],
"coldStorageConfigPath": "./assets/coldstorage/zkbob-sepolia-coldstorage.cfg",
"feeDecimals": 2,
"depositScheme": "permit",
"ddSubgraph": "https://api.studio.thegraph.com/query/50398/zkbob-bob-sepolia/version/latest"
},
"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"
},
"WETH-goerli": {
"chainId": 5,
"poolAddress": "0xf9dbCF4005497e042838dE9082C817fCa790e945",
"tokenAddress": "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6",
"relayerUrls": ["https://goerli-weth-relayer.thgkjlr.website/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"minTxAmount": 0,
"depositScheme": "permit2",
"isNative": true,
"ddSubgraph": "zkbob-eth-goerli"
},
"USDC-goerli": {
"chainId": 5,
"poolAddress": "0xCF6446Deb67b2b56604657C67DAF54f884412531",
"tokenAddress": "0x28B531401Ee3f17521B3772c13EAF3f86C2Fe780",
"relayerUrls": ["https://goerli-usdc-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"minTxAmount": 50000,
"depositScheme": "usdc-polygon",
"ddSubgraph": "zkbob-usdc-goerli"
},
"BOB-op-goerli": {
"chainId":420,
"poolAddress":"0x55B81b0730399974Ccad8AC858e766Cf54126596",
"tokenAddress":"0x0fA7E69b9344D6434Bd6b79c5950bb5234245a5F",
"relayerUrls":["https://gop-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "permit",
"ddSubgraph": "zkbob-bob-goerli-opt"
},
"USDT-shasta": {
"chainId": 2494104990,
"poolAddress": "TLTyi81NhoeGfsq8Ef1STDYs6E7HFSAruV",
"tokenAddress": "TG3XXyExBkPp9nzdajDZsozEu4BkaSJozs",
"relayerUrls": ["https://shasta-relayer.thgkjlr.website"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"minTxAmount": 50000,
"depositScheme": "approve"
},
"USDT-devnet": {
"chainId": 728126428,
"poolAddress": "TVtGa6o4KWYa6pfcd6A34xQte1FuDJPFah",
"tokenAddress": "TRdunaTZCKYM9xW3HGJjJLQYV6f89UHEkD",
"relayerUrls": ["https://tron-devnet-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"
}
},

"chains": {
"137": {
"rpcUrls": ["https://polygon-rpc.com", "https://rpc.ankr.com/polygon"]
},
"10": {
"rpcUrls": ["https://rpc.ankr.com/optimism", "https://mainnet.optimism.io"]
},
"11155111": {
"rpcUrls": ["https://sepolia.infura.io/v3/2a219563d6f8480db0e2ce66bcd8f29e", "https://eth-sepolia.public.blastapi.io", "https://rpc.sepolia.org"]
},
"5": {
"rpcUrls": ["https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161"]
},
"420": {
"rpcUrls": ["https://goerli.optimism.io"]
},
"2494104990": {
"rpcUrls": ["https://api.shasta.trongrid.io"]
},
"728126428": {
"rpcUrls": ["https://tron-devnet.zkbob.com"]
},
"3448148188": {
"rpcUrls": ["https://nile.trongrid.io"]
}
},

"globalSnarks": {
"transferParamsUrl": "./assets/transfer_params.bin",
"transferVkUrl": "./assets/transfer_verification_key.json"
},

"snarkParamsSet": {
"prod": {
"transferParamsUrl": "./assets/transfer_params_prod.bin",
"transferVkUrl": "./assets/transfer_verification_key_prod.json"
}
},

"blockExplorerUrls": {
"137": {
"tx": "https://polygonscan.com/tx/{{hash}}",
"address": "https://polygonscan.com/address/{{addr}}"
},
"10": {
"tx": "https://optimistic.etherscan.io/tx/{{hash}}",
"address": "https://optimistic.etherscan.io/address/{{addr}}"
},
"11155111": {
"tx": "https://sepolia.etherscan.io/tx/{{hash}}",
"address": "https://sepolia.etherscan.io/address/{{addr}}"
},
"5": {
"tx": "https://goerli.etherscan.io/tx/{{hash}}",
"address": "https://goerli.etherscan.io/address/{{addr}}"
},
"420": {
"tx": "https://goerli-optimism.etherscan.io/tx/{{hash}}",
"address": "https://goerli-optimism.etherscan.io/address/{{addr}}"
},
"2494104990": {
"tx": "https://shasta.tronscan.org/#/transaction/{{hash}}",
"address": "https://shasta.tronscan.org/#/address/{{addr}}"
},
"728126428": {
"tx": "{{hash}}",
"address": "{{addr}}"
},
"3448148188": {
"tx": "https://nile.tronscan.org/#/transaction/{{hash}}",
"address": "https://nile.tronscan.org/#/address/{{addr}}"
}
},

"minters": {
"USDC-polygon": "",
"BOB-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": ""
},

"cloudApi": {
"USDC-polygon": "",
"BOB-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": ""
},

"redemptionUrls": {
"USDC-polygon": "https://app.zkbob.com",
"BOB-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",
"WETH-goerli": "https://staging--zkbob.netlify.app",
"USDC-goerli": "https://staging--zkbob.netlify.app",
"BOB-op-goerli": "https://staging--zkbob.netlify.app",
"USDT-shasta": "https://staging--zkbob.netlify.app",
"USDT-devnet": "https://staging--zkbob.netlify.app",
"USDT-nile": "https://staging--zkbob.netlify.app"
},

"migrations": {
"BOB2USDC-goerli": {
"oldTokens": {
"BOB": {
"tokenAddress": "0x97a4ab97028466FE67F18A6cd67559BAABE391b8",
"firstTimestamp": 0,
"lastTimestamp": 1688651376
}
}
},
"USDC-polygon": {
"oldTokens": {
"BOB": {
"tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
"firstTimestamp": 0,
"lastTimestamp": 1689689468
}
}
}
}
}
87 changes: 87 additions & 0 deletions client-config-prod.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"defaultPool": "USDC-polygon",
"pools": {
"USDC-polygon": {
"chainId": 137,
"poolAddress": "0x72e6B59D4a90ab232e55D4BB7ed2dD17494D62fB",
"tokenAddress": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
"relayerUrls": ["https://relayer-mvp.zkbob.com"],
"delegatedProverUrls": ["https://remoteprover-mvp.zkbob.com/"],
"coldStorageConfigPath": "./assets/coldstorage/zkbob-polygon-coldstorage.cfg",
"feeDecimals": 2,
"depositScheme": "usdc-polygon",
"ddSubgraph": "zkbob-usdc-polygon"
},
"BOB-optimism": {
"chainId": 10,
"poolAddress": "0x1CA8C2B9B20E18e86d5b9a72370fC6c91814c97C",
"tokenAddress": "0xB0B195aEFA3650A6908f15CdaC7D92F8a5791B0B",
"relayerUrls": ["https://relayer-optimism.zkbob.com/"],
"delegatedProverUrls": [],
"coldStorageConfigPath": "",
"feeDecimals": 2,
"depositScheme": "permit",
"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",
"ddSubgraph": "zkbob-eth-optimism"
}
},
"chains": {
"137": {
"rpcUrls": ["https://rpc.ankr.com/polygon"]
},
"10": {
"rpcUrls": ["https://rpc.ankr.com/optimism", "https://mainnet.optimism.io"]
}
},
"blockExplorerUrls": {
"137": {
"tx": "https://polygonscan.com/tx/{{hash}}",
"address": "https://polygonscan.com/address/{{addr}}"
},
"10": {
"tx": "https://optimistic.etherscan.io/tx/{{hash}}",
"address": "https://optimistic.etherscan.io/address/{{addr}}"
}
},
"globalSnarks": {
"transferParamsUrl": "./assets/transfer_params_prod.bin",
"transferVkUrl": "./assets/transfer_verification_key_prod.json"
},
"minters": {
"USDC-polygon": "",
"BOB-optimism": "",
"WETH-optimism": ""
},
"cloudApi": {
"USDC-polygon": "",
"BOB-optimism": "",
"WETH-optimism": ""
},
"redemptionUrls": {
"USDC-polygon": "https://app.zkbob.com",
"BOB-optimism": "https://app.zkbob.com",
"WETH-optimism": "https://app.zkbob.com"
},
"migrations": {
"USDC-polygon": {
"oldTokens": {
"BOB": {
"tokenAddress": "0xb0b195aefa3650a6908f15cdac7d92f8a5791b0b",
"firstTimestamp": 0,
"lastTimestamp": 1689689468
}
}
}
}
}
Loading

0 comments on commit ffa5cc8

Please sign in to comment.