From a624b245e09c21aa46b0a458e0c06dcd57f26e5a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 22 Aug 2023 13:23:07 +0200 Subject: [PATCH 001/180] Add support for deploying fee token based chains --- scripts/ethcommands.ts | 40 +++++++++++++++++++++++++++++++++++++++- scripts/index.ts | 1 + scripts/package.json | 1 + scripts/tsconfig.json | 3 ++- scripts/yarn.lock | 5 +++++ test-node.bash | 21 ++++++++++++++++++--- 6 files changed, 66 insertions(+), 5 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index b5572f43..7ca51f6b 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -1,5 +1,5 @@ import { runStress } from "./stress"; -import { ethers } from "ethers"; +import { ContractFactory, ethers, Wallet } from "ethers"; import * as consts from "./consts"; import { namedAccount, namedAddress } from "./accounts"; import * as fs from "fs"; @@ -116,6 +116,44 @@ export const bridgeToL3Command = { }, }; +export const createERC20Command = { + command: "create-erc20", + describe: "creates simple ERC20 on L1", + builder: { + deployerKey: { + string: true, + describe: "account (see general help)", + default: "funnel", + }, + mintTo: { + string: true, + describe: "account (see general help)", + default: "funnel", + }, + }, + handler: async (argv: any) => { + console.log("create-erc20"); + + argv.provider = new ethers.providers.WebSocketProvider(argv.l1url); + + const contractFactory = new ContractFactory( + ERC20PresetFixedSupplyArtifact.abi, + ERC20PresetFixedSupplyArtifact.bytecode, + new Wallet( + argv.deployerKey, + argv.provider + ) + ); + const contract = await contractFactory.deploy("AppTestToken", "APP", ethers.utils.parseEther("1000000000"), namedAccount(argv.mintTo).address); + await contract.deployTransaction.wait(); + + console.log("Contract deployed at address:", contract.address); + + argv.provider.destroy(); + }, +}; + + export const sendL1Command = { command: "send-l1", describe: "sends funds between l1 accounts", diff --git a/scripts/index.ts b/scripts/index.ts index 8e5e7086..a1ef817a 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -11,6 +11,7 @@ import { import { bridgeFundsCommand, bridgeToL3Command, + createERC20Command, sendL1Command, sendL2Command, sendL3Command, diff --git a/scripts/package.json b/scripts/package.json index e6ab62ec..49e8aed8 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -7,6 +7,7 @@ "license": "Apache-2.0", "dependencies": { "@node-redis/client": "^1.0.4", + "@openzeppelin/contracts": "^4.9.3", "@types/node": "^17.0.22", "@types/yargs": "^17.0.10", "ethers": "^5.6.1", diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index c90e21b4..fc6307bc 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -4,7 +4,8 @@ "module": "CommonJS", "strict": true, "esModuleInterop": true, - "moduleResolution": "node" + "moduleResolution": "node", + "resolveJsonModule": true }, "files": ["index.ts"] } diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 624f5bcc..eaeb8d5c 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -352,6 +352,11 @@ redis-parser "3.0.0" yallist "4.0.0" +"@openzeppelin/contracts@^4.9.3": + version "4.9.3" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364" + integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg== + "@types/node@^17.0.22": version "17.0.22" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" diff --git a/test-node.bash b/test-node.bash index ae61555b..c56ef015 100755 --- a/test-node.bash +++ b/test-node.bash @@ -40,6 +40,7 @@ consensusclient=false redundantsequencers=0 dev_build_nitro=false dev_build_blockscout=false +customFeeToken=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 @@ -99,6 +100,10 @@ while [[ $# -gt 0 ]]; do detach=true shift ;; + --fee-token) + customFeeToken=true + shift + ;; --batchposters) batchposters=$2 if ! [[ $batchposters =~ [0-3] ]] ; then @@ -136,6 +141,7 @@ while [[ $# -gt 0 ]]; do echo --init: remove all data, rebuild, deploy new rollup echo --pos: l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate: heavy computation, validating all blocks in WASM + echo --fee-token: chain is set up to use custom fee token echo --batchposters: batch posters [0-3] echo --redundantsequencers redundant sequencers [0-3] echo --detach: detach from nodes after running them @@ -300,11 +306,18 @@ if $force_init; then echo == Writing l2 chain config docker-compose run scripts write-l2-chain-config - echo == Deploying L2 sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json + deployL2Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json" + if $customFeeToken; then + echo == Deploying custom fee token + nativeTokenAddress=`docker-compose run testnode-scripts create-erc20 --deployerKey $devprivkey --mintTo user_l1user | tail -n 1 | awk '{ print $NF }'` + deployL2Command+=" --nativeERC20TokenAddress $nativeTokenAddress" + fi + echo == Deploying L2 + eval $deployL2Command docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" + echo == Writing configs docker-compose run scripts write-config @@ -313,7 +326,9 @@ if $force_init; then echo == Funding l2 funnel docker-compose up -d $INITIAL_SEQ_NODES - docker-compose run scripts bridge-funds --ethamount 100000 --wait + if ! $customFeeToken; then + docker-compose run scripts bridge-funds --ethamount 100000 --wait + fi if $tokenbridge; then echo == Deploying token bridge From 109b7f9506f95e69c019cb2c0032f1a0dc11fb70 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 22 Aug 2023 13:29:17 +0200 Subject: [PATCH 002/180] Add missing import --- scripts/ethcommands.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 7ca51f6b..690a588c 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -2,6 +2,7 @@ import { runStress } from "./stress"; import { ContractFactory, ethers, Wallet } from "ethers"; import * as consts from "./consts"; import { namedAccount, namedAddress } from "./accounts"; +import * as ERC20PresetFixedSupplyArtifact from "@openzeppelin/contracts/build/contracts/ERC20PresetFixedSupply.json"; import * as fs from "fs"; const path = require("path"); From 3c780e305b8a0f9897263c3aca88112243890427 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 22 Aug 2023 13:33:20 +0200 Subject: [PATCH 003/180] Service renamed --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index c56ef015..6256af5e 100755 --- a/test-node.bash +++ b/test-node.bash @@ -311,7 +311,7 @@ if $force_init; then deployL2Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json" if $customFeeToken; then echo == Deploying custom fee token - nativeTokenAddress=`docker-compose run testnode-scripts create-erc20 --deployerKey $devprivkey --mintTo user_l1user | tail -n 1 | awk '{ print $NF }'` + nativeTokenAddress=`docker-compose run scripts create-erc20 --deployerKey $devprivkey --mintTo user_l1user | tail -n 1 | awk '{ print $NF }'` deployL2Command+=" --nativeERC20TokenAddress $nativeTokenAddress" fi echo == Deploying L2 From faf4fff6f89176f8c160ad847ce9f6b59bfa66b6 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 22 Aug 2023 13:35:41 +0200 Subject: [PATCH 004/180] Add missing command --- scripts/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/index.ts b/scripts/index.ts index a1ef817a..969e104e 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -30,6 +30,7 @@ async function main() { .options(stressOptions) .command(bridgeFundsCommand) .command(bridgeToL3Command) + .command(createERC20Command) .command(sendL1Command) .command(sendL2Command) .command(sendL3Command) From 441166624c54857a11c0a880f12e19d7dbeebc69 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 22 Sep 2023 19:23:57 +0200 Subject: [PATCH 005/180] Refactor how native token is provided. iAlso don't deploy token bridge in fee token mode --- test-node.bash | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/test-node.bash b/test-node.bash index 6256af5e..af171e49 100755 --- a/test-node.bash +++ b/test-node.bash @@ -308,14 +308,15 @@ if $force_init; then sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - deployL2Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json" if $customFeeToken; then echo == Deploying custom fee token nativeTokenAddress=`docker-compose run scripts create-erc20 --deployerKey $devprivkey --mintTo user_l1user | tail -n 1 | awk '{ print $NF }'` - deployL2Command+=" --nativeERC20TokenAddress $nativeTokenAddress" + else + nativeTokenAddress="0x0000000000000000000000000000000000000000" fi + echo == Deploying L2 - eval $deployL2Command + docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json --nativeTokenAddress $nativeTokenAddress docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" echo == Writing configs @@ -328,13 +329,14 @@ if $force_init; then docker-compose up -d $INITIAL_SEQ_NODES if ! $customFeeToken; then docker-compose run scripts bridge-funds --ethamount 100000 --wait - fi - - if $tokenbridge; then - echo == Deploying token bridge - docker-compose run -e ARB_KEY=$devprivkey -e ETH_KEY=$devprivkey tokenbridge gen:network - docker-compose run --entrypoint sh tokenbridge -c "cat localNetwork.json" - echo + if $tokenbridge; then + echo == Deploying token bridge + docker-compose run -e ARB_KEY=$devprivkey -e ETH_KEY=$devprivkey tokenbridge gen:network + docker-compose run --entrypoint sh tokenbridge -c "cat localNetwork.json" + echo + fi + else + echo == Skipping token bridge deployment when cusotm fee token is used fi if $l3node; then From 4e1117eaa68ff2965a9baff474bd91e604d7e4f7 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 2 Oct 2023 11:57:58 -0600 Subject: [PATCH 006/180] simple: initial --- docker-compose.yaml | 5 +--- scripts/config.ts | 59 ++++++++++++++++++++++++++++++--------------- test-node.bash | 45 ++++++++++++++++++++++++++-------- 3 files changed, 76 insertions(+), 33 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 7f76bb9f..b1f80871 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -158,12 +158,11 @@ services: - "127.0.0.1:9642:9642" volumes: - "seqdata:/home/user/.arbitrum/local/nitro" + - "l1keystore:/home/user/l1keystore" - "config:/config" command: --conf.file /config/sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642 --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain * depends_on: - geth - - redis - sequencer_b: pid: host # allow debugging @@ -313,8 +312,6 @@ services: volumes: - "l1keystore:/home/user/l1keystore" - "config:/config" - depends_on: - - redis relay: pid: host diff --git a/scripts/config.ts b/scripts/config.ts index 044f0d61..7dd57cbd 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -234,28 +234,42 @@ function writeConfigs(argv: any) { const baseConfJSON = JSON.stringify(baseConfig) - let validatorConfig = JSON.parse(baseConfJSON) - validatorConfig["parent-chain"].wallet.account = namedAccount("validator").address - validatorConfig.node.staker.enable = true - validatorConfig.node.staker["use-smart-contract-wallet"] = true - let validconfJSON = JSON.stringify(validatorConfig) - fs.writeFileSync(path.join(consts.configpath, "validator_config.json"), validconfJSON) + if (argv.simple) { + let simpleConfig = JSON.parse(baseConfJSON) + simpleConfig["parent-chain"].wallet.account = namedAccount("sequencer").address + simpleConfig.node.staker.enable = true + simpleConfig.node.staker["use-smart-contract-wallet"] = true + simpleConfig.node.staker.dangerous["without-block-validator"] = true + simpleConfig.node.sequencer.enable = true + simpleConfig.node.sequencer.dangerous["no-coordinator"] = true + simpleConfig.node["delayed-sequencer"].enable = true + simpleConfig.node["batch-poster"].enable = true + simpleConfig.node["batch-poster"]["redis-url"] = "" + fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(simpleConfig)) + } else { + let validatorConfig = JSON.parse(baseConfJSON) + validatorConfig["parent-chain"].wallet.account = namedAccount("validator").address + validatorConfig.node.staker.enable = true + validatorConfig.node.staker["use-smart-contract-wallet"] = true + let validconfJSON = JSON.stringify(validatorConfig) + fs.writeFileSync(path.join(consts.configpath, "validator_config.json"), validconfJSON) - let unsafeStakerConfig = JSON.parse(validconfJSON) - unsafeStakerConfig.node.staker.dangerous["without-block-validator"] = true - fs.writeFileSync(path.join(consts.configpath, "unsafe_staker_config.json"), JSON.stringify(unsafeStakerConfig)) + let unsafeStakerConfig = JSON.parse(validconfJSON) + unsafeStakerConfig.node.staker.dangerous["without-block-validator"] = true + fs.writeFileSync(path.join(consts.configpath, "unsafe_staker_config.json"), JSON.stringify(unsafeStakerConfig)) - let sequencerConfig = JSON.parse(baseConfJSON) - sequencerConfig.node.sequencer.enable = true - sequencerConfig.node["seq-coordinator"].enable = true - sequencerConfig.node["delayed-sequencer"].enable = true - fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) + let sequencerConfig = JSON.parse(baseConfJSON) + sequencerConfig.node.sequencer.enable = true + sequencerConfig.node["seq-coordinator"].enable = true + sequencerConfig.node["delayed-sequencer"].enable = true + fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) - let posterConfig = JSON.parse(baseConfJSON) - posterConfig["parent-chain"].wallet.account = namedAccount("sequencer").address - posterConfig.node["seq-coordinator"].enable = true - posterConfig.node["batch-poster"].enable = true - fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) + let posterConfig = JSON.parse(baseConfJSON) + posterConfig["parent-chain"].wallet.account = namedAccount("sequencer").address + posterConfig.node["seq-coordinator"].enable = true + posterConfig.node["batch-poster"].enable = true + fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) + } let l3Config = JSON.parse(baseConfJSON) l3Config["parent-chain"].connection.url = argv.l2url @@ -363,6 +377,13 @@ function writeL3ChainConfig(argv: any) { export const writeConfigCommand = { command: "write-config", describe: "writes config files", + builder: { + simple: { + boolean: true, + describe: "simple config (sequencer is also poster, validator)", + default: false, + }, + }, handler: (argv: any) => { writeConfigs(argv) } diff --git a/test-node.bash b/test-node.bash index b744548c..1b220534 100755 --- a/test-node.bash +++ b/test-node.bash @@ -34,7 +34,7 @@ force_build=false validate=false detach=false blockscout=false -tokenbridge=true +tokenbridge=false l3node=false consensusclient=false redundantsequencers=0 @@ -43,6 +43,7 @@ dev_build_blockscout=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 +simple=true while [[ $# -gt 0 ]]; do case $1 in --init) @@ -59,6 +60,7 @@ while [[ $# -gt 0 ]]; do shift ;; --dev) + simple=false shift if [[ $# -eq 0 || $1 == -* ]]; then # If no argument after --dev, set both flags to true @@ -80,6 +82,7 @@ while [[ $# -gt 0 ]]; do shift ;; --validate) + simple=false validate=true shift ;; @@ -87,6 +90,10 @@ while [[ $# -gt 0 ]]; do blockscout=true shift ;; + --tokenbridge) + tokenbridge=true + shift + ;; --no-tokenbridge) tokenbridge=false shift @@ -100,6 +107,7 @@ while [[ $# -gt 0 ]]; do shift ;; --batchposters) + simple=false batchposters=$2 if ! [[ $batchposters =~ [0-3] ]] ; then echo "batchposters must be between 0 and 3 value:$batchposters." @@ -118,6 +126,7 @@ while [[ $# -gt 0 ]]; do shift ;; --redundantsequencers) + simple=false redundantsequencers=$2 if ! [[ $redundantsequencers =~ [0-3] ]] ; then echo "redundantsequencers must be between 0 and 3 value:$redundantsequencers." @@ -126,6 +135,14 @@ while [[ $# -gt 0 ]]; do shift shift ;; + --simple) + simple=true + shift + ;; + --no-simple) + simple=false + shift + ;; *) echo Usage: $0 \[OPTIONS..] echo $0 script [SCRIPT-ARGS] @@ -142,6 +159,7 @@ while [[ $# -gt 0 ]]; do echo --blockscout: build or launch blockscout echo --no-tokenbridge: don\'t build or launch tokenbridge echo --no-run: does not launch nodes \(usefull with build or init\) + echo --[no-]simple simple \(on by default unless dev-build\) has only one node for l2, no redis echo echo script runs inside a separate docker. For SCRIPT-ARGS, run $0 script --help exit 0 @@ -178,7 +196,7 @@ if [ $redundantsequencers -gt 2 ]; then NODES="$NODES sequencer_d" fi -if [ $batchposters -gt 0 ]; then +if [ $batchposters -gt 0 ] && ! $simple; then NODES="$NODES poster" fi if [ $batchposters -gt 1 ]; then @@ -191,8 +209,8 @@ fi if $validate; then NODES="$NODES validator" -else - NODES="$NODES staker-unsafe" +elif ! $simple; then + NODES="redis $NODES staker-unsafe" fi if $l3node; then NODES="$NODES l3node" @@ -303,13 +321,20 @@ if $force_init; then echo == Deploying L2 sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json - docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" - echo == Writing configs - docker-compose run scripts write-config + docker-compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json + docker-compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" - echo == Initializing redis - docker-compose run scripts redis-init --redundancy $redundantsequencers + if $simple; then + echo == Writing configs + docker-compose run scripts write-config --simple + else + echo == Writing configs + docker-compose run scripts write-config + + echo == Initializing redis + docker-compose up -d redis + docker-compose run scripts redis-init --redundancy $redundantsequencers + fi echo == Funding l2 funnel docker-compose up -d $INITIAL_SEQ_NODES From d188a02a708d34f6b26f32871a32a1a4d10b49c4 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Mon, 9 Oct 2023 15:49:40 +0200 Subject: [PATCH 007/180] Create native token on L2 --- scripts/ethcommands.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 690a588c..42f20946 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -119,7 +119,7 @@ export const bridgeToL3Command = { export const createERC20Command = { command: "create-erc20", - describe: "creates simple ERC20 on L1", + describe: "creates simple ERC20 on L2", builder: { deployerKey: { string: true, @@ -135,7 +135,7 @@ export const createERC20Command = { handler: async (argv: any) => { console.log("create-erc20"); - argv.provider = new ethers.providers.WebSocketProvider(argv.l1url); + argv.provider = new ethers.providers.WebSocketProvider(argv.l2url); const contractFactory = new ContractFactory( ERC20PresetFixedSupplyArtifact.abi, From 782280f22c87ebcd6ed9f1025a4a8c37aa95861d Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Mon, 9 Oct 2023 15:51:21 +0200 Subject: [PATCH 008/180] Deploy L3 with fee token --- test-node.bash | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/test-node.bash b/test-node.bash index af171e49..e92670c1 100755 --- a/test-node.bash +++ b/test-node.bash @@ -308,15 +308,8 @@ if $force_init; then sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - if $customFeeToken; then - echo == Deploying custom fee token - nativeTokenAddress=`docker-compose run scripts create-erc20 --deployerKey $devprivkey --mintTo user_l1user | tail -n 1 | awk '{ print $NF }'` - else - nativeTokenAddress="0x0000000000000000000000000000000000000000" - fi - echo == Deploying L2 - docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json --nativeTokenAddress $nativeTokenAddress + docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" echo == Writing configs @@ -327,16 +320,12 @@ if $force_init; then echo == Funding l2 funnel docker-compose up -d $INITIAL_SEQ_NODES - if ! $customFeeToken; then - docker-compose run scripts bridge-funds --ethamount 100000 --wait - if $tokenbridge; then - echo == Deploying token bridge - docker-compose run -e ARB_KEY=$devprivkey -e ETH_KEY=$devprivkey tokenbridge gen:network - docker-compose run --entrypoint sh tokenbridge -c "cat localNetwork.json" - echo - fi - else - echo == Skipping token bridge deployment when cusotm fee token is used + docker-compose run scripts bridge-funds --ethamount 100000 --wait + if $tokenbridge; then + echo == Deploying token bridge + docker-compose run -e ARB_KEY=$devprivkey -e ETH_KEY=$devprivkey tokenbridge gen:network + docker-compose run --entrypoint sh tokenbridge -c "cat localNetwork.json" + echo fi if $l3node; then @@ -354,16 +343,24 @@ if $force_init; then echo == Deploying L3 l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` - l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json + deployL3Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json" + if $customFeeToken; then + echo == Deploying custom fee token + nativeTokenAddress=`docker-compose run scripts create-erc20 --deployerKey $devprivkey --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` + deployL3Command+=" --nativeTokenAddress $nativeTokenAddress" + fi + + eval $deployL3Command docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel docker-compose up -d l3node poster - docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait + if ! $customFeeToken; then + docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait + fi fi fi From 2f8969b7144598c5447e5a24e559c7774816d8c1 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 10 Oct 2023 14:47:12 +0200 Subject: [PATCH 009/180] Provide maxDataSize --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index f1848225..ff322968 100755 --- a/test-node.bash +++ b/test-node.bash @@ -345,7 +345,7 @@ if $force_init; then l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - deployL3Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json" + deployL3Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857" if $customFeeToken; then echo == Deploying custom fee token nativeTokenAddress=`docker-compose run scripts create-erc20 --deployerKey $devprivkey --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` From 82a072dde9f82ac57bd9ff4306dae7c36c980dba Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 13 Oct 2023 10:25:42 +0200 Subject: [PATCH 010/180] Use different deployers to have consistent addresses --- scripts/ethcommands.ts | 15 ++++++++------- test-node.bash | 6 ++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 42f20946..d0832b77 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -121,29 +121,30 @@ export const createERC20Command = { command: "create-erc20", describe: "creates simple ERC20 on L2", builder: { - deployerKey: { + deployer: { string: true, describe: "account (see general help)", - default: "funnel", + default: "user_l2user", }, mintTo: { string: true, describe: "account (see general help)", - default: "funnel", + default: "user_l2user", }, }, handler: async (argv: any) => { console.log("create-erc20"); argv.provider = new ethers.providers.WebSocketProvider(argv.l2url); + const deployerWallet = new Wallet( + ethers.utils.sha256(ethers.utils.toUtf8Bytes(argv.deployer)), + argv.provider + ); const contractFactory = new ContractFactory( ERC20PresetFixedSupplyArtifact.abi, ERC20PresetFixedSupplyArtifact.bytecode, - new Wallet( - argv.deployerKey, - argv.provider - ) + deployerWallet ); const contract = await contractFactory.deploy("AppTestToken", "APP", ethers.utils.parseEther("1000000000"), namedAccount(argv.mintTo).address); await contract.deployTransaction.wait(); diff --git a/test-node.bash b/test-node.bash index ff322968..1cb97d74 100755 --- a/test-node.bash +++ b/test-node.bash @@ -336,7 +336,9 @@ if $force_init; then echo == create l2 traffic docker-compose run scripts send-l2 --ethamount 100 --to user_l2user --wait - docker-compose run scripts send-l2 --ethamount 0.0001 --from user_l2user --to user_l2user_b --wait --delay 500 --times 500 > /dev/null & + docker-compose run scripts send-l2 --ethamount 100 --to user_l2user_b --wait + docker-compose run scripts send-l2 --ethamount 100 --to user_l2user_c --wait + docker-compose run scripts send-l2 --ethamount 0.0001 --from user_l2user_c --to user_l2user_b --wait --delay 500 --times 500 > /dev/null & echo == Writing l3 chain config docker-compose run scripts write-l3-chain-config @@ -348,7 +350,7 @@ if $force_init; then deployL3Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857" if $customFeeToken; then echo == Deploying custom fee token - nativeTokenAddress=`docker-compose run scripts create-erc20 --deployerKey $devprivkey --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` + nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_l2user_b --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` deployL3Command+=" --nativeTokenAddress $nativeTokenAddress" fi From aee6ceff9c9d3fb2749da55a7d7842f23d1bfc8e Mon Sep 17 00:00:00 2001 From: ganeshvanahalli Date: Fri, 13 Oct 2023 14:03:25 -0500 Subject: [PATCH 011/180] initialize required config fields wrt current nitro --- scripts/config.ts | 145 +++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 044f0d61..f82c3314 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -32,7 +32,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242 } function writeGethGenesisConfig(argv: any) { - const gethConfig = ` + const gethConfig = ` { "config": { "ChainName": "l1_chain", @@ -152,10 +152,10 @@ function writeGethGenesisConfig(argv: any) { function writeConfigs(argv: any) { const valJwtSecret = path.join(consts.configpath, "val_jwt.hex") - const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") + const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") const baseConfig = { "parent-chain": { - "connection" : { + "connection": { "url": argv.l1url, }, "wallet": { @@ -169,8 +169,6 @@ function writeConfigs(argv: any) { "info-files": [chainInfoFile], }, "node": { - "archive": true, - "forwarding-target": "null", "staker": { "dangerous": { "without-block-validator": false @@ -181,11 +179,9 @@ function writeConfigs(argv: any) { "make-assertion-interval": "10s", "strategy": "MakeNodes", }, - "sequencer": { - "enable": false, - "dangerous": { - "no-coordinator": false - } + "sequencer": false, + "dangerous": { + "no-sequencer-coordinator": false }, "delayed-sequencer": { "enable": false @@ -206,18 +202,23 @@ function writeConfigs(argv: any) { "max-delay": "30s", "data-poster": { "redis-signer": { - "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" + "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" }, "wait-for-l1-finality": false } }, "block-validator": { - "validation-server" : { - "url": argv.validationNodeUrl, - "jwtsecret": valJwtSecret, - } + "validation-server": { + "url": argv.validationNodeUrl, + "jwtsecret": valJwtSecret, + } } }, + "execution": { + "sequencer": { + "enable": false, + }, + }, "persistent": { "chain": "local" }, @@ -246,8 +247,9 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "unsafe_staker_config.json"), JSON.stringify(unsafeStakerConfig)) let sequencerConfig = JSON.parse(baseConfJSON) - sequencerConfig.node.sequencer.enable = true + sequencerConfig.node.sequencer = true sequencerConfig.node["seq-coordinator"].enable = true + sequencerConfig.execution["sequencer"].enable = true sequencerConfig.node["delayed-sequencer"].enable = true fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) @@ -258,15 +260,16 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) let l3Config = JSON.parse(baseConfJSON) - l3Config["parent-chain"].connection.url = argv.l2url + l3Config["parent-chain"].connection.url = argv.l2url l3Config["parent-chain"].wallet.account = namedAccount("l3sequencer").address l3Config.chain.id = 333333 const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json") l3Config.chain["info-files"] = [l3ChainInfoFile] l3Config.node.staker.enable = true l3Config.node.staker["use-smart-contract-wallet"] = true - l3Config.node.sequencer.enable = true - l3Config.node.sequencer.dangerous["no-coordinator"] = true + l3Config.node.sequencer = true + l3Config.execution["sequencer"].enable = true + l3Config.node["dangerous"]["no-sequencer-coordinator"] = true l3Config.node["delayed-sequencer"].enable = true l3Config.node["batch-poster"].enable = true l3Config.node["batch-poster"]["redis-url"] = "" @@ -296,32 +299,32 @@ function writeConfigs(argv: any) { function writeL2ChainConfig(argv: any) { const l2ChainConfig = { - "chainId": 412346, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": argv.l2owner, - "GenesisBlockNum": 0 - } + "chainId": 412346, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": argv.l2owner, + "GenesisBlockNum": 0 + } } const l2ChainConfigJSON = JSON.stringify(l2ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l2_chain_config.json"), l2ChainConfigJSON) @@ -329,32 +332,32 @@ function writeL2ChainConfig(argv: any) { function writeL3ChainConfig(argv: any) { const l3ChainConfig = { - "chainId": 333333, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": "0x0000000000000000000000000000000000000000", - "GenesisBlockNum": 0 - } + "chainId": 333333, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": "0x0000000000000000000000000000000000000000", + "GenesisBlockNum": 0 + } } const l3ChainConfigJSON = JSON.stringify(l3ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l3_chain_config.json"), l3ChainConfigJSON) From 9f2bd4b0743ad111a050371b4c5233744f0e4622 Mon Sep 17 00:00:00 2001 From: ganeshvanahalli Date: Fri, 13 Oct 2023 14:03:25 -0500 Subject: [PATCH 012/180] initialize required config fields wrt current nitro --- scripts/config.ts | 145 +++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 044f0d61..f82c3314 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -32,7 +32,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242 } function writeGethGenesisConfig(argv: any) { - const gethConfig = ` + const gethConfig = ` { "config": { "ChainName": "l1_chain", @@ -152,10 +152,10 @@ function writeGethGenesisConfig(argv: any) { function writeConfigs(argv: any) { const valJwtSecret = path.join(consts.configpath, "val_jwt.hex") - const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") + const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") const baseConfig = { "parent-chain": { - "connection" : { + "connection": { "url": argv.l1url, }, "wallet": { @@ -169,8 +169,6 @@ function writeConfigs(argv: any) { "info-files": [chainInfoFile], }, "node": { - "archive": true, - "forwarding-target": "null", "staker": { "dangerous": { "without-block-validator": false @@ -181,11 +179,9 @@ function writeConfigs(argv: any) { "make-assertion-interval": "10s", "strategy": "MakeNodes", }, - "sequencer": { - "enable": false, - "dangerous": { - "no-coordinator": false - } + "sequencer": false, + "dangerous": { + "no-sequencer-coordinator": false }, "delayed-sequencer": { "enable": false @@ -206,18 +202,23 @@ function writeConfigs(argv: any) { "max-delay": "30s", "data-poster": { "redis-signer": { - "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" + "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" }, "wait-for-l1-finality": false } }, "block-validator": { - "validation-server" : { - "url": argv.validationNodeUrl, - "jwtsecret": valJwtSecret, - } + "validation-server": { + "url": argv.validationNodeUrl, + "jwtsecret": valJwtSecret, + } } }, + "execution": { + "sequencer": { + "enable": false, + }, + }, "persistent": { "chain": "local" }, @@ -246,8 +247,9 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "unsafe_staker_config.json"), JSON.stringify(unsafeStakerConfig)) let sequencerConfig = JSON.parse(baseConfJSON) - sequencerConfig.node.sequencer.enable = true + sequencerConfig.node.sequencer = true sequencerConfig.node["seq-coordinator"].enable = true + sequencerConfig.execution["sequencer"].enable = true sequencerConfig.node["delayed-sequencer"].enable = true fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) @@ -258,15 +260,16 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) let l3Config = JSON.parse(baseConfJSON) - l3Config["parent-chain"].connection.url = argv.l2url + l3Config["parent-chain"].connection.url = argv.l2url l3Config["parent-chain"].wallet.account = namedAccount("l3sequencer").address l3Config.chain.id = 333333 const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json") l3Config.chain["info-files"] = [l3ChainInfoFile] l3Config.node.staker.enable = true l3Config.node.staker["use-smart-contract-wallet"] = true - l3Config.node.sequencer.enable = true - l3Config.node.sequencer.dangerous["no-coordinator"] = true + l3Config.node.sequencer = true + l3Config.execution["sequencer"].enable = true + l3Config.node["dangerous"]["no-sequencer-coordinator"] = true l3Config.node["delayed-sequencer"].enable = true l3Config.node["batch-poster"].enable = true l3Config.node["batch-poster"]["redis-url"] = "" @@ -296,32 +299,32 @@ function writeConfigs(argv: any) { function writeL2ChainConfig(argv: any) { const l2ChainConfig = { - "chainId": 412346, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": argv.l2owner, - "GenesisBlockNum": 0 - } + "chainId": 412346, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": argv.l2owner, + "GenesisBlockNum": 0 + } } const l2ChainConfigJSON = JSON.stringify(l2ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l2_chain_config.json"), l2ChainConfigJSON) @@ -329,32 +332,32 @@ function writeL2ChainConfig(argv: any) { function writeL3ChainConfig(argv: any) { const l3ChainConfig = { - "chainId": 333333, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": "0x0000000000000000000000000000000000000000", - "GenesisBlockNum": 0 - } + "chainId": 333333, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": "0x0000000000000000000000000000000000000000", + "GenesisBlockNum": 0 + } } const l3ChainConfigJSON = JSON.stringify(l3ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l3_chain_config.json"), l3ChainConfigJSON) From f6306a59e05e44deeb893049232877bbb8ea6112 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 19 Oct 2023 13:57:13 +0200 Subject: [PATCH 013/180] Rename fee token flag, exit script if L3 node is not being deployed --- test-node.bash | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test-node.bash b/test-node.bash index 44fd1962..c82364bf 100755 --- a/test-node.bash +++ b/test-node.bash @@ -40,7 +40,7 @@ consensusclient=false redundantsequencers=0 dev_build_nitro=false dev_build_blockscout=false -customFeeToken=false +l3CustomFeeToken=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 @@ -100,10 +100,6 @@ while [[ $# -gt 0 ]]; do detach=true shift ;; - --fee-token) - customFeeToken=true - shift - ;; --batchposters) batchposters=$2 if ! [[ $batchposters =~ [0-3] ]] ; then @@ -122,6 +118,14 @@ while [[ $# -gt 0 ]]; do l3node=true shift ;; + --l3-fee-token) + if ! $l3node; then + echo "Error: --l3-fee-token requires --l3node to be provided." + exit 1 + fi + l3CustomFeeToken=true + shift + ;; --redundantsequencers) redundantsequencers=$2 if ! [[ $redundantsequencers =~ [0-3] ]] ; then @@ -141,7 +145,7 @@ while [[ $# -gt 0 ]]; do echo --init: remove all data, rebuild, deploy new rollup echo --pos: l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate: heavy computation, validating all blocks in WASM - echo --fee-token: chain is set up to use custom fee token + echo --l3-fee-token: L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided echo --batchposters: batch posters [0-3] echo --redundantsequencers redundant sequencers [0-3] echo --detach: detach from nodes after running them @@ -350,7 +354,7 @@ if $force_init; then l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` deployL3Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857" - if $customFeeToken; then + if $l3CustomFeeToken; then echo == Deploying custom fee token nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_l2user_b --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` deployL3Command+=" --nativeTokenAddress $nativeTokenAddress" @@ -362,7 +366,7 @@ if $force_init; then echo == Funding l3 funnel and dev key docker-compose up -d l3node poster - if ! $customFeeToken; then + if ! $l3CustomFeeToken; then docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait docker-compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" fi From 1e2a56d2775c3d398058aff8c08a8743523f52ba Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 20 Oct 2023 10:38:17 +0200 Subject: [PATCH 014/180] Don't use eval --- test-node.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test-node.bash b/test-node.bash index c82364bf..ed942485 100755 --- a/test-node.bash +++ b/test-node.bash @@ -349,17 +349,17 @@ if $force_init; then echo == Writing l3 chain config docker-compose run scripts write-l3-chain-config - echo == Deploying L3 - l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` - l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - - deployL3Command="docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857" if $l3CustomFeeToken; then echo == Deploying custom fee token nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_l2user_b --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` - deployL3Command+=" --nativeTokenAddress $nativeTokenAddress" + EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" fi + echo == Deploying L3 + l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` + l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` + docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG + eval $deployL3Command docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" From 11ed8e9d4ff845826e055d6e7b2385508e2fdb42 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 20 Oct 2023 11:24:48 +0200 Subject: [PATCH 015/180] Rename test accounts --- test-node.bash | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test-node.bash b/test-node.bash index ed942485..ba2b832d 100755 --- a/test-node.bash +++ b/test-node.bash @@ -339,19 +339,20 @@ if $force_init; then docker-compose run scripts send-l2 --ethamount 1000 --to l3owner --wait docker-compose run scripts send-l2 --ethamount 1000 --to l3sequencer --wait + echo == Funding l2 deployers + docker-compose run scripts send-l2 --ethamount 100 --to user_token_bridge_deployer --wait + docker-compose run scripts send-l2 --ethamount 100 --to user_fee_token_deployer --wait echo == create l2 traffic - docker-compose run scripts send-l2 --ethamount 100 --to user_l2user --wait - docker-compose run scripts send-l2 --ethamount 100 --to user_l2user_b --wait - docker-compose run scripts send-l2 --ethamount 100 --to user_l2user_c --wait - docker-compose run scripts send-l2 --ethamount 0.0001 --from user_l2user_c --to user_l2user_b --wait --delay 500 --times 500 > /dev/null & + docker-compose run scripts send-l2 --ethamount 100 --to user_traffic_generator --wait + docker-compose run scripts send-l2 --ethamount 0.0001 --from user_traffic_generator --to user_fee_token_deployer --wait --delay 500 --times 500 > /dev/null & echo == Writing l3 chain config docker-compose run scripts write-l3-chain-config if $l3CustomFeeToken; then echo == Deploying custom fee token - nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_l2user_b --mintTo user_l2user | tail -n 1 | awk '{ print $NF }'` + nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" fi From 11170fe36318991973bea632d9f348816a64a974 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 20 Oct 2023 13:06:00 +0200 Subject: [PATCH 016/180] Update L3 config so that finalization of L2 delayed msgs is not required --- scripts/config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/config.ts b/scripts/config.ts index f82c3314..9aa10459 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -271,6 +271,8 @@ function writeConfigs(argv: any) { l3Config.execution["sequencer"].enable = true l3Config.node["dangerous"]["no-sequencer-coordinator"] = true l3Config.node["delayed-sequencer"].enable = true + l3Config.node["delayed-sequencer"]["finalize-distance"] = 0 + l3Config.node["delayed-sequencer"]["require-full-finality"] = false l3Config.node["batch-poster"].enable = true l3Config.node["batch-poster"]["redis-url"] = "" fs.writeFileSync(path.join(consts.configpath, "l3node_config.json"), JSON.stringify(l3Config)) From d4e23402d8d8dcefacb40fac73b1d5fd39bdbf24 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 20 Oct 2023 16:52:06 +0200 Subject: [PATCH 017/180] Remove leftover --- test-node.bash | 2 -- 1 file changed, 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index ba2b832d..355d622a 100755 --- a/test-node.bash +++ b/test-node.bash @@ -360,8 +360,6 @@ if $force_init; then l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG - - eval $deployL3Command docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key From 76d8686390596b4a8c9dab99978e9d3ff49027a0 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Fri, 20 Oct 2023 14:10:40 -0700 Subject: [PATCH 018/180] Fix configuration --- scripts/config.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 044f0d61..642f1c8f 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -168,9 +168,12 @@ function writeConfigs(argv: any) { "id": 412346, "info-files": [chainInfoFile], }, + "execution": { + "sequencer": { + "enable": false, + } + }, "node": { - "archive": true, - "forwarding-target": "null", "staker": { "dangerous": { "without-block-validator": false @@ -181,12 +184,7 @@ function writeConfigs(argv: any) { "make-assertion-interval": "10s", "strategy": "MakeNodes", }, - "sequencer": { - "enable": false, - "dangerous": { - "no-coordinator": false - } - }, + "sequencer": true, "delayed-sequencer": { "enable": false }, @@ -246,7 +244,8 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "unsafe_staker_config.json"), JSON.stringify(unsafeStakerConfig)) let sequencerConfig = JSON.parse(baseConfJSON) - sequencerConfig.node.sequencer.enable = true + sequencerConfig.execution.sequencer.enable = true + sequencerConfig.node.sequencer = true sequencerConfig.node["seq-coordinator"].enable = true sequencerConfig.node["delayed-sequencer"].enable = true fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) @@ -265,8 +264,8 @@ function writeConfigs(argv: any) { l3Config.chain["info-files"] = [l3ChainInfoFile] l3Config.node.staker.enable = true l3Config.node.staker["use-smart-contract-wallet"] = true - l3Config.node.sequencer.enable = true - l3Config.node.sequencer.dangerous["no-coordinator"] = true + l3Config.node.sequencer = true + l3Config.execution.sequencer.enable = true l3Config.node["delayed-sequencer"].enable = true l3Config.node["batch-poster"].enable = true l3Config.node["batch-poster"]["redis-url"] = "" From 69a8f66315179861ac3084799f81fa3856e19b9d Mon Sep 17 00:00:00 2001 From: nomaxg Date: Fri, 20 Oct 2023 14:15:36 -0700 Subject: [PATCH 019/180] make sequencer default false Signed-off-by: nomaxg --- scripts/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index 642f1c8f..be440671 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -184,7 +184,7 @@ function writeConfigs(argv: any) { "make-assertion-interval": "10s", "strategy": "MakeNodes", }, - "sequencer": true, + "sequencer": false, "delayed-sequencer": { "enable": false }, From 51ebfd5377e4af809dd601426d7d816fdd059448 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 27 Oct 2023 12:45:50 +0200 Subject: [PATCH 020/180] Fix BigNUmber comparison --- scripts/ethcommands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index d0832b77..a3157e32 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -44,7 +44,7 @@ async function bridgeFunds(argv: any, parentChainUrl: string, chainUrl: string, const sleep = (ms: number) => new Promise(r => setTimeout(r, ms)); while (true) { const balance = await account.getBalance() - if (balance >= ethers.utils.parseEther(argv.ethamount)) { + if (balance.gt(ethers.utils.parseEther(argv.ethamount))) { return } await sleep(100) From 3a7b2cee29cf591cc4c3f6c5ddc00bf5be367bd9 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 27 Oct 2023 13:41:01 +0200 Subject: [PATCH 021/180] Mint fee tokens to funnel account to use for retryable fees --- scripts/ethcommands.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index a3157e32..11386af4 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -44,7 +44,7 @@ async function bridgeFunds(argv: any, parentChainUrl: string, chainUrl: string, const sleep = (ms: number) => new Promise(r => setTimeout(r, ms)); while (true) { const balance = await account.getBalance() - if (balance.gt(ethers.utils.parseEther(argv.ethamount))) { + if (balance.gte(ethers.utils.parseEther(argv.ethamount))) { return } await sleep(100) @@ -149,6 +149,11 @@ export const createERC20Command = { const contract = await contractFactory.deploy("AppTestToken", "APP", ethers.utils.parseEther("1000000000"), namedAccount(argv.mintTo).address); await contract.deployTransaction.wait(); + // transfer some tokens to funnel account + const mintTo = namedAccount(argv.mintTo).connect(argv.provider); + const funnel = namedAccount("funnel"); + await contract.connect(mintTo).transfer(funnel.address, ethers.utils.parseEther("200000000")); + console.log("Contract deployed at address:", contract.address); argv.provider.destroy(); From fe900a5ae2f4dbcb769e717b86a5818ba129619a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 31 Oct 2023 12:39:00 +0100 Subject: [PATCH 022/180] Mint tokens to initial receiver only --- scripts/ethcommands.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 11386af4..7442fb47 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -149,11 +149,6 @@ export const createERC20Command = { const contract = await contractFactory.deploy("AppTestToken", "APP", ethers.utils.parseEther("1000000000"), namedAccount(argv.mintTo).address); await contract.deployTransaction.wait(); - // transfer some tokens to funnel account - const mintTo = namedAccount(argv.mintTo).connect(argv.provider); - const funnel = namedAccount("funnel"); - await contract.connect(mintTo).transfer(funnel.address, ethers.utils.parseEther("200000000")); - console.log("Contract deployed at address:", contract.address); argv.provider.destroy(); From 7b9566db7abdc3c15de71862095e38a9c0355feb Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 31 Oct 2023 12:48:59 +0100 Subject: [PATCH 023/180] Update Dockerfile to use token bridge repo instead of SDK --- tokenbridge/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 09156556..37eb13f6 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -1,7 +1,8 @@ FROM node:16-bullseye-slim RUN apt-get update && \ - apt-get install -y git docker.io + apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone --depth 1 -b v3.1.4 https://github.com/OffchainLabs/arbitrum-sdk.git ./ +RUN git clone -b add-creator-ci https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install +RUN yarn build ENTRYPOINT ["yarn"] From 5d69cf9187d9cfa21eab477788a48dbba7bd7355 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 31 Oct 2023 12:57:30 +0100 Subject: [PATCH 024/180] Add option to deploy L2-L3 token bridge --- test-node.bash | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/test-node.bash b/test-node.bash index 355d622a..322f9854 100755 --- a/test-node.bash +++ b/test-node.bash @@ -40,7 +40,8 @@ consensusclient=false redundantsequencers=0 dev_build_nitro=false dev_build_blockscout=false -l3CustomFeeToken=false +l3_custom_fee_token=false +l3_token_bridge=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 @@ -123,7 +124,15 @@ while [[ $# -gt 0 ]]; do echo "Error: --l3-fee-token requires --l3node to be provided." exit 1 fi - l3CustomFeeToken=true + l3_custom_fee_token=true + shift + ;; + --l3-token-bridge) + if ! $l3node; then + echo "Error: --l3-token-bridge requires --l3node to be provided." + exit 1 + fi + l3_token_bridge=true shift ;; --redundantsequencers) @@ -146,6 +155,7 @@ while [[ $# -gt 0 ]]; do echo --pos: l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate: heavy computation, validating all blocks in WASM echo --l3-fee-token: L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided + echo --l3-token-bridge: Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided echo --batchposters: batch posters [0-3] echo --redundantsequencers redundant sequencers [0-3] echo --detach: detach from nodes after running them @@ -350,7 +360,7 @@ if $force_init; then echo == Writing l3 chain config docker-compose run scripts write-l3-chain-config - if $l3CustomFeeToken; then + if $l3_custom_fee_token; then echo == Deploying custom fee token nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" @@ -365,7 +375,15 @@ if $force_init; then echo == Funding l3 funnel and dev key docker-compose up -d l3node poster - if ! $l3CustomFeeToken; then + if $l3_token_bridge; then + echo == Deploying L2-L3 token bridge + rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` + docker-compose run -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e CHILD_RPC=http://l3node:3347 tokenbridge deploy:local:token-bridge + docker-compose run --entrypoint sh tokenbridge -c "cat network.json" + echo + fi + + if ! $l3_custom_fee_token; then docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait docker-compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" fi From e173aeeb92f7dccc2ce66cccd561be314516a343 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 31 Oct 2023 14:55:52 +0100 Subject: [PATCH 025/180] Deploy L1-L2 token bridge using token bridge creator --- test-node.bash | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test-node.bash b/test-node.bash index 322f9854..55b2573d 100755 --- a/test-node.bash +++ b/test-node.bash @@ -239,7 +239,7 @@ if $force_build; then fi fi LOCAL_BUILD_NODES=scripts - if $tokenbridge; then + if $tokenbridge || $l3_token_bridge; then LOCAL_BUILD_NODES="$LOCAL_BUILD_NODES tokenbridge" fi docker-compose build --no-rm $LOCAL_BUILD_NODES @@ -338,9 +338,10 @@ if $force_init; then docker-compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" if $tokenbridge; then - echo == Deploying token bridge - docker-compose run -e ARB_KEY=$devprivkey -e ETH_KEY=$devprivkey tokenbridge gen:network - docker-compose run --entrypoint sh tokenbridge -c "cat localNetwork.json" + echo == Deploying L1-L2 token bridge + rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` + docker-compose run -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge + docker-compose run --entrypoint sh tokenbridge -c "cat network.json" echo fi From e7e95b06d8c6c455d749bccf944d1af566b58ae4 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 31 Oct 2023 16:37:19 +0100 Subject: [PATCH 026/180] Provide rollup owner --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 55b2573d..14450e50 100755 --- a/test-node.bash +++ b/test-node.bash @@ -340,7 +340,7 @@ if $force_init; then if $tokenbridge; then echo == Deploying L1-L2 token bridge rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker-compose run -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge + docker-compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker-compose run --entrypoint sh tokenbridge -c "cat network.json" echo fi From f2fd0bd90856dff5757e6ea6b03ef0228a5a8ea3 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 2 Nov 2023 16:56:50 +0100 Subject: [PATCH 027/180] Add delay for services to be ready --- test-node.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/test-node.bash b/test-node.bash index 14450e50..855deab3 100755 --- a/test-node.bash +++ b/test-node.bash @@ -378,6 +378,7 @@ if $force_init; then if $l3_token_bridge; then echo == Deploying L2-L3 token bridge + sleep 120 rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker-compose run -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e CHILD_RPC=http://l3node:3347 tokenbridge deploy:local:token-bridge docker-compose run --entrypoint sh tokenbridge -c "cat network.json" From 1d7ba35cfccc803b5244cbf9f0f87a0a9040dbb1 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 2 Nov 2023 17:30:38 +0100 Subject: [PATCH 028/180] Delay before the L1-L2 token bridge deployment --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 855deab3..3e015225 100755 --- a/test-node.bash +++ b/test-node.bash @@ -339,6 +339,7 @@ if $force_init; then if $tokenbridge; then echo == Deploying L1-L2 token bridge + sleep 120 rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker-compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker-compose run --entrypoint sh tokenbridge -c "cat network.json" @@ -378,7 +379,6 @@ if $force_init; then if $l3_token_bridge; then echo == Deploying L2-L3 token bridge - sleep 120 rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker-compose run -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e CHILD_RPC=http://l3node:3347 tokenbridge deploy:local:token-bridge docker-compose run --entrypoint sh tokenbridge -c "cat network.json" From e432e19414ae6fb21e3056808ca7a9e5d2084d7f Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 3 Nov 2023 09:57:51 +0100 Subject: [PATCH 029/180] Add support for native L2-L3 bridging of the fee token --- scripts/ethcommands.ts | 61 ++++++++++++++++++++++++++++++++++++++++-- test-node.bash | 11 +++++--- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 7442fb47..634825d5 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -52,6 +52,32 @@ async function bridgeFunds(argv: any, parentChainUrl: string, chainUrl: string, } } +async function bridgeNativeToken(argv: any, parentChainUrl: string, chainUrl: string, inboxAddr: string) { + argv.provider = new ethers.providers.WebSocketProvider(parentChainUrl); + + argv.to = "address_" + inboxAddr; + + const iface = new ethers.utils.Interface(["function depositERC20(uint256 amount)"]) + argv.data = iface.encodeFunctionData("depositERC20", [ethers.utils.parseEther(argv.amount)]); + + await runStress(argv, sendTransaction); + + argv.provider.destroy(); + if (argv.wait) { + const childProvider = new ethers.providers.WebSocketProvider(chainUrl); + const account = namedAccount(argv.from, argv.threadId).connect(childProvider) + const sleep = (ms: number) => new Promise(r => setTimeout(r, ms)); + while (true) { + const balance = await account.getBalance() + if (balance.gte(ethers.utils.parseEther(argv.amount))) { + return + } + await sleep(100) + } + } +} + + export const bridgeFundsCommand = { command: "bridge-funds", describe: "sends funds from l1 to l2", @@ -84,7 +110,6 @@ export const bridgeFundsCommand = { }, }; - export const bridgeToL3Command = { command: "bridge-to-l3", describe: "sends funds from l2 to l3", @@ -117,6 +142,38 @@ export const bridgeToL3Command = { }, }; +export const bridgeNativeTokenToL3Command = { + command: "bridge-native-token-to-l3", + describe: "bridge native token from l2 to l3", + builder: { + amount: { + string: true, + describe: "amount to transfer", + default: "10", + }, + from: { + string: true, + describe: "account (see general help)", + default: "funnel", + }, + wait: { + boolean: true, + describe: "wait till l3 has balance of amount", + default: false, + }, + }, + handler: async (argv: any) => { + const deploydata = JSON.parse( + fs + .readFileSync(path.join(consts.configpath, "l3deployment.json")) + .toString() + ); + const inboxAddr = ethers.utils.hexlify(deploydata.inbox); + + await bridgeFunds(argv, argv.l2url, argv.l3url, inboxAddr) + }, +}; + export const createERC20Command = { command: "create-erc20", describe: "creates simple ERC20 on L2", @@ -228,7 +285,7 @@ export const sendL2Command = { export const sendL3Command = { command: "send-l3", - describe: "sends funds between l2 accounts", + describe: "sends funds between l3 accounts", builder: { ethamount: { string: true, diff --git a/test-node.bash b/test-node.bash index 3e015225..a1cfcd72 100755 --- a/test-node.bash +++ b/test-node.bash @@ -385,9 +385,14 @@ if $force_init; then echo fi - if ! $l3_custom_fee_token; then - docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait - docker-compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" + echo == Fund L3 accounts + if $l3_custom_fee_token; then + docker-compose run scripts bridge-to-l3 --amount 50000 --wait + docker-compose run scripts bridge-to-l3 --amount 500 --wait --from "key_0x$devprivkey" + else + docker-compose run scripts bridge-to-l3 --amount 50000 --from user_token_bridge_deployer --wait + docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait + docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait fi fi From b157facccf2d788058bb1ce34432933dfe952154 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 3 Nov 2023 14:57:37 +0100 Subject: [PATCH 030/180] Provide deployer keys as env var --- test-node.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 3e015225..4d0f6de7 100755 --- a/test-node.bash +++ b/test-node.bash @@ -379,8 +379,9 @@ if $force_init; then if $l3_token_bridge; then echo == Deploying L2-L3 token bridge + deployer_key=`printf "%s" "user_token_bridge_deployer" | openssl dgst -sha256 | sed 's/^.*= //'` rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker-compose run -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e CHILD_RPC=http://l3node:3347 tokenbridge deploy:local:token-bridge + docker-compose run -e ROLLUP_OWNER=$l3owneraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge docker-compose run --entrypoint sh tokenbridge -c "cat network.json" echo fi From b3f40eea605553e306de0b1445d7c08b51ae4db1 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 3 Nov 2023 15:50:57 +0100 Subject: [PATCH 031/180] Fix native bridging --- scripts/ethcommands.ts | 1 + scripts/index.ts | 2 ++ test-node.bash | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 634825d5..51f7a3c1 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -170,6 +170,7 @@ export const bridgeNativeTokenToL3Command = { ); const inboxAddr = ethers.utils.hexlify(deploydata.inbox); + argv.ethamount = "0" await bridgeFunds(argv, argv.l2url, argv.l3url, inboxAddr) }, }; diff --git a/scripts/index.ts b/scripts/index.ts index ee27b9e1..c39406ed 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -10,6 +10,7 @@ import { } from "./accounts"; import { bridgeFundsCommand, + bridgeNativeTokenToL3Command, bridgeToL3Command, createERC20Command, sendL1Command, @@ -31,6 +32,7 @@ async function main() { .options(stressOptions) .command(bridgeFundsCommand) .command(bridgeToL3Command) + .command(bridgeNativeTokenToL3Command) .command(createERC20Command) .command(sendL1Command) .command(sendL2Command) diff --git a/test-node.bash b/test-node.bash index fa82506c..022abd26 100755 --- a/test-node.bash +++ b/test-node.bash @@ -388,12 +388,12 @@ if $force_init; then echo == Fund L3 accounts if $l3_custom_fee_token; then - docker-compose run scripts bridge-to-l3 --amount 50000 --wait - docker-compose run scripts bridge-to-l3 --amount 500 --wait --from "key_0x$devprivkey" - else - docker-compose run scripts bridge-to-l3 --amount 50000 --from user_token_bridge_deployer --wait + docker-compose run scripts bridge-native-token-to-l3 --amount 50000 --from user_token_bridge_deployer --wait docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait + else + docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait + docker-compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" fi fi From 26d2b22f1bf56964c39245ceb9579eb4012a4e47 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 3 Nov 2023 17:16:07 +0100 Subject: [PATCH 032/180] Approve token before bridging --- scripts/ethcommands.ts | 21 ++++++++++++++++----- test-node.bash | 3 ++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 51f7a3c1..c8a299ad 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -3,6 +3,7 @@ import { ContractFactory, ethers, Wallet } from "ethers"; import * as consts from "./consts"; import { namedAccount, namedAddress } from "./accounts"; import * as ERC20PresetFixedSupplyArtifact from "@openzeppelin/contracts/build/contracts/ERC20PresetFixedSupply.json"; +import * as ERC20 from "@openzeppelin/contracts/build/contracts/ERC20.json"; import * as fs from "fs"; const path = require("path"); @@ -52,11 +53,19 @@ async function bridgeFunds(argv: any, parentChainUrl: string, chainUrl: string, } } -async function bridgeNativeToken(argv: any, parentChainUrl: string, chainUrl: string, inboxAddr: string) { +async function bridgeNativeToken(argv: any, parentChainUrl: string, chainUrl: string, inboxAddr: string, token: string) { argv.provider = new ethers.providers.WebSocketProvider(parentChainUrl); argv.to = "address_" + inboxAddr; + /// approve inbox to use fee token + const childProvider = new ethers.providers.WebSocketProvider(chainUrl); + const bridger = namedAccount(argv.from, argv.threadId).connect(childProvider) + + const nativeTokenContract = new ethers.Contract(token, ERC20.abi, bridger) + await nativeTokenContract.approve(inboxAddr, ethers.utils.parseEther(argv.amount)) + + /// deposit fee token const iface = new ethers.utils.Interface(["function depositERC20(uint256 amount)"]) argv.data = iface.encodeFunctionData("depositERC20", [ethers.utils.parseEther(argv.amount)]); @@ -64,11 +73,9 @@ async function bridgeNativeToken(argv: any, parentChainUrl: string, chainUrl: st argv.provider.destroy(); if (argv.wait) { - const childProvider = new ethers.providers.WebSocketProvider(chainUrl); - const account = namedAccount(argv.from, argv.threadId).connect(childProvider) const sleep = (ms: number) => new Promise(r => setTimeout(r, ms)); while (true) { - const balance = await account.getBalance() + const balance = await bridger.getBalance() if (balance.gte(ethers.utils.parseEther(argv.amount))) { return } @@ -156,6 +163,10 @@ export const bridgeNativeTokenToL3Command = { describe: "account (see general help)", default: "funnel", }, + token: { + string: true, + describe: "chain's custom fee token", + }, wait: { boolean: true, describe: "wait till l3 has balance of amount", @@ -171,7 +182,7 @@ export const bridgeNativeTokenToL3Command = { const inboxAddr = ethers.utils.hexlify(deploydata.inbox); argv.ethamount = "0" - await bridgeFunds(argv, argv.l2url, argv.l3url, inboxAddr) + await bridgeNativeToken(argv, argv.l2url, argv.l3url, inboxAddr, argv.token) }, }; diff --git a/test-node.bash b/test-node.bash index 022abd26..c681df83 100755 --- a/test-node.bash +++ b/test-node.bash @@ -388,7 +388,8 @@ if $force_init; then echo == Fund L3 accounts if $l3_custom_fee_token; then - docker-compose run scripts bridge-native-token-to-l3 --amount 50000 --from user_token_bridge_deployer --wait + nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` + docker-compose run scripts bridge-native-token-to-l3 --token $nativeTokenAddress --amount 50000 --from user_token_bridge_deployer --wait docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait else From 5e0b8f2f064b6796e2e18208c6de1c18f5716c5d Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 3 Nov 2023 17:30:38 +0100 Subject: [PATCH 033/180] Use correct providers --- scripts/ethcommands.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index c8a299ad..63a70808 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -59,10 +59,8 @@ async function bridgeNativeToken(argv: any, parentChainUrl: string, chainUrl: st argv.to = "address_" + inboxAddr; /// approve inbox to use fee token - const childProvider = new ethers.providers.WebSocketProvider(chainUrl); - const bridger = namedAccount(argv.from, argv.threadId).connect(childProvider) - - const nativeTokenContract = new ethers.Contract(token, ERC20.abi, bridger) + const bridgerParentChain = namedAccount(argv.from, argv.threadId).connect(argv.provider) + const nativeTokenContract = new ethers.Contract(token, ERC20.abi, bridgerParentChain) await nativeTokenContract.approve(inboxAddr, ethers.utils.parseEther(argv.amount)) /// deposit fee token @@ -73,6 +71,8 @@ async function bridgeNativeToken(argv: any, parentChainUrl: string, chainUrl: st argv.provider.destroy(); if (argv.wait) { + const childProvider = new ethers.providers.WebSocketProvider(chainUrl); + const bridger = namedAccount(argv.from, argv.threadId).connect(childProvider) const sleep = (ms: number) => new Promise(r => setTimeout(r, ms)); while (true) { const balance = await bridger.getBalance() From 5f6a418e2f922cec3136c07335a903182d3857b2 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Mon, 6 Nov 2023 10:57:56 +0100 Subject: [PATCH 034/180] Fetch native token address from config file --- test-node.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index c681df83..1d36f025 100755 --- a/test-node.bash +++ b/test-node.bash @@ -388,8 +388,8 @@ if $force_init; then echo == Fund L3 accounts if $l3_custom_fee_token; then - nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` - docker-compose run scripts bridge-native-token-to-l3 --token $nativeTokenAddress --amount 50000 --from user_token_bridge_deployer --wait + native_token=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup[\"native-token\"]' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` + docker-compose run scripts bridge-native-token-to-l3 --token $native_token --amount 50000 --from user_token_bridge_deployer --wait docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait else From 388aad31a3c6abe3f1c97c4553ef0dc146083cec Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Thu, 9 Nov 2023 09:26:04 -0700 Subject: [PATCH 035/180] use nitro version 2.2.0-alpha1 --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 9ea710cd..3ec9a800 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.1.1-e9d8842-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.0-alpha.1-fdd098e-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` From 16c7a93a0c779fab7ca2dd6ef6becd7610fa6031 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Thu, 9 Nov 2023 11:07:30 -0700 Subject: [PATCH 036/180] test-node: use wait instead of detach + l3 deploy fix --- test-node.bash | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test-node.bash b/test-node.bash index 3ec9a800..1b1b3835 100755 --- a/test-node.bash +++ b/test-node.bash @@ -305,16 +305,16 @@ if $force_init; then docker-compose run geth init --datadir /datadir/ /config/geth_genesis.json echo == Starting geth - docker-compose up -d geth + docker-compose up --wait geth echo == Creating prysm genesis docker-compose up create_beacon_chain_genesis echo == Running prysm - docker-compose up -d prysm_beacon_chain - docker-compose up -d prysm_validator + docker-compose up --wait prysm_beacon_chain + docker-compose up --wait prysm_validator else - docker-compose up -d geth + docker-compose up --wait geth fi echo == Funding validator and sequencer @@ -341,12 +341,12 @@ if $force_init; then docker-compose run scripts write-config echo == Initializing redis - docker-compose up -d redis + docker-compose up --wait redis docker-compose run scripts redis-init --redundancy $redundantsequencers fi echo == Funding l2 funnel and dev key - docker-compose up -d $INITIAL_SEQ_NODES + docker-compose up --wait $INITIAL_SEQ_NODES docker-compose run scripts bridge-funds --ethamount 100000 --wait docker-compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" @@ -382,11 +382,11 @@ if $force_init; then echo == Deploying L3 l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG - docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" + docker-compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG + docker-compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key - docker-compose up -d l3node poster + docker-compose up --wait l3node sequencer if ! $l3CustomFeeToken; then docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait @@ -399,7 +399,7 @@ fi if $run; then UP_FLAG="" if $detach; then - UP_FLAG="-d" + UP_FLAG="--wait" fi echo == Launching Sequencer From a95a820c043849f1304a7a47c477f897029e5926 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Thu, 9 Nov 2023 11:07:58 -0700 Subject: [PATCH 037/180] config: separate keys for sequencer and staker --- scripts/config.ts | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index cdf1e712..2854199f 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as consts from './consts' -import { namedAccount } from './accounts' +import { namedAccount, namedAddress } from './accounts' const path = require("path"); @@ -158,11 +158,6 @@ function writeConfigs(argv: any) { "connection": { "url": argv.l1url, }, - "wallet": { - "account": "", - "password": consts.l1passphrase, - "pathname": consts.l1keystore, - }, }, "chain": { "id": 412346, @@ -173,6 +168,11 @@ function writeConfigs(argv: any) { "dangerous": { "without-block-validator": false }, + "parent-chain-wallet" : { + "account": namedAddress("validator"), + "password": consts.l1passphrase, + "pathname": consts.l1keystore, + }, "disable-challenge": false, "enable": false, "staker-interval": "10s", @@ -200,6 +200,12 @@ function writeConfigs(argv: any) { "enable": false, "redis-url": argv.redisUrl, "max-delay": "30s", + "l1-block-bound": "ignore", + "parent-chain-wallet" : { + "account": namedAddress("sequencer"), + "password": consts.l1passphrase, + "pathname": consts.l1keystore, + }, "data-poster": { "redis-signer": { "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" @@ -237,19 +243,18 @@ function writeConfigs(argv: any) { if (argv.simple) { let simpleConfig = JSON.parse(baseConfJSON) - simpleConfig["parent-chain"].wallet.account = namedAccount("sequencer").address simpleConfig.node.staker.enable = true simpleConfig.node.staker["use-smart-contract-wallet"] = true simpleConfig.node.staker.dangerous["without-block-validator"] = true - simpleConfig.node.sequencer.enable = true - simpleConfig.node.sequencer.dangerous["no-coordinator"] = true + simpleConfig.node.sequencer = true + simpleConfig.node.dangerous["no-sequencer-coordinator"] = true simpleConfig.node["delayed-sequencer"].enable = true simpleConfig.node["batch-poster"].enable = true simpleConfig.node["batch-poster"]["redis-url"] = "" + simpleConfig.execution["sequencer"].enable = true fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(simpleConfig)) } else { let validatorConfig = JSON.parse(baseConfJSON) - validatorConfig["parent-chain"].wallet.account = namedAccount("validator").address validatorConfig.node.staker.enable = true validatorConfig.node.staker["use-smart-contract-wallet"] = true let validconfJSON = JSON.stringify(validatorConfig) @@ -267,7 +272,6 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) let posterConfig = JSON.parse(baseConfJSON) - posterConfig["parent-chain"].wallet.account = namedAccount("sequencer").address posterConfig.node["seq-coordinator"].enable = true posterConfig.node["batch-poster"].enable = true fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) @@ -275,7 +279,8 @@ function writeConfigs(argv: any) { let l3Config = JSON.parse(baseConfJSON) l3Config["parent-chain"].connection.url = argv.l2url - l3Config["parent-chain"].wallet.account = namedAccount("l3sequencer").address + l3Config.node.staker["parent-chain-wallet"].account = namedAddress("l3owner") + l3Config.node["batch-poster"]["parent-chain-wallet"].account = namedAddress("l3sequencer") l3Config.chain.id = 333333 const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json") l3Config.chain["info-files"] = [l3ChainInfoFile] @@ -286,7 +291,7 @@ function writeConfigs(argv: any) { l3Config.node["dangerous"]["no-sequencer-coordinator"] = true l3Config.node["delayed-sequencer"].enable = true l3Config.node["delayed-sequencer"]["finalize-distance"] = 0 - l3Config.node["delayed-sequencer"]["require-full-finality"] = false + l3Config.node["delayed-sequencer"]["use-merge-finality"] = false l3Config.node["batch-poster"].enable = true l3Config.node["batch-poster"]["redis-url"] = "" fs.writeFileSync(path.join(consts.configpath, "l3node_config.json"), JSON.stringify(l3Config)) From af0a81d948c24930557898d650d0236a5892fcdb Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Mon, 6 Nov 2023 17:15:04 +0800 Subject: [PATCH 038/180] Test the integration --- .env | 29 ++++++++++ docker-compose.yaml | 117 +++++++++++++++++++++++++++++++++++++++++ espresso.env | 1 + scripts/accounts.ts | 4 +- scripts/config.ts | 14 ++++- scripts/index.ts | 4 ++ test-node.bash | 20 ++++++- tokenbridge/Dockerfile | 2 +- 8 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 .env create mode 100644 espresso.env diff --git a/.env b/.env new file mode 100644 index 00000000..4cc05cca --- /dev/null +++ b/.env @@ -0,0 +1,29 @@ +# Environment for local demo network. +# This file is meant to work with docker-compose.yaml + +RUST_LOG=info,libp2p=off +RUST_LOG_FORMAT=full + +L1_BLOCK_TIME_SEC=3 + +# Internal port inside container +ESPRESSO_WEB_SERVER_PORT=40000 +ESPRESSO_ORCHESTRATOR_PORT=40001 +ESPRESSO_CONSENSUS_SERVER_PORT=40002 +ESPRESSO_DA_SERVER_PORT=40003 +ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:$ESPRESSO_WEB_SERVER_PORT +ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL=http://consensus-server:$ESPRESSO_WEB_SERVER_PORT +ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:$ESPRESSO_ORCHESTRATOR_PORT +ESPRESSO_SEQUENCER_API_PORT=50000 +ESPRESSO_SEQUENCER1_API_PORT=50001 +ESPRESSO_SEQUENCER_URL=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT +ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer +ESPRESSO_SEQUENCER_L1_PORT=8545 +ESPRESSO_SEQUENCER_L1_WS_PORT=8546 +ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:$ESPRESSO_SEQUENCER_L1_PORT +ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:$ESPRESSO_SEQUENCER_L1_WS_PORT +ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true +# A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. +ESPRESSO_SEQUENCER_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" +ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5 +ESPRESSO_COMMITMENT_TASK_PORT=60000 diff --git a/docker-compose.yaml b/docker-compose.yaml index 7f76bb9f..a2c28e04 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -337,6 +337,123 @@ services: - "sdk-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock + orchestrator: + image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main + ports: + - "$ESPRESSO_ORCHESTRATOR_PORT:$ESPRESSO_ORCHESTRATOR_PORT" + environment: + - ESPRESSO_ORCHESTRATOR_PORT + - ESPRESSO_ORCHESTRATOR_NUM_NODES=2 + - ESPRESSO_ORCHESTRATOR_START_DELAY=5s + - ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s + - ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=1 + - ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=0s + - ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=1s + - RUST_LOG + - RUST_LOG_FORMAT + + da-server: + image: ghcr.io/espressosystems/espresso-sequencer/web-server:main + ports: + - "$ESPRESSO_DA_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT" + environment: + - ESPRESSO_WEB_SERVER_PORT + - RUST_LOG=error + - RUST_LOG_FORMAT + depends_on: + orchestrator: + condition: service_healthy + + consensus-server: + image: ghcr.io/espressosystems/espresso-sequencer/web-server:main + ports: + - "$ESPRESSO_CONSENSUS_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT" + environment: + - ESPRESSO_WEB_SERVER_PORT + - RUST_LOG=error + - RUST_LOG_FORMAT + depends_on: + orchestrator: + condition: service_healthy + + espresso-sequencer0: + image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main + ports: + - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" + # Run the API server (with options taken from the environment) and the optional submission API + command: sequencer -- http -- query -- submit + environment: + - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL + - ESPRESSO_SEQUENCER_DA_SERVER_URL + - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL + - ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_STORAGE_PATH + - ESPRESSO_SEQUENCER_L1_WS_PROVIDER + - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG + - RUST_LOG + - RUST_LOG_FORMAT + depends_on: + orchestrator: + condition: service_healthy + consensus-server: + condition: service_healthy + da-server: + condition: service_healthy + geth: + condition: service_started + + espresso-sequencer1: + image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main + ports: + - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" + # Run the API server (with options taken from the environment) + command: sequencer -- http -- query + environment: + - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL + - ESPRESSO_SEQUENCER_DA_SERVER_URL + - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL + - ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_STORAGE_PATH + - ESPRESSO_SEQUENCER_L1_WS_PROVIDER + - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG + - RUST_LOG + - RUST_LOG_FORMAT + depends_on: + orchestrator: + condition: service_healthy + consensus-server: + condition: service_healthy + da-server: + condition: service_healthy + geth: + condition: service_started + + commitment-task: + image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main + ports: + - "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT" + command: commitment-task --deploy + env_file: + - espresso.env + environment: + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX + - ESPRESSO_COMMITMENT_TASK_PORT + - ESPRESSO_SEQUENCER_URL + - ESPRESSO_SEQUENCER_L1_PROVIDER + - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG + - RUST_LOG + - RUST_LOG_FORMAT + depends_on: + espresso-sequencer0: + condition: service_healthy + consensus-server: + condition: service_healthy + da-server: + condition: service_healthy + geth: + condition: service_started + volumes: l1data: consensus: diff --git a/espresso.env b/espresso.env new file mode 100644 index 00000000..0cec9def --- /dev/null +++ b/espresso.env @@ -0,0 +1 @@ +ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x217788c286797d56cd59af5e493f3699c39cbbe8" diff --git a/scripts/accounts.ts b/scripts/accounts.ts index ae3cdf6e..1bbe4f77 100644 --- a/scripts/accounts.ts +++ b/scripts/accounts.ts @@ -5,7 +5,7 @@ import * as crypto from "crypto"; import { runStress } from "./stress"; const path = require("path"); -const specialAccounts = 5; +const specialAccounts = 6; async function writeAccounts() { for (let i = 0; i < specialAccounts; i++) { @@ -44,6 +44,8 @@ export function namedAccount( if (name == "l3sequencer") { return specialAccount(4); } + if (name == "espresso-sequencer") + return specialAccount(5); if (name.startsWith("user_")) { return new ethers.Wallet( ethers.utils.sha256(ethers.utils.toUtf8Bytes(name)) diff --git a/scripts/config.ts b/scripts/config.ts index be440671..a795056d 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -171,7 +171,10 @@ function writeConfigs(argv: any) { "execution": { "sequencer": { "enable": false, - } + "espresso": false, + "hotshot-url": "", + "espresso-namespace": 100, + }, }, "node": { "staker": { @@ -185,6 +188,7 @@ function writeConfigs(argv: any) { "strategy": "MakeNodes", }, "sequencer": false, + "espresso": false, "delayed-sequencer": { "enable": false }, @@ -246,8 +250,14 @@ function writeConfigs(argv: any) { let sequencerConfig = JSON.parse(baseConfJSON) sequencerConfig.execution.sequencer.enable = true sequencerConfig.node.sequencer = true - sequencerConfig.node["seq-coordinator"].enable = true sequencerConfig.node["delayed-sequencer"].enable = true + if (argv.espresso) { + sequencerConfig.node.espresso = true + sequencerConfig.execution.sequencer.espresso = true + sequencerConfig.execution.sequencer["hotshot-url"] = argv.espressoUrl + } else { + sequencerConfig.node["seq-coordinator"].enable = true + } fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) let posterConfig = JSON.parse(baseConfJSON) diff --git a/scripts/index.ts b/scripts/index.ts index 62f3d49d..b919f788 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -28,6 +28,10 @@ async function main() { l2owner: { string: true, default: "0x3f1Eae7D46d88F08fc2F8ed27FCb2AB183EB2d0E" }, }) .options(stressOptions) + .options({ + espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, + espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-sequencer0:50000' }, + }) .command(bridgeFundsCommand) .command(bridgeToL3Command) .command(sendL1Command) diff --git a/test-node.bash b/test-node.bash index 34c361e8..276b86ec 100755 --- a/test-node.bash +++ b/test-node.bash @@ -40,6 +40,7 @@ consensusclient=false redundantsequencers=0 dev_build_nitro=false dev_build_blockscout=false +espresso=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 @@ -75,6 +76,10 @@ while [[ $# -gt 0 ]]; do done fi ;; + --espresso) + espresso=true + shift + ;; --build) force_build=true shift @@ -200,6 +205,10 @@ fi if $blockscout; then NODES="$NODES blockscout" fi +if $espresso; then + NODES="$NODES orchestrator da-server consensus-server espresso-sequencer0 espresso-sequencer1 commitment-task" + +fi if $force_build; then echo == Building.. if $dev_build_nitro; then @@ -292,6 +301,7 @@ if $force_init; then echo == Funding validator and sequencer docker-compose run scripts send-l1 --ethamount 1000 --to validator --wait docker-compose run scripts send-l1 --ethamount 1000 --to sequencer --wait + docker-compose run scripts send-l1 --ethamount 1000 --to espresso-sequencer --wait echo == create l1 traffic docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait @@ -305,8 +315,16 @@ if $force_init; then docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" + + if $espresso; then + echo == Deploying Espresso Contract + echo "" > espresso.env + docker-compose up -d commitment-task espresso-sequencer0 espresso-sequencer1 --wait + espressol1contract=`curl http://localhost:60000/api/hotshot_contract` + echo "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=$espressol1contract" > espresso.env + fi echo == Writing configs - docker-compose run scripts write-config + docker-compose run scripts write-config --espresso $espresso echo == Initializing redis docker-compose run scripts redis-init --redundancy $redundantsequencers diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 09156556..3cbc4d78 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,6 +2,6 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io WORKDIR /workspace -RUN git clone --depth 1 -b v3.1.4 https://github.com/OffchainLabs/arbitrum-sdk.git ./ +RUN git clone --depth 1 -b main https://github.com/EspressoSystems/arbitrum-sdk.git ./ RUN yarn install ENTRYPOINT ["yarn"] From 9235066fe932e330ffcffd6d7c888bc976c240a0 Mon Sep 17 00:00:00 2001 From: Henry <11198460+godzillaba@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:33:31 -0500 Subject: [PATCH 039/180] more traffic --- test-node.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 34c361e8..6646a3a5 100755 --- a/test-node.bash +++ b/test-node.bash @@ -295,7 +295,7 @@ if $force_init; then echo == create l1 traffic docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait - docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 500 > /dev/null & + docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l2 chain config docker-compose run scripts write-l2-chain-config @@ -331,7 +331,7 @@ if $force_init; then echo == create l2 traffic docker-compose run scripts send-l2 --ethamount 100 --to user_l2user --wait - docker-compose run scripts send-l2 --ethamount 0.0001 --from user_l2user --to user_l2user_b --wait --delay 500 --times 500 > /dev/null & + docker-compose run scripts send-l2 --ethamount 0.0001 --from user_l2user --to user_l2user_b --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l3 chain config docker-compose run scripts write-l3-chain-config From 6d10e6f9f38773ed98f9f3c77eec7d9f0d25308f Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 17 Nov 2023 19:22:50 -0700 Subject: [PATCH 040/180] usage and sort changes --- test-node.bash | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/test-node.bash b/test-node.bash index 1b1b3835..fa1a173b 100755 --- a/test-node.bash +++ b/test-node.bash @@ -157,19 +157,20 @@ while [[ $# -gt 0 ]]; do echo $0 script [SCRIPT-ARGS] echo echo OPTIONS: - echo --build: rebuild docker images - echo --dev: build nitro and blockscout dockers from source \(otherwise - pull docker\) - echo --init: remove all data, rebuild, deploy new rollup - echo --pos: l1 is a proof-of-stake chain \(using prysm for consensus\) - echo --validate: heavy computation, validating all blocks in WASM - echo --l3-fee-token: L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided - echo --batchposters: batch posters [0-3] + echo --build rebuild docker images + echo --dev build nitro and blockscout dockers from source instead of pulling them. Disables simple mode + echo --init remove all data, rebuild, deploy new rollup + echo --pos l1 is a proof-of-stake chain \(using prysm for consensus\) + echo --validate heavy computation, validating all blocks in WASM + echo --l3-fee-token L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided + echo --batchposters batch posters [0-3] echo --redundantsequencers redundant sequencers [0-3] - echo --detach: detach from nodes after running them - echo --blockscout: build or launch blockscout - echo --no-tokenbridge: don\'t build or launch tokenbridge - echo --no-run: does not launch nodes \(usefull with build or init\) - echo --[no-]simple simple \(on by default unless dev-build\) has only one node for l2, no redis + echo --detach detach from nodes after running them + echo --blockscout build or launch blockscout + echo --simple run a simple configuration. one node as sequencer/batch-poster/staker \(default unless using --dev\) + echo --no-tokenbridge don\'t build or launch tokenbridge + echo --no-run does not launch nodes \(usefull with build or init\) + echo --no-simple run a full configuration with separate sequencer/batch-poster/validator/relayer echo echo script runs inside a separate docker. For SCRIPT-ARGS, run $0 script --help exit 0 @@ -195,6 +196,9 @@ fi NODES="sequencer" INITIAL_SEQ_NODES="sequencer" +if ! $simple; then + NODES="$NODES redis" +fi if [ $redundantsequencers -gt 0 ]; then NODES="$NODES sequencer_b" INITIAL_SEQ_NODES="$INITIAL_SEQ_NODES sequencer_b" @@ -220,7 +224,7 @@ fi if $validate; then NODES="$NODES validator" elif ! $simple; then - NODES="redis $NODES staker-unsafe" + NODES="$NODES staker-unsafe" fi if $l3node; then NODES="$NODES l3node" From bc93d54ebf4a31a7f8cb3a2a4ff97720ff3f6530 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 20 Nov 2023 09:06:05 -0700 Subject: [PATCH 041/180] typo fix --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index fa1a173b..47d354fe 100755 --- a/test-node.bash +++ b/test-node.bash @@ -169,7 +169,7 @@ while [[ $# -gt 0 ]]; do echo --blockscout build or launch blockscout echo --simple run a simple configuration. one node as sequencer/batch-poster/staker \(default unless using --dev\) echo --no-tokenbridge don\'t build or launch tokenbridge - echo --no-run does not launch nodes \(usefull with build or init\) + echo --no-run does not launch nodes \(useful with build or init\) echo --no-simple run a full configuration with separate sequencer/batch-poster/validator/relayer echo echo script runs inside a separate docker. For SCRIPT-ARGS, run $0 script --help From 0ad3bf8af1465c5422acc7a75e9ad5fd9440b8c2 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Tue, 28 Nov 2023 13:51:40 +0800 Subject: [PATCH 042/180] Use the broadcaster to deliver msgs if espresso mode is on --- scripts/config.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index a795056d..011d6f89 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -218,6 +218,16 @@ function writeConfigs(argv: any) { "url": argv.validationNodeUrl, "jwtsecret": valJwtSecret, } + }, + "feed": { + "input": { + "url": [], // websocket urls + }, + "output": { + "enable": false, + "signed": false, + "addr": "0.0.0.0", + }, } }, "persistent": { @@ -255,6 +265,7 @@ function writeConfigs(argv: any) { sequencerConfig.node.espresso = true sequencerConfig.execution.sequencer.espresso = true sequencerConfig.execution.sequencer["hotshot-url"] = argv.espressoUrl + sequencerConfig.node.feed.output.enable = true } else { sequencerConfig.node["seq-coordinator"].enable = true } @@ -262,7 +273,11 @@ function writeConfigs(argv: any) { let posterConfig = JSON.parse(baseConfJSON) posterConfig["parent-chain"].wallet.account = namedAccount("sequencer").address - posterConfig.node["seq-coordinator"].enable = true + if (argv.espresso) { + posterConfig.node.feed.input.url.push("ws://sequencer:9642") + } else { + posterConfig.node["seq-coordinator"].enable = true + } posterConfig.node["batch-poster"].enable = true fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) From 12d9bed2c808d25b22b7a708ce9b3662b17c5876 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 28 Nov 2023 13:13:55 +0100 Subject: [PATCH 043/180] Use latest token-bridge-contracts tag --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 37eb13f6..699d9bc0 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone -b add-creator-ci https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone -b v1.1.1 https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From 7889505d1928ad06993ffc90396676ea2e0fc544 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Tue, 28 Nov 2023 10:16:12 -0500 Subject: [PATCH 044/180] added support for running the validator in Espresso mode --- scripts/config.ts | 131 ++++++++++++++++++++++++---------------------- test-node.bash | 7 +-- 2 files changed, 72 insertions(+), 66 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index a795056d..83d4c41b 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -32,7 +32,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242 } function writeGethGenesisConfig(argv: any) { - const gethConfig = ` + const gethConfig = ` { "config": { "ChainName": "l1_chain", @@ -152,10 +152,10 @@ function writeGethGenesisConfig(argv: any) { function writeConfigs(argv: any) { const valJwtSecret = path.join(consts.configpath, "val_jwt.hex") - const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") + const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") const baseConfig = { "parent-chain": { - "connection" : { + "connection": { "url": argv.l1url, }, "wallet": { @@ -208,16 +208,18 @@ function writeConfigs(argv: any) { "max-delay": "30s", "data-poster": { "redis-signer": { - "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" + "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" }, "wait-for-l1-finality": false } }, "block-validator": { - "validation-server" : { - "url": argv.validationNodeUrl, - "jwtsecret": valJwtSecret, - } + "validation-server": { + "url": argv.validationNodeUrl, + "jwtsecret": valJwtSecret, + }, + "espresso": false, + "hotshot-address": "", } }, "persistent": { @@ -240,6 +242,10 @@ function writeConfigs(argv: any) { validatorConfig["parent-chain"].wallet.account = namedAccount("validator").address validatorConfig.node.staker.enable = true validatorConfig.node.staker["use-smart-contract-wallet"] = true + if (argv.espresso) { + validatorConfig.node["block-validator"]["espresso"] = true + validatorConfig.node["block-validator"]["hotshot-address"] = argv["hotshot-address"] + } let validconfJSON = JSON.stringify(validatorConfig) fs.writeFileSync(path.join(consts.configpath, "validator_config.json"), validconfJSON) @@ -251,12 +257,11 @@ function writeConfigs(argv: any) { sequencerConfig.execution.sequencer.enable = true sequencerConfig.node.sequencer = true sequencerConfig.node["delayed-sequencer"].enable = true + sequencerConfig.node["seq-coordinator"].enable = true if (argv.espresso) { sequencerConfig.node.espresso = true sequencerConfig.execution.sequencer.espresso = true sequencerConfig.execution.sequencer["hotshot-url"] = argv.espressoUrl - } else { - sequencerConfig.node["seq-coordinator"].enable = true } fs.writeFileSync(path.join(consts.configpath, "sequencer_config.json"), JSON.stringify(sequencerConfig)) @@ -267,7 +272,7 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) let l3Config = JSON.parse(baseConfJSON) - l3Config["parent-chain"].connection.url = argv.l2url + l3Config["parent-chain"].connection.url = argv.l2url l3Config["parent-chain"].wallet.account = namedAccount("l3sequencer").address l3Config.chain.id = 333333 const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json") @@ -305,32 +310,32 @@ function writeConfigs(argv: any) { function writeL2ChainConfig(argv: any) { const l2ChainConfig = { - "chainId": 412346, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": argv.l2owner, - "GenesisBlockNum": 0 - } + "chainId": 412346, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": argv.l2owner, + "GenesisBlockNum": 0 + } } const l2ChainConfigJSON = JSON.stringify(l2ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l2_chain_config.json"), l2ChainConfigJSON) @@ -338,32 +343,32 @@ function writeL2ChainConfig(argv: any) { function writeL3ChainConfig(argv: any) { const l3ChainConfig = { - "chainId": 333333, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": "0x0000000000000000000000000000000000000000", - "GenesisBlockNum": 0 - } + "chainId": 333333, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": "0x0000000000000000000000000000000000000000", + "GenesisBlockNum": 0 + } } const l3ChainConfigJSON = JSON.stringify(l3ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l3_chain_config.json"), l3ChainConfigJSON) diff --git a/test-node.bash b/test-node.bash index 276b86ec..8539f19b 100755 --- a/test-node.bash +++ b/test-node.bash @@ -38,6 +38,7 @@ tokenbridge=true l3node=false consensusclient=false redundantsequencers=0 +hotShotAddr=0x217788c286797d56cd59af5e493f3699c39cbbe8 dev_build_nitro=false dev_build_blockscout=false espresso=false @@ -320,11 +321,11 @@ if $force_init; then echo == Deploying Espresso Contract echo "" > espresso.env docker-compose up -d commitment-task espresso-sequencer0 espresso-sequencer1 --wait - espressol1contract=`curl http://localhost:60000/api/hotshot_contract` - echo "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=$espressol1contract" > espresso.env + hotShotAddr=`curl http://localhost:60000/api/hotshot_contract` + echo "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=$hotShotAddr" > espresso.env fi echo == Writing configs - docker-compose run scripts write-config --espresso $espresso + docker-compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr echo == Initializing redis docker-compose run scripts redis-init --redundancy $redundantsequencers From 6de75710ca1bb07d508d0ea66b3a31b003433347 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Mon, 4 Dec 2023 19:29:54 -0500 Subject: [PATCH 045/180] remove linting --- scripts/config.ts | 126 +++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index db1b90eb..d9afd7ce 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -32,7 +32,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242 } function writeGethGenesisConfig(argv: any) { - const gethConfig = ` + const gethConfig = ` { "config": { "ChainName": "l1_chain", @@ -152,10 +152,10 @@ function writeGethGenesisConfig(argv: any) { function writeConfigs(argv: any) { const valJwtSecret = path.join(consts.configpath, "val_jwt.hex") - const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") + const chainInfoFile = path.join(consts.configpath, "l2_chain_info.json") const baseConfig = { "parent-chain": { - "connection": { + "connection" : { "url": argv.l1url, }, "wallet": { @@ -208,18 +208,18 @@ function writeConfigs(argv: any) { "max-delay": "30s", "data-poster": { "redis-signer": { - "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" + "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" }, "wait-for-l1-finality": false } }, "block-validator": { - "validation-server": { - "url": argv.validationNodeUrl, - "jwtsecret": valJwtSecret, - }, - "espresso": false, - "hotshot-address": "", + "validation-server" : { + "url": argv.validationNodeUrl, + "jwtsecret": valJwtSecret, + } + "espresso": false, + "hotshot-address": "", }, "feed": { "input": { @@ -288,7 +288,7 @@ function writeConfigs(argv: any) { fs.writeFileSync(path.join(consts.configpath, "poster_config.json"), JSON.stringify(posterConfig)) let l3Config = JSON.parse(baseConfJSON) - l3Config["parent-chain"].connection.url = argv.l2url + l3Config["parent-chain"].connection.url = argv.l2url l3Config["parent-chain"].wallet.account = namedAccount("l3sequencer").address l3Config.chain.id = 333333 const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json") @@ -326,32 +326,32 @@ function writeConfigs(argv: any) { function writeL2ChainConfig(argv: any) { const l2ChainConfig = { - "chainId": 412346, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": argv.l2owner, - "GenesisBlockNum": 0 - } + "chainId": 412346, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": argv.l2owner, + "GenesisBlockNum": 0 + } } const l2ChainConfigJSON = JSON.stringify(l2ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l2_chain_config.json"), l2ChainConfigJSON) @@ -359,32 +359,32 @@ function writeL2ChainConfig(argv: any) { function writeL3ChainConfig(argv: any) { const l3ChainConfig = { - "chainId": 333333, - "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "clique": { - "period": 0, - "epoch": 0 - }, - "arbitrum": { - "EnableArbOS": true, - "AllowDebugPrecompiles": true, - "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, - "InitialChainOwner": "0x0000000000000000000000000000000000000000", - "GenesisBlockNum": 0 - } + "chainId": 333333, + "homesteadBlock": 0, + "daoForkSupport": true, + "eip150Block": 0, + "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "eip155Block": 0, + "eip158Block": 0, + "byzantiumBlock": 0, + "constantinopleBlock": 0, + "petersburgBlock": 0, + "istanbulBlock": 0, + "muirGlacierBlock": 0, + "berlinBlock": 0, + "londonBlock": 0, + "clique": { + "period": 0, + "epoch": 0 + }, + "arbitrum": { + "EnableArbOS": true, + "AllowDebugPrecompiles": true, + "DataAvailabilityCommittee": false, + "InitialArbOSVersion": 11, + "InitialChainOwner": "0x0000000000000000000000000000000000000000", + "GenesisBlockNum": 0 + } } const l3ChainConfigJSON = JSON.stringify(l3ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l3_chain_config.json"), l3ChainConfigJSON) From df108cb149acd2a98b87fca150c18d971a29dc20 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Tue, 5 Dec 2023 10:44:58 -0500 Subject: [PATCH 046/180] add comma --- scripts/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index d9afd7ce..d4dd0cec 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -217,7 +217,7 @@ function writeConfigs(argv: any) { "validation-server" : { "url": argv.validationNodeUrl, "jwtsecret": valJwtSecret, - } + }, "espresso": false, "hotshot-address": "", }, From 2e28f3d6172754d1f73e2729d6fbdacfd5604795 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Thu, 7 Dec 2023 07:58:24 -0500 Subject: [PATCH 047/180] add hotshot address argument, set espresso mode in the l2 config based on arg --- scripts/config.ts | 1 + scripts/index.ts | 1 + test-node.bash | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index d4dd0cec..985240a5 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -332,6 +332,7 @@ function writeL2ChainConfig(argv: any) { "eip150Block": 0, "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", "eip155Block": 0, + "espresso": argv.espresso, "eip158Block": 0, "byzantiumBlock": 0, "constantinopleBlock": 0, diff --git a/scripts/index.ts b/scripts/index.ts index b919f788..a71c6939 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -31,6 +31,7 @@ async function main() { .options({ espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-sequencer0:50000' }, + hotshotAddress: { sring: true, description: 'address of the HotShot contract', default: '' } }) .command(bridgeFundsCommand) .command(bridgeToL3Command) diff --git a/test-node.bash b/test-node.bash index 8539f19b..edadbdb6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -309,7 +309,7 @@ if $force_init; then docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 500 > /dev/null & echo == Writing l2 chain config - docker-compose run scripts write-l2-chain-config + docker-compose run scripts write-l2-chain-config --espresso $espresso echo == Deploying L2 sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` From a59d41c3b15162a76b5ff8d96ae0a0788ae4ce4a Mon Sep 17 00:00:00 2001 From: gzeon Date: Fri, 8 Dec 2023 23:56:16 +0800 Subject: [PATCH 048/180] Update test-node.bash --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index ab2e42fe..a7b23ad7 100755 --- a/test-node.bash +++ b/test-node.bash @@ -172,7 +172,7 @@ while [[ $# -gt 0 ]]; do echo --pos l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate heavy computation, validating all blocks in WASM echo --l3-fee-token L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided - echo --l3-token-bridge: Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided + echo --l3-token-bridge Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided echo --batchposters batch posters [0-3] echo --redundantsequencers redundant sequencers [0-3] echo --detach detach from nodes after running them From e93fba1173346d9d6adec6ca6560e0b00f469ee4 Mon Sep 17 00:00:00 2001 From: gzeon Date: Fri, 8 Dec 2023 23:57:08 +0800 Subject: [PATCH 049/180] chore: use v1.1.2 --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 699d9bc0..cb07a60e 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone -b v1.1.1 https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone -b v1.1.2 https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From 547e95ed9950ecc85d24184a492803441b70b3b2 Mon Sep 17 00:00:00 2001 From: sveitser Date: Tue, 12 Dec 2023 16:46:15 +0100 Subject: [PATCH 050/180] Remove extra quotes around hotshot address --- scripts/config.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 985240a5..253aea7e 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -219,7 +219,7 @@ function writeConfigs(argv: any) { "jwtsecret": valJwtSecret, }, "espresso": false, - "hotshot-address": "", + "hotshot-address": "", }, "feed": { "input": { @@ -254,7 +254,11 @@ function writeConfigs(argv: any) { validatorConfig.node.staker["use-smart-contract-wallet"] = true if (argv.espresso) { validatorConfig.node["block-validator"]["espresso"] = true - validatorConfig.node["block-validator"]["hotshot-address"] = argv["hotshot-address"] + // If we don't quote the address it is interpreted as a Number. + // The quotes however stick around and make it an invalid address. + // Remove the double quote from the hotshot address. + // There has to be a better way. + validatorConfig.node["block-validator"]["hotshot-address"] = argv["hotshot-address"].replace(/^"(.+(?="$))"$/, '$1') } let validconfJSON = JSON.stringify(validatorConfig) fs.writeFileSync(path.join(consts.configpath, "validator_config.json"), validconfJSON) From 6c30e2682fe91a95d8222e292559677ec348703d Mon Sep 17 00:00:00 2001 From: nomaxg Date: Tue, 12 Dec 2023 18:19:52 -0500 Subject: [PATCH 051/180] add fs tag --- docker-compose.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a2c28e04..53ea39bd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -19,13 +19,13 @@ services: extra_hosts: - 'host.docker.internal:host-gateway' env_file: - - ./blockscout/nitro.env + - ./blockscout/nitro.env environment: - ETHEREUM_JSONRPC_VARIANT: 'geth' - ETHEREUM_JSONRPC_HTTP_URL: http://sequencer:8547/ - INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: "true" - DATABASE_URL: postgresql://postgres:@postgres:5432/blockscout - ECTO_USE_SSL: "false" + ETHEREUM_JSONRPC_VARIANT: 'geth' + ETHEREUM_JSONRPC_HTTP_URL: http://sequencer:8547/ + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: "true" + DATABASE_URL: postgresql://postgres:@postgres:5432/blockscout + ECTO_USE_SSL: "false" ports: - "127.0.0.1:4000:4000" @@ -34,9 +34,9 @@ services: restart: always container_name: 'postgres' environment: - POSTGRES_PASSWORD: '' - POSTGRES_USER: 'postgres' - POSTGRES_HOST_AUTH_METHOD: 'trust' + POSTGRES_PASSWORD: '' + POSTGRES_USER: 'postgres' + POSTGRES_HOST_AUTH_METHOD: 'trust' volumes: - "postgres-data:/var/lib/postgresql/data" ports: @@ -164,7 +164,6 @@ services: - geth - redis - sequencer_b: pid: host # allow debugging image: nitro-node-dev-testnode @@ -381,7 +380,7 @@ services: ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query -- submit + command: sequencer -- http -- query-fs -- submit environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_DA_SERVER_URL @@ -407,7 +406,6 @@ services: ports: - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) - command: sequencer -- http -- query environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_DA_SERVER_URL From 3db1335e3369a04dc9ad5919e95d6298bce6d66c Mon Sep 17 00:00:00 2001 From: nomaxg Date: Tue, 12 Dec 2023 22:28:32 -0500 Subject: [PATCH 052/180] add status flag --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 53ea39bd..921e71fc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -380,7 +380,7 @@ services: ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query-fs -- submit + command: sequencer -- http -- query-fs -- status -- submit environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_DA_SERVER_URL From ce5fb996cc2074efe4e1c601cb80509b15af0616 Mon Sep 17 00:00:00 2001 From: Henry <11198460+godzillaba@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:33:31 -0500 Subject: [PATCH 053/180] more traffic --- test-node.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 47d354fe..66b6edc1 100755 --- a/test-node.bash +++ b/test-node.bash @@ -327,7 +327,7 @@ if $force_init; then echo == create l1 traffic docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait - docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 500 > /dev/null & + docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l2 chain config docker-compose run scripts write-l2-chain-config @@ -372,7 +372,7 @@ if $force_init; then echo == create l2 traffic docker-compose run scripts send-l2 --ethamount 100 --to user_traffic_generator --wait - docker-compose run scripts send-l2 --ethamount 0.0001 --from user_traffic_generator --to user_fee_token_deployer --wait --delay 500 --times 500 > /dev/null & + docker-compose run scripts send-l2 --ethamount 0.0001 --from user_traffic_generator --to user_fee_token_deployer --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l3 chain config docker-compose run scripts write-l3-chain-config From a51f0a95e2d85dac02dd1f9c6fb2fad20dc493e4 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Mon, 18 Dec 2023 13:54:55 -0500 Subject: [PATCH 054/180] add eth rpc to validator for slow confirmations --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 921e71fc..8663b7cf 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -277,7 +277,7 @@ services: - "validator-data:/home/user/.arbitrum/local/nitro" - "l1keystore:/home/user/l1keystore" - "config:/config" - command: --conf.file /config/validator_config.json --http.port 8547 --http.api net,web3,arb,debug --ws.port 8548 + command: --conf.file /config/validator_config.json --http.port 8547 --http.api net,web3,arb,debug,net,eth --ws.port 8548 depends_on: - sequencer - validation_node From 1366df693cde8f78542992b79b5c895db958f693 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 21 Dec 2023 17:38:54 +0100 Subject: [PATCH 055/180] Use 'docker compose' CLI instead of 'docker-compose' when --wait flag is used 'docker-compose' CLI seems to be out of date in Github runners, so doesn't recognize '--wait' flag. Ref: https://stackoverflow.com/questions/65949957/how-can-i-wait-for-the-container-to-be-healthy-in-github-action#comment136082101_76422970 --- test-node.bash | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-node.bash b/test-node.bash index 0479e319..9b04c655 100755 --- a/test-node.bash +++ b/test-node.bash @@ -319,16 +319,16 @@ if $force_init; then docker-compose run geth init --datadir /datadir/ /config/geth_genesis.json echo == Starting geth - docker-compose up --wait geth + docker compose up --wait geth echo == Creating prysm genesis docker-compose up create_beacon_chain_genesis echo == Running prysm - docker-compose up --wait prysm_beacon_chain - docker-compose up --wait prysm_validator + docker compose up --wait prysm_beacon_chain + docker compose up --wait prysm_validator else - docker-compose up --wait geth + docker compose up --wait geth fi echo == Funding validator and sequencer @@ -355,12 +355,12 @@ if $force_init; then docker-compose run scripts write-config echo == Initializing redis - docker-compose up --wait redis + docker compose up --wait redis docker-compose run scripts redis-init --redundancy $redundantsequencers fi echo == Funding l2 funnel and dev key - docker-compose up --wait $INITIAL_SEQ_NODES + docker compose up --wait $INITIAL_SEQ_NODES docker-compose run scripts bridge-funds --ethamount 100000 --wait docker-compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" @@ -402,7 +402,7 @@ if $force_init; then docker-compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key - docker-compose up --wait l3node sequencer + docker compose up --wait l3node sequencer if $l3_token_bridge; then echo == Deploying L2-L3 token bridge From 7ca15aac2643c4c6a874bf8c5340f3511148d8f1 Mon Sep 17 00:00:00 2001 From: spsjvc Date: Thu, 21 Dec 2023 18:09:32 +0100 Subject: [PATCH 056/180] update docker compose command --- test-node.bash | 106 ++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/test-node.bash b/test-node.bash index 9b04c655..f0a51923 100755 --- a/test-node.bash +++ b/test-node.bash @@ -8,16 +8,16 @@ BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` cd "$mydir" -if ! which docker-compose > /dev/null; then - echo == Error! docker-compose not installed - echo please install docker-compose and have it in PATH +if ! which docker compose > /dev/null; then + echo == Error! docker compose not installed + echo please install docker compose and have it in PATH echo see https://docs.docker.com/compose/install/ exit 1 fi if [[ $# -gt 0 ]] && [[ $1 == "script" ]]; then shift - docker-compose run scripts "$@" + docker compose run scripts "$@" exit $? fi @@ -264,7 +264,7 @@ if $force_build; then if $tokenbridge || $l3_token_bridge; then LOCAL_BUILD_NODES="$LOCAL_BUILD_NODES tokenbridge" fi - docker-compose build --no-rm $LOCAL_BUILD_NODES + docker compose build --no-rm $LOCAL_BUILD_NODES fi if $dev_build_nitro; then @@ -286,12 +286,12 @@ else fi if $force_build; then - docker-compose build --no-rm $NODES scripts + docker compose build --no-rm $NODES scripts fi if $force_init; then echo == Removing old data.. - docker-compose down + docker compose down leftoverContainers=`docker container ls -a --filter label=com.docker.compose.project=nitro-testnode -q | xargs echo` if [ `echo $leftoverContainers | wc -w` -gt 0 ]; then docker rm $leftoverContainers @@ -303,26 +303,26 @@ if $force_init; then fi echo == Generating l1 keys - docker-compose run scripts write-accounts - docker-compose run --entrypoint sh geth -c "echo passphrase > /datadir/passphrase" - docker-compose run --entrypoint sh geth -c "chown -R 1000:1000 /keystore" - docker-compose run --entrypoint sh geth -c "chown -R 1000:1000 /config" + docker compose run scripts write-accounts + docker compose run --entrypoint sh geth -c "echo passphrase > /datadir/passphrase" + docker compose run --entrypoint sh geth -c "chown -R 1000:1000 /keystore" + docker compose run --entrypoint sh geth -c "chown -R 1000:1000 /config" if $consensusclient; then echo == Writing configs - docker-compose run scripts write-geth-genesis-config + docker compose run scripts write-geth-genesis-config echo == Writing configs - docker-compose run scripts write-prysm-config + docker compose run scripts write-prysm-config echo == Initializing go-ethereum genesis configuration - docker-compose run geth init --datadir /datadir/ /config/geth_genesis.json + docker compose run geth init --datadir /datadir/ /config/geth_genesis.json echo == Starting geth docker compose up --wait geth echo == Creating prysm genesis - docker-compose up create_beacon_chain_genesis + docker compose up create_beacon_chain_genesis echo == Running prysm docker compose up --wait prysm_beacon_chain @@ -332,74 +332,74 @@ if $force_init; then fi echo == Funding validator and sequencer - docker-compose run scripts send-l1 --ethamount 1000 --to validator --wait - docker-compose run scripts send-l1 --ethamount 1000 --to sequencer --wait + docker compose run scripts send-l1 --ethamount 1000 --to validator --wait + docker compose run scripts send-l1 --ethamount 1000 --to sequencer --wait echo == create l1 traffic - docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait - docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & + docker compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait + docker compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l2 chain config - docker-compose run scripts write-l2-chain-config + docker compose run scripts write-l2-chain-config - sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` + sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - docker-compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json - docker-compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" + docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json + docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then echo == Writing configs - docker-compose run scripts write-config --simple + docker compose run scripts write-config --simple else echo == Writing configs - docker-compose run scripts write-config + docker compose run scripts write-config echo == Initializing redis docker compose up --wait redis - docker-compose run scripts redis-init --redundancy $redundantsequencers + docker compose run scripts redis-init --redundancy $redundantsequencers fi echo == Funding l2 funnel and dev key docker compose up --wait $INITIAL_SEQ_NODES - docker-compose run scripts bridge-funds --ethamount 100000 --wait - docker-compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" + docker compose run scripts bridge-funds --ethamount 100000 --wait + docker compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" if $tokenbridge; then echo == Deploying L1-L2 token bridge sleep 120 - rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker-compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge - docker-compose run --entrypoint sh tokenbridge -c "cat network.json" + rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` + docker compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge + docker compose run --entrypoint sh tokenbridge -c "cat network.json" echo fi if $l3node; then echo == Funding l3 users - docker-compose run scripts send-l2 --ethamount 1000 --to l3owner --wait - docker-compose run scripts send-l2 --ethamount 1000 --to l3sequencer --wait + docker compose run scripts send-l2 --ethamount 1000 --to l3owner --wait + docker compose run scripts send-l2 --ethamount 1000 --to l3sequencer --wait echo == Funding l2 deployers - docker-compose run scripts send-l2 --ethamount 100 --to user_token_bridge_deployer --wait - docker-compose run scripts send-l2 --ethamount 100 --to user_fee_token_deployer --wait + docker compose run scripts send-l2 --ethamount 100 --to user_token_bridge_deployer --wait + docker compose run scripts send-l2 --ethamount 100 --to user_fee_token_deployer --wait echo == create l2 traffic - docker-compose run scripts send-l2 --ethamount 100 --to user_traffic_generator --wait - docker-compose run scripts send-l2 --ethamount 0.0001 --from user_traffic_generator --to user_fee_token_deployer --wait --delay 500 --times 1000000 > /dev/null & + docker compose run scripts send-l2 --ethamount 100 --to user_traffic_generator --wait + docker compose run scripts send-l2 --ethamount 0.0001 --from user_traffic_generator --to user_fee_token_deployer --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l3 chain config - docker-compose run scripts write-l3-chain-config + docker compose run scripts write-l3-chain-config if $l3_custom_fee_token; then echo == Deploying custom fee token - nativeTokenAddress=`docker-compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` + nativeTokenAddress=`docker compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" fi echo == Deploying L3 - l3owneraddress=`docker-compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` - l3sequenceraddress=`docker-compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - docker-compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG - docker-compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" + l3owneraddress=`docker compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` + l3sequenceraddress=`docker compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` + docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG + docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key docker compose up --wait l3node sequencer @@ -407,21 +407,21 @@ if $force_init; then if $l3_token_bridge; then echo == Deploying L2-L3 token bridge deployer_key=`printf "%s" "user_token_bridge_deployer" | openssl dgst -sha256 | sed 's/^.*= //'` - rollupAddress=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker-compose run -e ROLLUP_OWNER=$l3owneraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge - docker-compose run --entrypoint sh tokenbridge -c "cat network.json" + rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` + docker compose run -e ROLLUP_OWNER=$l3owneraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge + docker compose run --entrypoint sh tokenbridge -c "cat network.json" echo fi echo == Fund L3 accounts if $l3_custom_fee_token; then - native_token=`docker-compose run --entrypoint sh poster -c "jq -r '.[0].rollup[\"native-token\"]' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker-compose run scripts bridge-native-token-to-l3 --token $native_token --amount 50000 --from user_token_bridge_deployer --wait - docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait - docker-compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait + native_token=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup[\"native-token\"]' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` + docker compose run scripts bridge-native-token-to-l3 --token $native_token --amount 50000 --from user_token_bridge_deployer --wait + docker compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait + docker compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait else - docker-compose run scripts bridge-to-l3 --ethamount 50000 --wait - docker-compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" + docker compose run scripts bridge-to-l3 --ethamount 50000 --wait + docker compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" fi fi @@ -437,5 +437,5 @@ if $run; then echo if things go wrong - use --init to create a new chain echo - docker-compose up $UP_FLAG $NODES + docker compose up $UP_FLAG $NODES fi From 937af32a3c92a9913121fb64229e2c6f91065ac2 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 22 Dec 2023 10:16:49 +0100 Subject: [PATCH 057/180] Check not needed anymore --- test-node.bash | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test-node.bash b/test-node.bash index f0a51923..82ad3b9a 100755 --- a/test-node.bash +++ b/test-node.bash @@ -8,13 +8,6 @@ BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` cd "$mydir" -if ! which docker compose > /dev/null; then - echo == Error! docker compose not installed - echo please install docker compose and have it in PATH - echo see https://docs.docker.com/compose/install/ - exit 1 -fi - if [[ $# -gt 0 ]] && [[ $1 == "script" ]]; then shift docker compose run scripts "$@" From 683f88745818a3830bb5a4ebdf3873248f471f80 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 22 Dec 2023 10:51:27 +0100 Subject: [PATCH 058/180] Remove unnecessary sleep --- test-node.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 82ad3b9a..f1b621f5 100755 --- a/test-node.bash +++ b/test-node.bash @@ -359,7 +359,6 @@ if $force_init; then if $tokenbridge; then echo == Deploying L1-L2 token bridge - sleep 120 rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker compose run --entrypoint sh tokenbridge -c "cat network.json" From d77154dd20af632d5759c0899c9f33a3f5248a09 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 22 Dec 2023 10:52:00 +0100 Subject: [PATCH 059/180] Use latest token bridge design TODO: switch this to v1.2.0 when it's released --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index cb07a60e..2b952168 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone -b v1.1.2 https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone -b feat-registry https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From 8bb39c2dbf6f31ed8bbac56aa413f83b20ecf2dc Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 22 Dec 2023 11:40:03 +0100 Subject: [PATCH 060/180] Read native token address from l3deployment.json --- scripts/ethcommands.ts | 7 ++----- test-node.bash | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 63a70808..3d782333 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -163,10 +163,6 @@ export const bridgeNativeTokenToL3Command = { describe: "account (see general help)", default: "funnel", }, - token: { - string: true, - describe: "chain's custom fee token", - }, wait: { boolean: true, describe: "wait till l3 has balance of amount", @@ -180,9 +176,10 @@ export const bridgeNativeTokenToL3Command = { .toString() ); const inboxAddr = ethers.utils.hexlify(deploydata.inbox); + const nativeTokenAddr = ethers.utils.hexlify(deploydata["native-token"]); argv.ethamount = "0" - await bridgeNativeToken(argv, argv.l2url, argv.l3url, inboxAddr, argv.token) + await bridgeNativeToken(argv, argv.l2url, argv.l3url, inboxAddr, nativeTokenAddr) }, }; diff --git a/test-node.bash b/test-node.bash index f1b621f5..7d360e4c 100755 --- a/test-node.bash +++ b/test-node.bash @@ -407,8 +407,7 @@ if $force_init; then echo == Fund L3 accounts if $l3_custom_fee_token; then - native_token=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup[\"native-token\"]' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker compose run scripts bridge-native-token-to-l3 --token $native_token --amount 50000 --from user_token_bridge_deployer --wait + docker compose run scripts bridge-native-token-to-l3 --amount 50000 --from user_token_bridge_deployer --wait docker compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --wait docker compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait else From b7201b10698437efd9de4f9f73c4d7eb577c428d Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 22 Dec 2023 14:50:35 +0100 Subject: [PATCH 061/180] Update sequencer command line arguments https://github.com/EspressoSystems/espresso-sequencer/pull/893 --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 8663b7cf..f932d49e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -380,7 +380,7 @@ services: ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query-fs -- status -- submit + command: sequencer -- http -- query -- status -- submit environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_DA_SERVER_URL From 2bbfa027c07c4d9a4a7bedbeaf35fef78d35604c Mon Sep 17 00:00:00 2001 From: sveitser Date: Tue, 2 Jan 2024 12:38:43 +0100 Subject: [PATCH 062/180] Non-sequencer now need to set forwarding target --- scripts/config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/config.ts b/scripts/config.ts index 253aea7e..98915a1f 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -253,6 +253,7 @@ function writeConfigs(argv: any) { validatorConfig.node.staker.enable = true validatorConfig.node.staker["use-smart-contract-wallet"] = true if (argv.espresso) { + validatorConfig.execution["forwarding-target"] = "null" validatorConfig.node["block-validator"]["espresso"] = true // If we don't quote the address it is interpreted as a Number. // The quotes however stick around and make it an invalid address. @@ -284,6 +285,7 @@ function writeConfigs(argv: any) { let posterConfig = JSON.parse(baseConfJSON) posterConfig["parent-chain"].wallet.account = namedAccount("sequencer").address if (argv.espresso) { + posterConfig.execution["forwarding-target"] = "null" posterConfig.node.feed.input.url.push("ws://sequencer:9642") } else { posterConfig.node["seq-coordinator"].enable = true From 7c5d3e6ab13f949c6560607e81fc9fd154ee3a28 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Mon, 8 Jan 2024 16:45:11 +0100 Subject: [PATCH 063/180] Bump nitro --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 7d360e4c..c51e4103 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.0-alpha.1-fdd098e-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.2-8f33fea BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` From d109d0fad92bcc89179b3bd29edd35e31dac6e5e Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Mon, 8 Jan 2024 18:48:38 +0100 Subject: [PATCH 064/180] Use the working nitro version --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index c51e4103..407d03bc 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.2-8f33fea +NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.2-8f33fea-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` From 0d930b271e344b203bf7c376cc76941e4779151a Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Wed, 24 Jan 2024 15:50:57 -0700 Subject: [PATCH 065/180] fix config: add forwarding target --- scripts/config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/config.ts b/scripts/config.ts index 2854199f..76a51aa3 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -224,6 +224,7 @@ function writeConfigs(argv: any) { "sequencer": { "enable": false, }, + "forwarding-target": "null", }, "persistent": { "chain": "local" From 9da5a24d76f839eedd517a91ab68fe23f892758f Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Thu, 25 Jan 2024 18:58:02 +0800 Subject: [PATCH 066/180] Pass the hotshot address to L2 contracts --- test-node.bash | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test-node.bash b/test-node.bash index bd5f8290..cd332887 100755 --- a/test-node.bash +++ b/test-node.bash @@ -311,12 +311,6 @@ if $force_init; then echo == Writing l2 chain config docker-compose run scripts write-l2-chain-config --espresso $espresso - echo == Deploying L2 - sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - - docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json - docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" - if $espresso; then echo == Deploying Espresso Contract echo "" > espresso.env @@ -324,6 +318,13 @@ if $force_init; then hotShotAddr=`curl http://localhost:60000/api/hotshot_contract` echo "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=$hotShotAddr" > espresso.env fi + + echo == Deploying L2 + sequenceraddress=`docker-compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` + + docker-compose run --entrypoint /usr/local/bin/deploy poster --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json --hotshot $hotShotAddr + docker-compose run --entrypoint sh poster -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" + echo == Writing configs docker-compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr From a657634ec5e0303c1a9f4a6a1894590ebebb723b Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 30 Jan 2024 23:49:31 +0900 Subject: [PATCH 067/180] chore: export tokenbridge --- docker-compose.yaml | 1 + test-node.bash | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b1f80871..e2ade352 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -312,6 +312,7 @@ services: volumes: - "l1keystore:/home/user/l1keystore" - "config:/config" + - "sdk-data:/sdk-data" relay: pid: host diff --git a/test-node.bash b/test-node.bash index 407d03bc..53427e48 100755 --- a/test-node.bash +++ b/test-node.bash @@ -361,7 +361,7 @@ if $force_init; then echo == Deploying L1-L2 token bridge rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json" + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l1l2_network.json" echo fi @@ -401,7 +401,7 @@ if $force_init; then deployer_key=`printf "%s" "user_token_bridge_deployer" | openssl dgst -sha256 | sed 's/^.*= //'` rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker compose run -e ROLLUP_OWNER=$l3owneraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json" + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l2l3_network.json" echo fi From 849ab128a05ed1975f7e5c5dea6a379122fadb49 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 30 Jan 2024 23:49:44 +0900 Subject: [PATCH 068/180] chore: use main --- scripts/consts.ts | 3 ++- tokenbridge/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/consts.ts b/scripts/consts.ts index 72728d28..8d7abc78 100644 --- a/scripts/consts.ts +++ b/scripts/consts.ts @@ -1,6 +1,7 @@ export const l1keystore = "/home/user/l1keystore"; export const l1passphrase = "passphrase"; export const configpath = "/config"; -// Not secure. Do not sure for production purposes +export const sdkdatapath = "/sdk-data"; +// Not secure. Do not use for production purposes export const l1mnemonic = "indoor dish desk flag debris potato excuse depart ticket judge file exit"; diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 2b952168..64958ab5 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone -b feat-registry https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone -b main https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From dd89f5c1ada8ce96c4f66db94a9e29ad92f79078 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 30 Jan 2024 23:49:57 +0900 Subject: [PATCH 069/180] chore: import tokenbridge --- scripts/package.json | 1 + scripts/yarn.lock | 2192 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 2185 insertions(+), 8 deletions(-) diff --git a/scripts/package.json b/scripts/package.json index 49e8aed8..d1de3706 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -6,6 +6,7 @@ "author": "Offchain Labs, Inc.", "license": "Apache-2.0", "dependencies": { + "@arbitrum/token-bridge-contracts": "1.2.0", "@node-redis/client": "^1.0.4", "@openzeppelin/contracts": "^4.9.3", "@types/node": "^17.0.22", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index eaeb8d5c..26f86656 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2,6 +2,35 @@ # yarn lockfile v1 +"@aduh95/viz.js@^3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@aduh95/viz.js/-/viz.js-3.7.0.tgz#a20d86c5fc8f6abebdc39b96a4326e10375d77c0" + integrity sha512-20Pk2Z98fbPLkECcrZSJszKos/OgtvJJR3NcbVfgCJ6EQjDNzW2P1BKqImOz3tJ952dvO2DWEhcLhQ1Wz1e9ng== + +"@arbitrum/nitro-contracts@^1.0.0-beta.8": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@arbitrum/nitro-contracts/-/nitro-contracts-1.1.0.tgz#37ca26e026306ca9cc9fbeb183841fd8666ac7bb" + integrity sha512-/tLlU++IFdaD9Bn+RYzQ6+6k+0iDPuqi/cNf9kv5N1I9NAApNx1qfsIHoHMEQAvLuY+gj+raH7TAESBbzTAuuw== + dependencies: + "@offchainlabs/upgrade-executor" "1.1.0-beta.0" + "@openzeppelin/contracts" "4.5.0" + "@openzeppelin/contracts-upgradeable" "4.5.2" + patch-package "^6.4.7" + optionalDependencies: + sol2uml "2.2.0" + +"@arbitrum/token-bridge-contracts@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@arbitrum/token-bridge-contracts/-/token-bridge-contracts-1.2.0.tgz#b1dc02e123393848d0d8e5c167028bafa0ac8229" + integrity sha512-GdPn6nIlhkuacgvXZkmYLmNdmOcxVoHEfkEHtNlaBnMqS+HPXEA8keqZDesBHkQ96b9PCwwCegNEx/ZjM+Rq+g== + dependencies: + "@arbitrum/nitro-contracts" "^1.0.0-beta.8" + "@offchainlabs/upgrade-executor" "1.1.0-beta.0" + "@openzeppelin/contracts" "4.8.3" + "@openzeppelin/contracts-upgradeable" "4.8.3" + optionalDependencies: + "@openzeppelin/upgrades-core" "^1.24.1" + "@ethersproject/abi@5.6.0", "@ethersproject/abi@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.0.tgz#ea07cbc1eec2374d32485679c12408005895e9f3" @@ -17,6 +46,21 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.0" +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" + integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== + dependencies: + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/abstract-provider@5.6.0", "@ethersproject/abstract-provider@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" @@ -30,6 +74,19 @@ "@ethersproject/transactions" "^5.6.0" "@ethersproject/web" "^5.6.0" +"@ethersproject/abstract-provider@5.7.0", "@ethersproject/abstract-provider@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz#b0a8550f88b6bf9d51f90e4795d48294630cb9ef" + integrity sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/networks" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/web" "^5.7.0" + "@ethersproject/abstract-signer@5.6.0", "@ethersproject/abstract-signer@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" @@ -41,6 +98,17 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/properties" "^5.6.0" +"@ethersproject/abstract-signer@5.7.0", "@ethersproject/abstract-signer@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz#13f4f32117868452191a4649723cb086d2b596b2" + integrity sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/address@5.6.0", "@ethersproject/address@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" @@ -52,6 +120,17 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/rlp" "^5.6.0" +"@ethersproject/address@5.7.0", "@ethersproject/address@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.7.0.tgz#19b56c4d74a3b0a46bfdbb6cfcc0a153fc697f37" + integrity sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/base64@5.6.0", "@ethersproject/base64@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" @@ -59,6 +138,13 @@ dependencies: "@ethersproject/bytes" "^5.6.0" +"@ethersproject/base64@5.7.0", "@ethersproject/base64@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.7.0.tgz#ac4ee92aa36c1628173e221d0d01f53692059e1c" + integrity sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/basex@5.6.0", "@ethersproject/basex@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" @@ -67,6 +153,14 @@ "@ethersproject/bytes" "^5.6.0" "@ethersproject/properties" "^5.6.0" +"@ethersproject/basex@5.7.0", "@ethersproject/basex@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.7.0.tgz#97034dc7e8938a8ca943ab20f8a5e492ece4020b" + integrity sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/bignumber@5.6.0", "@ethersproject/bignumber@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" @@ -76,6 +170,15 @@ "@ethersproject/logger" "^5.6.0" bn.js "^4.11.9" +"@ethersproject/bignumber@5.7.0", "@ethersproject/bignumber@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.7.0.tgz#e2f03837f268ba655ffba03a57853e18a18dc9c2" + integrity sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + bn.js "^5.2.1" + "@ethersproject/bytes@5.6.0", "@ethersproject/bytes@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.0.tgz#81652f2a0e04533575befadce555213c11d8aa20" @@ -83,6 +186,13 @@ dependencies: "@ethersproject/logger" "^5.6.0" +"@ethersproject/bytes@5.7.0", "@ethersproject/bytes@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.7.0.tgz#a00f6ea8d7e7534d6d87f47188af1148d71f155d" + integrity sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A== + dependencies: + "@ethersproject/logger" "^5.7.0" + "@ethersproject/constants@5.6.0", "@ethersproject/constants@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" @@ -90,6 +200,13 @@ dependencies: "@ethersproject/bignumber" "^5.6.0" +"@ethersproject/constants@5.7.0", "@ethersproject/constants@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.7.0.tgz#df80a9705a7e08984161f09014ea012d1c75295e" + integrity sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/contracts@5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" @@ -106,6 +223,22 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/transactions" "^5.6.0" +"@ethersproject/contracts@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.7.0.tgz#c305e775abd07e48aa590e1a877ed5c316f8bd1e" + integrity sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg== + dependencies: + "@ethersproject/abi" "^5.7.0" + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/hash@5.6.0", "@ethersproject/hash@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" @@ -120,6 +253,21 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.0" +"@ethersproject/hash@5.7.0", "@ethersproject/hash@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.7.0.tgz#eb7aca84a588508369562e16e514b539ba5240a7" + integrity sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g== + dependencies: + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/base64" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/hdnode@5.6.0", "@ethersproject/hdnode@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998" @@ -138,6 +286,24 @@ "@ethersproject/transactions" "^5.6.0" "@ethersproject/wordlists" "^5.6.0" +"@ethersproject/hdnode@5.7.0", "@ethersproject/hdnode@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.7.0.tgz#e627ddc6b466bc77aebf1a6b9e47405ca5aef9cf" + integrity sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg== + dependencies: + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/basex" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/pbkdf2" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/wordlists" "^5.7.0" + "@ethersproject/json-wallets@5.6.0", "@ethersproject/json-wallets@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5" @@ -157,6 +323,25 @@ aes-js "3.0.0" scrypt-js "3.0.1" +"@ethersproject/json-wallets@5.7.0", "@ethersproject/json-wallets@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz#5e3355287b548c32b368d91014919ebebddd5360" + integrity sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g== + dependencies: + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/hdnode" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/pbkdf2" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + aes-js "3.0.0" + scrypt-js "3.0.1" + "@ethersproject/keccak256@5.6.0", "@ethersproject/keccak256@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" @@ -165,11 +350,24 @@ "@ethersproject/bytes" "^5.6.0" js-sha3 "0.8.0" +"@ethersproject/keccak256@5.7.0", "@ethersproject/keccak256@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.7.0.tgz#3186350c6e1cd6aba7940384ec7d6d9db01f335a" + integrity sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg== + dependencies: + "@ethersproject/bytes" "^5.7.0" + js-sha3 "0.8.0" + "@ethersproject/logger@5.6.0", "@ethersproject/logger@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a" integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg== +"@ethersproject/logger@5.7.0", "@ethersproject/logger@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.7.0.tgz#6ce9ae168e74fecf287be17062b590852c311892" + integrity sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig== + "@ethersproject/networks@5.6.0", "@ethersproject/networks@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.0.tgz#486d03fff29b4b6b5414d47a232ded09fe10de5e" @@ -177,6 +375,13 @@ dependencies: "@ethersproject/logger" "^5.6.0" +"@ethersproject/networks@5.7.1", "@ethersproject/networks@^5.7.0": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.7.1.tgz#118e1a981d757d45ccea6bb58d9fd3d9db14ead6" + integrity sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ== + dependencies: + "@ethersproject/logger" "^5.7.0" + "@ethersproject/pbkdf2@5.6.0", "@ethersproject/pbkdf2@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a" @@ -185,6 +390,14 @@ "@ethersproject/bytes" "^5.6.0" "@ethersproject/sha2" "^5.6.0" +"@ethersproject/pbkdf2@5.7.0", "@ethersproject/pbkdf2@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz#d2267d0a1f6e123f3771007338c47cccd83d3102" + integrity sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/properties@5.6.0", "@ethersproject/properties@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.6.0.tgz#38904651713bc6bdd5bdd1b0a4287ecda920fa04" @@ -192,6 +405,13 @@ dependencies: "@ethersproject/logger" "^5.6.0" +"@ethersproject/properties@5.7.0", "@ethersproject/properties@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.7.0.tgz#a6e12cb0439b878aaf470f1902a176033067ed30" + integrity sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw== + dependencies: + "@ethersproject/logger" "^5.7.0" + "@ethersproject/providers@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.1.tgz#9a05f00ecbac59565bf6907c8d2af8ac33303b48" @@ -217,6 +437,32 @@ bech32 "1.1.4" ws "7.4.6" +"@ethersproject/providers@5.7.2": + version "5.7.2" + resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" + integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/base64" "^5.7.0" + "@ethersproject/basex" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/networks" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/web" "^5.7.0" + bech32 "1.1.4" + ws "7.4.6" + "@ethersproject/random@5.6.0", "@ethersproject/random@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" @@ -225,6 +471,14 @@ "@ethersproject/bytes" "^5.6.0" "@ethersproject/logger" "^5.6.0" +"@ethersproject/random@5.7.0", "@ethersproject/random@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.7.0.tgz#af19dcbc2484aae078bb03656ec05df66253280c" + integrity sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/rlp@5.6.0", "@ethersproject/rlp@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" @@ -233,6 +487,14 @@ "@ethersproject/bytes" "^5.6.0" "@ethersproject/logger" "^5.6.0" +"@ethersproject/rlp@5.7.0", "@ethersproject/rlp@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.7.0.tgz#de39e4d5918b9d74d46de93af80b7685a9c21304" + integrity sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/sha2@5.6.0", "@ethersproject/sha2@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" @@ -242,6 +504,15 @@ "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" + integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + hash.js "1.1.7" + "@ethersproject/signing-key@5.6.0", "@ethersproject/signing-key@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.0.tgz#4f02e3fb09e22b71e2e1d6dc4bcb5dafa69ce042" @@ -254,6 +525,18 @@ elliptic "6.5.4" hash.js "1.1.7" +"@ethersproject/signing-key@5.7.0", "@ethersproject/signing-key@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.7.0.tgz#06b2df39411b00bc57c7c09b01d1e41cf1b16ab3" + integrity sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + bn.js "^5.2.1" + elliptic "6.5.4" + hash.js "1.1.7" + "@ethersproject/solidity@5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3" @@ -266,6 +549,18 @@ "@ethersproject/sha2" "^5.6.0" "@ethersproject/strings" "^5.6.0" +"@ethersproject/solidity@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.7.0.tgz#5e9c911d8a2acce2a5ebb48a5e2e0af20b631cb8" + integrity sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/sha2" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/strings@5.6.0", "@ethersproject/strings@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" @@ -275,6 +570,15 @@ "@ethersproject/constants" "^5.6.0" "@ethersproject/logger" "^5.6.0" +"@ethersproject/strings@5.7.0", "@ethersproject/strings@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.7.0.tgz#54c9d2a7c57ae8f1205c88a9d3a56471e14d5ed2" + integrity sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/transactions@5.6.0", "@ethersproject/transactions@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" @@ -290,6 +594,21 @@ "@ethersproject/rlp" "^5.6.0" "@ethersproject/signing-key" "^5.6.0" +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" + integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== + dependencies: + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/rlp" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + "@ethersproject/units@5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c" @@ -299,6 +618,15 @@ "@ethersproject/constants" "^5.6.0" "@ethersproject/logger" "^5.6.0" +"@ethersproject/units@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.7.0.tgz#637b563d7e14f42deeee39245275d477aae1d8b1" + integrity sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg== + dependencies: + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/constants" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/wallet@5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a" @@ -320,6 +648,27 @@ "@ethersproject/transactions" "^5.6.0" "@ethersproject/wordlists" "^5.6.0" +"@ethersproject/wallet@5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.7.0.tgz#4e5d0790d96fe21d61d38fb40324e6c7ef350b2d" + integrity sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA== + dependencies: + "@ethersproject/abstract-provider" "^5.7.0" + "@ethersproject/abstract-signer" "^5.7.0" + "@ethersproject/address" "^5.7.0" + "@ethersproject/bignumber" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/hdnode" "^5.7.0" + "@ethersproject/json-wallets" "^5.7.0" + "@ethersproject/keccak256" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/random" "^5.7.0" + "@ethersproject/signing-key" "^5.7.0" + "@ethersproject/transactions" "^5.7.0" + "@ethersproject/wordlists" "^5.7.0" + "@ethersproject/web@5.6.0", "@ethersproject/web@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" @@ -331,6 +680,17 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.0" +"@ethersproject/web@5.7.1", "@ethersproject/web@^5.7.0": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.7.1.tgz#de1f285b373149bee5928f4eb7bcb87ee5fbb4ae" + integrity sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w== + dependencies: + "@ethersproject/base64" "^5.7.0" + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@ethersproject/wordlists@5.6.0", "@ethersproject/wordlists@^5.6.0": version "5.6.0" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032" @@ -342,6 +702,17 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.0" +"@ethersproject/wordlists@5.7.0", "@ethersproject/wordlists@^5.7.0": + version "5.7.0" + resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.7.0.tgz#8fb2c07185d68c3e09eb3bfd6e779ba2774627f5" + integrity sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA== + dependencies: + "@ethersproject/bytes" "^5.7.0" + "@ethersproject/hash" "^5.7.0" + "@ethersproject/logger" "^5.7.0" + "@ethersproject/properties" "^5.7.0" + "@ethersproject/strings" "^5.7.0" + "@node-redis/client@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@node-redis/client/-/client-1.0.4.tgz#fe185750df3bcc07524f63fe8dbc8d14d22d6cbb" @@ -352,16 +723,103 @@ redis-parser "3.0.0" yallist "4.0.0" +"@offchainlabs/upgrade-executor@1.1.0-beta.0": + version "1.1.0-beta.0" + resolved "https://registry.yarnpkg.com/@offchainlabs/upgrade-executor/-/upgrade-executor-1.1.0-beta.0.tgz#c4b1375176546a18aaef01a43956abfb58250e0a" + integrity sha512-mpn6PHjH/KDDjNX0pXHEKdyv8m6DVGQiI2nGzQn0JbM1nOSHJpWx6fvfjtH7YxHJ6zBZTcsKkqGkFKDtCfoSLw== + dependencies: + "@openzeppelin/contracts" "4.7.3" + "@openzeppelin/contracts-upgradeable" "4.7.3" + +"@openzeppelin/contracts-upgradeable@4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.2.tgz#90d9e47bacfd8693bfad0ac8a394645575528d05" + integrity sha512-xgWZYaPlrEOQo3cBj97Ufiuv79SPd8Brh4GcFYhPgb6WvAq4ppz8dWKL6h+jLAK01rUqMRp/TS9AdXgAeNvCLA== + +"@openzeppelin/contracts-upgradeable@4.7.3": + version "4.7.3" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.7.3.tgz#f1d606e2827d409053f3e908ba4eb8adb1dd6995" + integrity sha512-+wuegAMaLcZnLCJIvrVUDzA9z/Wp93f0Dla/4jJvIhijRrPabjQbZe6fWiECLaJyfn5ci9fqf9vTw3xpQOad2A== + +"@openzeppelin/contracts-upgradeable@4.8.3": + version "4.8.3" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.3.tgz#6b076a7b751811b90fe3a172a7faeaa603e13a3f" + integrity sha512-SXDRl7HKpl2WDoJpn7CK/M9U4Z8gNXDHHChAKh0Iz+Wew3wu6CmFYBeie3je8V0GSXZAIYYwUktSrnW/kwVPtg== + +"@openzeppelin/contracts@4.5.0": + version "4.5.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz#3fd75d57de172b3743cdfc1206883f56430409cc" + integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA== + +"@openzeppelin/contracts@4.7.3": + version "4.7.3" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.7.3.tgz#939534757a81f8d69cc854c7692805684ff3111e" + integrity sha512-dGRS0agJzu8ybo44pCIf3xBaPQN/65AIXNgK8+4gzKd5kbvlqyxryUYVLJv7fK98Seyd2hDZzVEHSWAh0Bt1Yw== + +"@openzeppelin/contracts@4.8.3": + version "4.8.3" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.3.tgz#cbef3146bfc570849405f59cba18235da95a252a" + integrity sha512-bQHV8R9Me8IaJoJ2vPG4rXcL7seB7YVuskr4f+f5RyOStSZetwzkWtoqDMl5erkBJy0lDRUnIR2WIkPiC0GJlg== + "@openzeppelin/contracts@^4.9.3": version "4.9.3" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364" integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg== +"@openzeppelin/upgrades-core@^1.24.1": + version "1.32.3" + resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.32.3.tgz#7f92aeab6f6c7300c8fa4c1cde14253b2bd62341" + integrity sha512-v04RbrBOTRiIhfkTRfY4M34I2wIcuz+K1cUk/6duulsMXvRpM6/IPWeXh+1Xr1K+xedJi7gcS/pNSXfYhYNXIg== + dependencies: + cbor "^9.0.0" + chalk "^4.1.0" + compare-versions "^6.0.0" + debug "^4.1.1" + ethereumjs-util "^7.0.3" + minimist "^1.2.7" + proper-lockfile "^4.1.1" + solidity-ast "^0.4.51" + +"@solidity-parser/parser@^0.14.3": + version "0.14.5" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804" + integrity sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg== + dependencies: + antlr4ts "^0.5.0-alpha.4" + +"@types/bn.js@^5.1.0": + version "5.1.5" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.5.tgz#2e0dacdcce2c0f16b905d20ff87aedbc6f7b4bf0" + integrity sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A== + dependencies: + "@types/node" "*" + +"@types/node@*": + version "20.11.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.10.tgz#6c3de8974d65c362f82ee29db6b5adf4205462f9" + integrity sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg== + dependencies: + undici-types "~5.26.4" + "@types/node@^17.0.22": version "17.0.22" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw== +"@types/pbkdf2@^3.0.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.2.tgz#2dc43808e9985a2c69ff02e2d2027bd4fe33e8dc" + integrity sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew== + dependencies: + "@types/node" "*" + +"@types/secp256k1@^4.0.1": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.6.tgz#d60ba2349a51c2cbc5e816dcd831a42029d376bf" + integrity sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "21.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" @@ -374,38 +832,293 @@ dependencies: "@types/yargs-parser" "*" +"@types/yauzl@^2.9.1": + version "2.10.3" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999" + integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q== + dependencies: + "@types/node" "*" + +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + aes-js@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0= +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^4.0.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" +antlr4ts@^0.5.0-alpha.4: + version "0.5.0-alpha.4" + resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" + integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ== + +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + dependencies: + call-bind "^1.0.2" + is-array-buffer "^3.0.1" + +array.prototype.findlast@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.3.tgz#4e4b375de5adf4897fed155e2d2771564865cc3b" + integrity sha512-kcBubumjciBg4JKp5KTKtI7ec7tRefPk88yjkWJwaVKYd9QfTaxcsOxoMNKd7iBr447zCfDV0z1kOF47umv42g== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + get-intrinsic "^1.2.1" + +arraybuffer.prototype.slice@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" + integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== + dependencies: + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + is-array-buffer "^3.0.2" + is-shared-array-buffer "^1.0.2" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + +axios@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== + dependencies: + follow-redirects "^1.14.9" + form-data "^4.0.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base-x@^3.0.2: + version "3.0.9" + resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320" + integrity sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ== + dependencies: + safe-buffer "^5.0.1" + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + bech32@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +blakejs@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" + integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== + bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== +bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" + integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== + +boolbase@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +braces@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browserify-aes@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== + dependencies: + buffer-xor "^1.0.3" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.3" + inherits "^2.0.1" + safe-buffer "^5.0.1" + +bs58@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" + integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw== + dependencies: + base-x "^3.0.2" + +bs58check@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc" + integrity sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA== + dependencies: + bs58 "^4.0.0" + create-hash "^1.1.0" + safe-buffer "^5.1.2" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + +buffer-xor@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== + +buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" + integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== + dependencies: + function-bind "^1.1.2" + get-intrinsic "^1.2.1" + set-function-length "^1.1.1" + +cbor@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/cbor/-/cbor-9.0.1.tgz#b16e393d4948d44758cd54ac6151379d443b37ae" + integrity sha512-/TQOWyamDxvVIv+DY9cOLNuABkoyz8K/F3QE56539pGVYohx0+MEA1f4lChFTX79dBTBS7R1PF6ovH7G+VtBfQ== + dependencies: + nofilter "^3.1.0" + +chalk@^4.1.0, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +cheerio-select@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" + integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g== + dependencies: + boolbase "^1.0.0" + css-select "^5.1.0" + css-what "^6.1.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + +cheerio@^1.0.0-rc.11: + version "1.0.0-rc.12" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" + integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== + dependencies: + cheerio-select "^2.1.0" + dom-serializer "^2.0.0" + domhandler "^5.0.3" + domutils "^3.0.1" + htmlparser2 "^8.0.1" + parse5 "^7.0.0" + parse5-htmlparser2-tree-adapter "^7.0.0" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -432,7 +1145,175 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -elliptic@6.5.4: +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@^9.2.0, commander@^9.4.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== + +compare-versions@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a" + integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +convert-svg-core@^0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/convert-svg-core/-/convert-svg-core-0.6.4.tgz#a38ad47f32acbb229a4fa9eec9771308c2fe1443" + integrity sha512-8mS0n7otc1lljTte4z7nDhihEakKCRq4w5ivMnIGeOZuD/OV/eDZNNEgGLV1ET3p+rMbnrZnX4lAcsf14WzD5w== + dependencies: + chalk "^4.1.2" + cheerio "^1.0.0-rc.11" + commander "^9.2.0" + file-url "^3.0.0" + get-stdin "^8.0.0" + glob "^8.0.1" + lodash.omit "^4.5.0" + lodash.pick "^4.4.0" + pollock "^0.2.0" + puppeteer "^13.7.0" + tmp "^0.2.1" + +convert-svg-to-png@^0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/convert-svg-to-png/-/convert-svg-to-png-0.6.4.tgz#de0f5d46042639cdfe4020b492b8b0a3c0743b4e" + integrity sha512-zHNTuVedkyuhMl+f+HMm2L7+TKDYCKFAqAmDqUr0dN7/xtgYe76PPAydjlFzeLbzEpGtEfhaA15q+ejpLaVo3g== + dependencies: + convert-svg-core "^0.6.4" + +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + md5.js "^1.3.4" + ripemd160 "^2.0.1" + sha.js "^2.4.0" + +create-hmac@^1.1.4, create-hmac@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-fetch@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== + dependencies: + node-fetch "2.6.7" + +cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== + dependencies: + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" + +css-what@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + +debug@4, debug@4.3.4, debug@^4.1.1, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +define-data-property@^1.0.1, define-data-property@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" + integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== + dependencies: + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + +define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== + dependencies: + define-data-property "^1.0.1" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +devtools-protocol@0.0.981744: + version "0.0.981744" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.981744.tgz#9960da0370284577d46c28979a0b32651022bacf" + integrity sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg== + +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + +domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + +domutils@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" + integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + +elliptic@6.5.4, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -450,11 +1331,125 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +entities@^4.2.0, entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + +es-abstract@^1.22.1: + version "1.22.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" + integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== + dependencies: + array-buffer-byte-length "^1.0.0" + arraybuffer.prototype.slice "^1.0.2" + available-typed-arrays "^1.0.5" + call-bind "^1.0.5" + es-set-tostringtag "^2.0.1" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.2" + get-symbol-description "^1.0.0" + globalthis "^1.0.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" + is-callable "^1.2.7" + is-negative-zero "^2.0.2" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + is-string "^1.0.7" + is-typed-array "^1.1.12" + is-weakref "^1.0.2" + object-inspect "^1.13.1" + object-keys "^1.1.1" + object.assign "^4.1.4" + regexp.prototype.flags "^1.5.1" + safe-array-concat "^1.0.1" + safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.8" + string.prototype.trimend "^1.0.7" + string.prototype.trimstart "^1.0.7" + typed-array-buffer "^1.0.0" + typed-array-byte-length "^1.0.0" + typed-array-byte-offset "^1.0.0" + typed-array-length "^1.0.4" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.13" + +es-set-tostringtag@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" + integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== + dependencies: + get-intrinsic "^1.2.2" + has-tostringtag "^1.0.0" + hasown "^2.0.0" + +es-shim-unscopables@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" + integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + dependencies: + hasown "^2.0.0" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +ethereum-cryptography@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191" + integrity sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ== + dependencies: + "@types/pbkdf2" "^3.0.0" + "@types/secp256k1" "^4.0.1" + blakejs "^1.1.0" + browserify-aes "^1.2.0" + bs58check "^2.1.2" + create-hash "^1.2.0" + create-hmac "^1.1.7" + hash.js "^1.1.7" + keccak "^3.0.0" + pbkdf2 "^3.0.17" + randombytes "^2.1.0" + safe-buffer "^5.1.2" + scrypt-js "^3.0.0" + secp256k1 "^4.0.1" + setimmediate "^1.0.5" + +ethereumjs-util@^7.0.3: + version "7.1.5" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" + integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== + dependencies: + "@types/bn.js" "^5.1.0" + bn.js "^5.1.2" + create-hash "^1.1.2" + ethereum-cryptography "^0.1.3" + rlp "^2.2.4" + ethers@^5.6.1: version "5.6.1" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.1.tgz#a56cd67f1595b745dc3dde0ccf2b5de53a41a6d0" @@ -491,6 +1486,156 @@ ethers@^5.6.1: "@ethersproject/web" "5.6.0" "@ethersproject/wordlists" "5.6.0" +ethers@^5.6.9: + version "5.7.2" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" + integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== + dependencies: + "@ethersproject/abi" "5.7.0" + "@ethersproject/abstract-provider" "5.7.0" + "@ethersproject/abstract-signer" "5.7.0" + "@ethersproject/address" "5.7.0" + "@ethersproject/base64" "5.7.0" + "@ethersproject/basex" "5.7.0" + "@ethersproject/bignumber" "5.7.0" + "@ethersproject/bytes" "5.7.0" + "@ethersproject/constants" "5.7.0" + "@ethersproject/contracts" "5.7.0" + "@ethersproject/hash" "5.7.0" + "@ethersproject/hdnode" "5.7.0" + "@ethersproject/json-wallets" "5.7.0" + "@ethersproject/keccak256" "5.7.0" + "@ethersproject/logger" "5.7.0" + "@ethersproject/networks" "5.7.1" + "@ethersproject/pbkdf2" "5.7.0" + "@ethersproject/properties" "5.7.0" + "@ethersproject/providers" "5.7.2" + "@ethersproject/random" "5.7.0" + "@ethersproject/rlp" "5.7.0" + "@ethersproject/sha2" "5.7.0" + "@ethersproject/signing-key" "5.7.0" + "@ethersproject/solidity" "5.7.0" + "@ethersproject/strings" "5.7.0" + "@ethersproject/transactions" "5.7.0" + "@ethersproject/units" "5.7.0" + "@ethersproject/wallet" "5.7.0" + "@ethersproject/web" "5.7.1" + "@ethersproject/wordlists" "5.7.0" + +evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== + dependencies: + md5.js "^1.3.4" + safe-buffer "^5.1.1" + +extract-zip@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + +file-url@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz#247a586a746ce9f7a8ed05560290968afc262a77" + integrity sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA== + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + +follow-redirects@^1.14.9: + version "1.15.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" + integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== + +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +function.prototype.name@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" + +functions-have-names@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + generic-pool@3.8.2: version "3.8.2" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9" @@ -501,7 +1646,122 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" + integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== + dependencies: + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + +get-stdin@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +glob@^7.1.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^8.0.1: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + +globalthis@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + +graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +has-bigints@^1.0.1, has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" + integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== + dependencies: + get-intrinsic "^1.2.2" + +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + +has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + dependencies: + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== @@ -509,6 +1769,13 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hasown@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" + integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + dependencies: + function-bind "^1.1.2" + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -518,26 +1785,272 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" +htmlparser2@^8.0.1: + version "8.0.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + entities "^4.4.0" + +https-proxy-agent@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -inherits@^2.0.3, inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +internal-slot@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" + integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== + dependencies: + get-intrinsic "^1.2.2" + hasown "^2.0.0" + side-channel "^1.0.4" + +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + is-typed-array "^1.1.10" + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-date-object@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-negative-zero@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: + version "1.1.12" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" + integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== + dependencies: + which-typed-array "^1.1.11" + +is-weakref@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +js-graph-algorithms@^1.0.18: + version "1.0.18" + resolved "https://registry.yarnpkg.com/js-graph-algorithms/-/js-graph-algorithms-1.0.18.tgz#f96ec87bf194f5c0a31365fa0e1d07b7b962d891" + integrity sha512-Gu1wtWzXBzGeye/j9BuyplGHscwqKRZodp/0M1vyBc19RJpblSwKGu099KwwaTx9cRIV+Qupk8xUMfEiGfFqSA== + js-sha3@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +keccak@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" + integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + +klaw@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-4.1.0.tgz#5df608067d8cb62bbfb24374f8e5d956323338f3" + integrity sha512-1zGZ9MF9H22UnkpVeuaGKOjfA2t6WrfdrJmGjy16ykcjnKQDmHVX+KI477rpbGevz/5FD4MC3xf1oxylBgcaQw== + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.omit@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" + integrity sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg== + +lodash.pick@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" + integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q== + +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +micromatch@^4.0.2: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -548,6 +2061,178 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= +minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.6, minimist@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +mkdirp-classic@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-addon-api@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" + integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== + +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" + +node-gyp-build@^4.2.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd" + integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og== + +nofilter@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66" + integrity sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g== + +nth-check@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== + dependencies: + boolbase "^1.0.0" + +object-inspect@^1.13.1, object-inspect@^1.9.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + +object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.4: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + has-symbols "^1.0.3" + object-keys "^1.1.1" + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parse5-htmlparser2-tree-adapter@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1" + integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g== + dependencies: + domhandler "^5.0.2" + parse5 "^7.0.0" + +parse5@^7.0.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + +patch-package@^6.4.7: + version "6.5.1" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621" + integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + cross-spawn "^6.0.5" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + is-ci "^2.0.0" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^5.6.0" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^1.10.2" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== + path@^0.12.7: version "0.12.7" resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f" @@ -556,11 +2241,105 @@ path@^0.12.7: process "^0.11.1" util "^0.10.3" +pbkdf2@^3.0.17: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== + dependencies: + create-hash "^1.1.2" + create-hmac "^1.1.4" + ripemd160 "^2.0.1" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + +picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pkg-dir@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pollock@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/pollock/-/pollock-0.2.1.tgz#01273ae3542511492d07f1c10fa53f149b37c6ad" + integrity sha512-2Xy6LImSXm0ANKv9BKSVuCa6Z4ACbK7oUrl9gtUgqLkekL7n9C0mlWsOGYYuGbCG8xT0x3Q4F31C3ZMyVQjwsg== + process@^0.11.1: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= +progress@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +proper-lockfile@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" + integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== + dependencies: + graceful-fs "^4.2.4" + retry "^0.12.0" + signal-exit "^3.0.2" + +proxy-from-env@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +puppeteer@^13.7.0: + version "13.7.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.7.0.tgz#18e16f83e397cf02f7a0804c67c1603d381cfb0b" + integrity sha512-U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA== + dependencies: + cross-fetch "3.1.5" + debug "4.3.4" + devtools-protocol "0.0.981744" + extract-zip "2.0.1" + https-proxy-agent "5.0.1" + pkg-dir "4.2.0" + progress "2.0.3" + proxy-from-env "1.1.0" + rimraf "3.0.2" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + ws "8.5.0" + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + redis-errors@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad" @@ -573,16 +2352,183 @@ redis-parser@3.0.0: dependencies: redis-errors "^1.0.0" +regexp.prototype.flags@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" + integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + set-function-name "^2.0.0" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -scrypt-js@3.0.1: +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +rimraf@3.0.2, rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +rlp@^2.2.4: + version "2.2.7" + resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.7.tgz#33f31c4afac81124ac4b283e2bd4d9720b30beaf" + integrity sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ== + dependencies: + bn.js "^5.2.0" + +safe-array-concat@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" + integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== + dependencies: + call-bind "^1.0.5" + get-intrinsic "^1.2.2" + has-symbols "^1.0.3" + isarray "^2.0.5" + +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-regex-test@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5" + integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ== + dependencies: + call-bind "^1.0.5" + get-intrinsic "^1.2.2" + is-regex "^1.1.4" + +scrypt-js@3.0.1, scrypt-js@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312" integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA== +secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== + dependencies: + elliptic "^6.5.4" + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + +semver@^5.5.0, semver@^5.6.0: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + +set-function-length@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1" + integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w== + dependencies: + define-data-property "^1.1.1" + function-bind "^1.1.2" + get-intrinsic "^1.2.2" + gopd "^1.0.1" + has-property-descriptors "^1.0.1" + +set-function-name@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" + integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== + dependencies: + define-data-property "^1.0.1" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.0" + +setimmediate@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.2: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + +sol2uml@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/sol2uml/-/sol2uml-2.2.0.tgz#145b1b85cc2c5d466d596f3426aae4dd4dc946f2" + integrity sha512-JMBvn3ZMT/1egoZjheM4Mh9gQudrlVjFZ1VS0gjQ/eluITT08U6V438Jyku28OuXz42aXNbGS80JuRZo0J7pLg== + dependencies: + "@aduh95/viz.js" "^3.7.0" + "@solidity-parser/parser" "^0.14.3" + axios "^0.27.2" + commander "^9.4.0" + convert-svg-to-png "^0.6.4" + debug "^4.3.4" + ethers "^5.6.9" + js-graph-algorithms "^1.0.18" + klaw "^4.0.1" + +solidity-ast@^0.4.51: + version "0.4.55" + resolved "https://registry.yarnpkg.com/solidity-ast/-/solidity-ast-0.4.55.tgz#00b685e6eefb2e8dfb67df1fe0afbe3b3bfb4b28" + integrity sha512-qeEU/r/K+V5lrAw8iswf2/yfWAnSGs3WKPHI+zAFKFjX0dIBVXEU/swQ8eJQYHf6PJWUZFO2uWV4V1wEOkeQbA== + dependencies: + array.prototype.findlast "^1.2.2" + string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -592,6 +2538,40 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string.prototype.trim@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" + integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +string.prototype.trimend@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" + integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +string.prototype.trimstart@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" + integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -599,11 +2579,142 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +tar-fs@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +through@^2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +tmp@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +typed-array-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" + integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-typed-array "^1.1.10" + +typed-array-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" + integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" + integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-length@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" + integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + is-typed-array "^1.1.9" + typescript@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== + dependencies: + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" + +unbzip2-stream@1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + +util-deprecate@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + util@^0.10.3: version "0.10.4" resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" @@ -611,6 +2722,48 @@ util@^0.10.3: dependencies: inherits "2.0.3" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-typed-array@^1.1.11, which-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" + integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.4" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -620,11 +2773,21 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + ws@7.4.6: version "7.4.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -635,6 +2798,11 @@ yallist@4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + yargs-parser@^21.0.0: version "21.0.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" @@ -652,3 +2820,11 @@ yargs@^17.4.0: string-width "^4.2.3" y18n "^5.0.5" yargs-parser "^21.0.0" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" From e18889fc3be2c61b919418bf9c0f1dc725e5d9ca Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 00:00:24 +0900 Subject: [PATCH 070/180] feat: bridge token from l1 if token brdige exists --- scripts/ethcommands.ts | 62 ++++++++++++++++++++++++++++++++++++++++-- test-node.bash | 5 ++++ 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 3d782333..a790650a 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -2,6 +2,7 @@ import { runStress } from "./stress"; import { ContractFactory, ethers, Wallet } from "ethers"; import * as consts from "./consts"; import { namedAccount, namedAddress } from "./accounts"; +import * as L1GatewayRouter from "@arbitrum/token-bridge-contracts/build/contracts/contracts/tokenbridge/ethereum/gateway/L1GatewayRouter.sol/L1GatewayRouter.json"; import * as ERC20PresetFixedSupplyArtifact from "@openzeppelin/contracts/build/contracts/ERC20PresetFixedSupply.json"; import * as ERC20 from "@openzeppelin/contracts/build/contracts/ERC20.json"; import * as fs from "fs"; @@ -185,22 +186,77 @@ export const bridgeNativeTokenToL3Command = { export const createERC20Command = { command: "create-erc20", - describe: "creates simple ERC20 on L2", + describe: "creates simple ERC20 on L1", builder: { deployer: { string: true, describe: "account (see general help)", - default: "user_l2user", + default: "user_l1user", }, mintTo: { string: true, describe: "account (see general help)", - default: "user_l2user", + default: "user_l1user", }, }, handler: async (argv: any) => { console.log("create-erc20"); + if (fs.existsSync(path.join(consts.sdkdatapath, "l1l2_network.json"))) { + // l1-l2 token bridge exists, deploy token on l1 and bridge to l2 + const l1l2tokenbridge = JSON.parse( + fs + .readFileSync(path.join(consts.sdkdatapath, "l1l2_network.json")) + .toString() + ); + + const l1provider = new ethers.providers.WebSocketProvider(argv.l1url); + const l2provider = new ethers.providers.WebSocketProvider(argv.l2url); + + const deployerWallet = new Wallet( + ethers.utils.sha256(ethers.utils.toUtf8Bytes(argv.deployer)), + l1provider + ); + + const tokenFactory = new ContractFactory( + ERC20PresetFixedSupplyArtifact.abi, + ERC20PresetFixedSupplyArtifact.bytecode, + deployerWallet + ); + const token = await tokenFactory.deploy("AppTestToken", "APP", ethers.utils.parseEther("1000000000"), deployerWallet.address); + await token.deployTransaction.wait(); + console.log("Contract deployed at L1 address:", token.address); + await (await token.functions.transfer(namedAccount(argv.mintTo).address, ethers.utils.parseEther("100000000"))).wait(); + + const l1GatewayRouter = new ethers.Contract(l1l2tokenbridge.l2Network.tokenBridge.l1GatewayRouter, L1GatewayRouter.abi, deployerWallet); + await (await token.functions.approve(l1l2tokenbridge.l2Network.tokenBridge.l1ERC20Gateway, ethers.constants.MaxUint256)).wait(); + await (await l1GatewayRouter.functions.outboundTransfer( + token.address, namedAccount(argv.mintTo).address, ethers.utils.parseEther("100000000"), 100000000, 1000000000, "0x000000000000000000000000000000000000000000000000000fffffffffff0000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000", { + value: ethers.utils.parseEther("1"), + } + )).wait(); + + const tokenL2Addr = (await l1GatewayRouter.functions.calculateL2TokenAddress(token.address))[0]; + // wait for l2 token to be deployed + for (let i = 0; i < 60; i++) { + if (await l2provider.getCode(tokenL2Addr) === "0x") { + await new Promise(f => setTimeout(f, 1000)); + } else { + break; + } + } + if (await l2provider.getCode(tokenL2Addr) === "0x") { + throw new Error("Failed to bridge token to L2"); + } + + console.log("Contract deployed at L2 address:", tokenL2Addr); + + l1provider.destroy(); + l2provider.destroy(); + return; + } + + // no l1-l2 token bridge, deploy token on l2 directly argv.provider = new ethers.providers.WebSocketProvider(argv.l2url); const deployerWallet = new Wallet( ethers.utils.sha256(ethers.utils.toUtf8Bytes(argv.deployer)), diff --git a/test-node.bash b/test-node.bash index 53427e48..02fa6252 100755 --- a/test-node.bash +++ b/test-node.bash @@ -359,6 +359,7 @@ if $force_init; then if $tokenbridge; then echo == Deploying L1-L2 token bridge + sleep 10 # no idea why this sleep is needed but without it the deploy fails randomly rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` docker compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l1l2_network.json" @@ -371,7 +372,11 @@ if $force_init; then docker compose run scripts send-l2 --ethamount 1000 --to l3sequencer --wait echo == Funding l2 deployers + docker compose run scripts send-l1 --ethamount 100 --to user_token_bridge_deployer --wait docker compose run scripts send-l2 --ethamount 100 --to user_token_bridge_deployer --wait + + echo == Funding token deployer + docker compose run scripts send-l1 --ethamount 100 --to user_fee_token_deployer --wait docker compose run scripts send-l2 --ethamount 100 --to user_fee_token_deployer --wait echo == create l2 traffic From 723ebf4987fc79a558973b81655d47d665b49a5b Mon Sep 17 00:00:00 2001 From: Henry <11198460+godzillaba@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:19:34 -0500 Subject: [PATCH 071/180] registers l1 to l2 weth gateway --- scripts/accounts.ts | 19 +++++++++++++++++++ scripts/index.ts | 2 ++ test-node.bash | 3 ++- tokenbridge/Dockerfile | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/scripts/accounts.ts b/scripts/accounts.ts index ae3cdf6e..f4974baa 100644 --- a/scripts/accounts.ts +++ b/scripts/accounts.ts @@ -95,6 +95,10 @@ async function handlePrintAddress(argv: any, threadId: number) { console.log(namedAddress(argv.account, threadId)); } +async function handlePrintPrivateKey(argv: any, threadId: number) { + console.log(namedAccount(argv.account, threadId).privateKey); +} + export const printAddressCommand = { command: "print-address", describe: "prints the requested address", @@ -110,6 +114,21 @@ export const printAddressCommand = { }, }; +export const printPrivateKeyCommand = { + command: "print-private-key", + describe: "prints the requested private key", + builder: { + account: { + string: true, + describe: "address (see general help)", + default: "funnel", + }, + }, + handler: async (argv: any) => { + await runStress(argv, handlePrintPrivateKey); + }, +} + export const writeAccountsCommand = { command: "write-accounts", describe: "writes wallet files", diff --git a/scripts/index.ts b/scripts/index.ts index c39406ed..9f25c6e2 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -7,6 +7,7 @@ import { printAddressCommand, namedAccountHelpString, writeAccountsCommand, + printPrivateKeyCommand, } from "./accounts"; import { bridgeFundsCommand, @@ -45,6 +46,7 @@ async function main() { .command(writePrysmCommand) .command(writeAccountsCommand) .command(printAddressCommand) + .command(printPrivateKeyCommand) .command(redisReadCommand) .command(redisInitCommand) .strict() diff --git a/test-node.bash b/test-node.bash index 407d03bc..b74fb659 100755 --- a/test-node.bash +++ b/test-node.bash @@ -360,7 +360,8 @@ if $force_init; then if $tokenbridge; then echo == Deploying L1-L2 token bridge rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker compose run -e ROLLUP_OWNER=$sequenceraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge + sequencerKey=`docker compose run scripts print-private-key --account sequencer | tail -n 1 | tr -d '\r\n'` + docker compose run -e ROLLUP_OWNER_KEY=$sequencerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker compose run --entrypoint sh tokenbridge -c "cat network.json" echo fi diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 2b952168..23f21687 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone -b feat-registry https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone -b main https://github.com/godzillaba/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From a59e1b74b9414bb937ab0b190f96f66f11b09c5b Mon Sep 17 00:00:00 2001 From: Henry <11198460+godzillaba@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:25:38 -0500 Subject: [PATCH 072/180] registers l2 to l3 weth gateway with overridden l2 weth --- test-node.bash | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test-node.bash b/test-node.bash index b74fb659..501d9e0f 100755 --- a/test-node.bash +++ b/test-node.bash @@ -362,7 +362,7 @@ if $force_init; then rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` sequencerKey=`docker compose run scripts print-private-key --account sequencer | tail -n 1 | tr -d '\r\n'` docker compose run -e ROLLUP_OWNER_KEY=$sequencerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json" + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l1l2_network.json" echo fi @@ -390,6 +390,7 @@ if $force_init; then echo == Deploying L3 l3owneraddress=`docker compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` + l3ownerkey=`docker compose run scripts print-private-key --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" @@ -401,8 +402,14 @@ if $force_init; then echo == Deploying L2-L3 token bridge deployer_key=`printf "%s" "user_token_bridge_deployer" | openssl dgst -sha256 | sed 's/^.*= //'` rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_l3_chain_info.json | tail -n 1 | tr -d '\r\n'"` - docker compose run -e ROLLUP_OWNER=$l3owneraddress -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json" + l2Weth="" + if $tokenbridge; then + # we deployed an L1 L2 token bridge + # we need to pull out the L2 WETH address and pass it as an override to the L2 L3 token bridge deployment + l2Weth=`docker compose run --entrypoint sh tokenbridge -c "cat /workspace/l1l2_network.json" | jq -r '.l2Network.tokenBridge.l2Weth'` + fi + docker compose run -e L1_WETH_OVERRIDE=$l2Weth -e ROLLUP_OWNER_KEY=$l3ownerkey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l2l3_network.json" echo fi From 5593b894bdd45d4fea33275a554fb78e0bc051b0 Mon Sep 17 00:00:00 2001 From: Henry <11198460+godzillaba@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:26:57 -0500 Subject: [PATCH 073/180] rename l1 to parent --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 501d9e0f..1e951cfe 100755 --- a/test-node.bash +++ b/test-node.bash @@ -408,7 +408,7 @@ if $force_init; then # we need to pull out the L2 WETH address and pass it as an override to the L2 L3 token bridge deployment l2Weth=`docker compose run --entrypoint sh tokenbridge -c "cat /workspace/l1l2_network.json" | jq -r '.l2Network.tokenBridge.l2Weth'` fi - docker compose run -e L1_WETH_OVERRIDE=$l2Weth -e ROLLUP_OWNER_KEY=$l3ownerkey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge + docker compose run -e PARENT_WETH_OVERRIDE=$l2Weth -e ROLLUP_OWNER_KEY=$l3ownerkey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l2l3_network.json" echo fi From 8108a6fd17bba3e0b372e9962501b76dcbd6be05 Mon Sep 17 00:00:00 2001 From: Henry <11198460+godzillaba@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:10:56 -0500 Subject: [PATCH 074/180] add sdk-data volume to sequencer --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index e2ade352..cb9d901b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -160,6 +160,7 @@ services: - "seqdata:/home/user/.arbitrum/local/nitro" - "l1keystore:/home/user/l1keystore" - "config:/config" + - "sdk-data:/sdk-data" command: --conf.file /config/sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642 --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain * depends_on: - geth From 7a5fefe4dfe31601453b24a2be4868c5e176b563 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 11:34:26 +0800 Subject: [PATCH 075/180] chore: switch back to ocl repo --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 23f21687..199534c3 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 chromium build-essential WORKDIR /workspace -RUN git clone -b main https://github.com/godzillaba/token-bridge-contracts.git ./ +RUN git clone -b reg-weth-gw https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From 8b9950b75de75545bbfa72a9a7be8ae39b4a53a8 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 12:46:07 +0900 Subject: [PATCH 076/180] chore: remove default --- scripts/ethcommands.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index a790650a..bc5a1234 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -190,13 +190,11 @@ export const createERC20Command = { builder: { deployer: { string: true, - describe: "account (see general help)", - default: "user_l1user", + describe: "account (see general help)" }, mintTo: { string: true, describe: "account (see general help)", - default: "user_l1user", }, }, handler: async (argv: any) => { From f1d090beb64ded1c58747196020041f2ae66eab3 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 12:50:46 +0900 Subject: [PATCH 077/180] chore: use bridgeable arg --- scripts/ethcommands.ts | 10 +++++++--- test-node.bash | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index bc5a1234..05acbb68 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -186,7 +186,7 @@ export const bridgeNativeTokenToL3Command = { export const createERC20Command = { command: "create-erc20", - describe: "creates simple ERC20 on L1", + describe: "creates simple ERC20 on L2", builder: { deployer: { string: true, @@ -196,12 +196,16 @@ export const createERC20Command = { string: true, describe: "account (see general help)", }, + bridgeable: { + boolean: true, + describe: "if true, deploy on L1 and bridge to L2", + }, }, handler: async (argv: any) => { console.log("create-erc20"); - if (fs.existsSync(path.join(consts.sdkdatapath, "l1l2_network.json"))) { - // l1-l2 token bridge exists, deploy token on l1 and bridge to l2 + if (argv.bridgeable) { + // deploy token on l1 and bridge to l2 const l1l2tokenbridge = JSON.parse( fs .readFileSync(path.join(consts.sdkdatapath, "l1l2_network.json")) diff --git a/test-node.bash b/test-node.bash index 09fa9ace..a3167a2f 100755 --- a/test-node.bash +++ b/test-node.bash @@ -389,7 +389,7 @@ if $force_init; then if $l3_custom_fee_token; then echo == Deploying custom fee token - nativeTokenAddress=`docker compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer | tail -n 1 | awk '{ print $NF }'` + nativeTokenAddress=`docker compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer --bridgeable $tokenbridge | tail -n 1 | awk '{ print $NF }'` EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" fi From 16202b80c278144c8ff98cafd1e322be0484e3ea Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 12:00:33 +0800 Subject: [PATCH 078/180] chore: clean up path --- test-node.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-node.bash b/test-node.bash index a3167a2f..8926f410 100755 --- a/test-node.bash +++ b/test-node.bash @@ -363,7 +363,7 @@ if $force_init; then rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` sequencerKey=`docker compose run scripts print-private-key --account sequencer | tail -n 1 | tr -d '\r\n'` docker compose run -e ROLLUP_OWNER_KEY=$sequencerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l1l2_network.json" + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json l1l2_network.json" echo fi @@ -411,10 +411,10 @@ if $force_init; then if $tokenbridge; then # we deployed an L1 L2 token bridge # we need to pull out the L2 WETH address and pass it as an override to the L2 L3 token bridge deployment - l2Weth=`docker compose run --entrypoint sh tokenbridge -c "cat /workspace/l1l2_network.json" | jq -r '.l2Network.tokenBridge.l2Weth'` + l2Weth=`docker compose run --entrypoint sh tokenbridge -c "cat l1l2_network.json" | jq -r '.l2Network.tokenBridge.l2Weth'` fi docker compose run -e PARENT_WETH_OVERRIDE=$l2Weth -e ROLLUP_OWNER_KEY=$l3ownerkey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_RPC=http://sequencer:8547 -e PARENT_KEY=$deployer_key -e CHILD_RPC=http://l3node:3347 -e CHILD_KEY=$deployer_key tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json /workspace/l2l3_network.json" + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json l2l3_network.json" echo fi From 947e1e59bf09813e19ea6f29949d42c78872b465 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 13:02:55 +0900 Subject: [PATCH 079/180] chore: rename to tokenbridge-data --- docker-compose.yaml | 8 ++++---- scripts/consts.ts | 2 +- scripts/ethcommands.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index cb9d901b..b84101e1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -160,7 +160,7 @@ services: - "seqdata:/home/user/.arbitrum/local/nitro" - "l1keystore:/home/user/l1keystore" - "config:/config" - - "sdk-data:/sdk-data" + - "tokenbridge-data:/tokenbridge-data" command: --conf.file /config/sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642 --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain * depends_on: - geth @@ -313,7 +313,7 @@ services: volumes: - "l1keystore:/home/user/l1keystore" - "config:/config" - - "sdk-data:/sdk-data" + - "tokenbridge-data:/tokenbridge-data" relay: pid: host @@ -333,7 +333,7 @@ services: - ARB_URL=http://sequencer:8547 - ETH_URL=http://geth:8545 volumes: - - "sdk-data:/workspace" + - "tokenbridge-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock volumes: @@ -351,4 +351,4 @@ volumes: poster-data-c: config: postgres-data: - sdk-data: + tokenbridge-data: diff --git a/scripts/consts.ts b/scripts/consts.ts index 8d7abc78..ff322260 100644 --- a/scripts/consts.ts +++ b/scripts/consts.ts @@ -1,7 +1,7 @@ export const l1keystore = "/home/user/l1keystore"; export const l1passphrase = "passphrase"; export const configpath = "/config"; -export const sdkdatapath = "/sdk-data"; +export const tokenbridgedatapath = "/tokenbridge-data"; // Not secure. Do not use for production purposes export const l1mnemonic = "indoor dish desk flag debris potato excuse depart ticket judge file exit"; diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 05acbb68..00fdbb15 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -208,7 +208,7 @@ export const createERC20Command = { // deploy token on l1 and bridge to l2 const l1l2tokenbridge = JSON.parse( fs - .readFileSync(path.join(consts.sdkdatapath, "l1l2_network.json")) + .readFileSync(path.join(consts.tokenbridgedatapath, "l1l2_network.json")) .toString() ); From 12076a0d2a9d0c44a86bad45f54bd5379d08609a Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Wed, 31 Jan 2024 13:47:47 +0800 Subject: [PATCH 080/180] Update L2 chain config --- scripts/config.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index 98915a1f..cb4e11d8 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -357,9 +357,13 @@ function writeL2ChainConfig(argv: any) { "DataAvailabilityCommittee": false, "InitialArbOSVersion": 11, "InitialChainOwner": argv.l2owner, - "GenesisBlockNum": 0 + "GenesisBlockNum": 0, + "EnableEspresso": false, } } + if (argv.espresso) { + l2ChainConfig.arbitrum.EnableEspresso = true + } const l2ChainConfigJSON = JSON.stringify(l2ChainConfig) fs.writeFileSync(path.join(consts.configpath, "l2_chain_config.json"), l2ChainConfigJSON) } From 0fa46c6f99437156d670c94fb919f5ec6e506f24 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 20:00:41 +0900 Subject: [PATCH 081/180] fix: nonce race --- scripts/accounts.ts | 5 ++++- test-node.bash | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/accounts.ts b/scripts/accounts.ts index f4974baa..73de095a 100644 --- a/scripts/accounts.ts +++ b/scripts/accounts.ts @@ -5,7 +5,7 @@ import * as crypto from "crypto"; import { runStress } from "./stress"; const path = require("path"); -const specialAccounts = 5; +const specialAccounts = 6; async function writeAccounts() { for (let i = 0; i < specialAccounts; i++) { @@ -44,6 +44,9 @@ export function namedAccount( if (name == "l3sequencer") { return specialAccount(4); } + if (name == "l2owner") { + return specialAccount(5); + } if (name.startsWith("user_")) { return new ethers.Wallet( ethers.utils.sha256(ethers.utils.toUtf8Bytes(name)) diff --git a/test-node.bash b/test-node.bash index 8926f410..d638fcf6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -324,9 +324,10 @@ if $force_init; then docker compose up --wait geth fi - echo == Funding validator and sequencer + echo == Funding validator, sequencer and l2owner docker compose run scripts send-l1 --ethamount 1000 --to validator --wait docker compose run scripts send-l1 --ethamount 1000 --to sequencer --wait + docker compose run scripts send-l1 --ethamount 1000 --to l2owner --wait echo == create l1 traffic docker compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait @@ -336,8 +337,9 @@ if $force_init; then docker compose run scripts write-l2-chain-config sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` + l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` - docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $sequenceraddress --l1DeployAccount $sequenceraddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json + docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then @@ -361,8 +363,8 @@ if $force_init; then echo == Deploying L1-L2 token bridge sleep 10 # no idea why this sleep is needed but without it the deploy fails randomly rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` - sequencerKey=`docker compose run scripts print-private-key --account sequencer | tail -n 1 | tr -d '\r\n'` - docker compose run -e ROLLUP_OWNER_KEY=$sequencerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge + l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` + docker compose run -e ROLLUP_OWNER_KEY=$l2ownerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json l1l2_network.json" echo fi From 2dab4fd1d605d583668db9f0c080f5995f339634 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 31 Jan 2024 20:03:50 +0900 Subject: [PATCH 082/180] docs: list named account for troubleshooting --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 0970b251..45665ca8 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,24 @@ For help and further scripts, see: ./test-node.bash script --help ``` +## Named accounts + +```bash +./test-node.bash script print-address --account sequencer +``` +``` +sequencer: 0xe2148eE53c0755215Df69b2616E552154EdC584f +validator: 0x6A568afe0f82d34759347bb36F14A6bB171d2CBe +l2owner: 0x5E1497dD1f08C87b2d8FE23e9AAB6c1De833D927 +l3owner: 0x863c904166E801527125D8672442D736194A3362 +l3sequencer: 0x3E6134aAD4C4d422FF2A4391Dc315c4DDf98D1a5 +user_l1user: 0x058E6C774025ade66153C65672219191c72c7095 +user_token_bridge_deployer: 0x3EaCb30f025630857aDffac9B2366F953eFE4F98 +user_fee_token_deployer: 0x2AC5278D230f88B481bBE4A94751d7188ef48Ca2 +``` + +While not a named account, 0x3f1eae7d46d88f08fc2f8ed27fcb2ab183eb2d0e is funded on all test chains. + ## Contact Discord - [Arbitrum](https://discord.com/invite/5KE54JwyTs) From a1e1cbbbdacb37d59dcd2425f6e6165862fdf13a Mon Sep 17 00:00:00 2001 From: gzeon Date: Fri, 2 Feb 2024 02:06:07 +0900 Subject: [PATCH 083/180] chore: also localNetwork.json --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index d638fcf6..4a778d27 100755 --- a/test-node.bash +++ b/test-node.bash @@ -365,7 +365,7 @@ if $force_init; then rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` docker compose run -e ROLLUP_OWNER_KEY=$l2ownerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge - docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json l1l2_network.json" + docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json l1l2_network.json && cp network.json localNetwork.json" echo fi From 6dd7c82621fbce00aefca610454e0fe3561824b0 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 2 Feb 2024 10:19:37 -0700 Subject: [PATCH 084/180] accounts documentation --- scripts/accounts.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/accounts.ts b/scripts/accounts.ts index 73de095a..20c1cbbe 100644 --- a/scripts/accounts.ts +++ b/scripts/accounts.ts @@ -85,10 +85,11 @@ export function namedAddress( export const namedAccountHelpString = "Valid account names:\n" + - " funnel | sequencer | validator - known keys\n" + - " user_[Alphanumeric] - key will be generated from username\n" + - " threaduser_[Alphanumeric] - same as user_[Alphanumeric]_thread_[thread-id]\n" + - " key_0x[full private key] - user with specified private key\n" + + " funnel | sequencer | validator | l2owner - known keys used by l2\n" + + " l3owner | l3sequencer - known keys used by l3\n" + + " user_[Alphanumeric] - key will be generated from username\n" + + " threaduser_[Alphanumeric] - same as user_[Alphanumeric]_thread_[thread-id]\n" + + " key_0x[full private key] - user with specified private key\n" + "\n" + "Valid addresses: any account name, or\n" + " address_0x[full eth address]\n" + @@ -123,7 +124,7 @@ export const printPrivateKeyCommand = { builder: { account: { string: true, - describe: "address (see general help)", + describe: "account (see general help)", default: "funnel", }, }, From 4acf14304d740023593de445d10a8c165b6baffc Mon Sep 17 00:00:00 2001 From: gzeon Date: Mon, 5 Feb 2024 23:17:22 +0900 Subject: [PATCH 085/180] perf: remove chrome --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 199534c3..1599c0c9 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-bullseye-slim RUN apt-get update && \ - apt-get install -y git docker.io python3 chromium build-essential + apt-get install -y git docker.io python3 build-essential WORKDIR /workspace RUN git clone -b reg-weth-gw https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install From 65c135a79ce5c68e76f85a6acf4f2ce56830552b Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 6 Feb 2024 00:35:13 +0900 Subject: [PATCH 086/180] chore: switch token-bridge-contracts main --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 1599c0c9..344e537d 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential WORKDIR /workspace -RUN git clone -b reg-weth-gw https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From ed8331d6f1dad954f19ad9818b10333553e46609 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 6 Feb 2024 02:44:18 +0900 Subject: [PATCH 087/180] perf: use slim image --- scripts/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index e9b91b86..c5b7050c 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 +FROM node:16-bullseye-slim WORKDIR /workspace COPY ./package.json ./yarn.lock ./ RUN yarn From 70066a861681f8a2a65fbc1adf54bb5b556cff77 Mon Sep 17 00:00:00 2001 From: TucksonDev Date: Tue, 6 Feb 2024 14:48:25 +0000 Subject: [PATCH 088/180] chore: add missing help parameters --- test-node.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-node.bash b/test-node.bash index 4a778d27..a48c61ff 100755 --- a/test-node.bash +++ b/test-node.bash @@ -164,6 +164,7 @@ while [[ $# -gt 0 ]]; do echo --init remove all data, rebuild, deploy new rollup echo --pos l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate heavy computation, validating all blocks in WASM + echo --l3-node deploys an L3 node on top of the L2 echo --l3-fee-token L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided echo --l3-token-bridge Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided echo --batchposters batch posters [0-3] @@ -171,6 +172,7 @@ while [[ $# -gt 0 ]]; do echo --detach detach from nodes after running them echo --blockscout build or launch blockscout echo --simple run a simple configuration. one node as sequencer/batch-poster/staker \(default unless using --dev\) + echo --tokenbridge deploy L1-L2 token bridge. echo --no-tokenbridge don\'t build or launch tokenbridge echo --no-run does not launch nodes \(useful with build or init\) echo --no-simple run a full configuration with separate sequencer/batch-poster/validator/relayer From 8335e048adf46c80aa37c0a1394e3fc57a2601e7 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Fri, 9 Feb 2024 17:03:28 +0100 Subject: [PATCH 089/180] Add CI for testnode that starts up nitro test node and rans l2 transactions --- .github/workflows/ci.yml | 37 +++++++++++++++++++++++++++++++++ .github/workflows/testnode.bash | 12 +++++++++++ test-node.bash | 9 ++++++++ 3 files changed, 58 insertions(+) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/testnode.bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..ac76fc5d --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,37 @@ +name: CI +run-name: CI triggered from @${{ github.actor }} of ${{ github.head_ref }} + +on: + workflow_dispatch: + merge_group: + pull_request: + push: + branches: + - master + - develop + + +jobs: + build_and_run: + runs-on: ubuntu-8 + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }} + restore-keys: ${{ runner.os }}-buildx- + + - name: Startup Nitro testnode + run: ${{ github.workspace }}/.github/workflows/testnode.sh diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash new file mode 100644 index 00000000..7fa18901 --- /dev/null +++ b/.github/workflows/testnode.bash @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# The script starts up the test node (with timeout 1 minute), with option to +# run l2 transactions to make sure node is working + +timeout 60 ./nitro-testnode/test-node.bash --init --dev || exit_status=$? + +if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then + echo "Testnode failed." + exit $exit_status +fi + +echo "Testnode succeeded." diff --git a/test-node.bash b/test-node.bash index c020d036..a7cbc843 100755 --- a/test-node.bash +++ b/test-node.bash @@ -43,6 +43,7 @@ dev_build_blockscout=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 +runL2Txs=false while [[ $# -gt 0 ]]; do case $1 in --init) @@ -117,6 +118,10 @@ while [[ $# -gt 0 ]]; do l3node=true shift ;; + --run-l2-txs) + runL2Txs=true + shift + ;; --redundantsequencers) redundantsequencers=$2 if ! [[ $redundantsequencers =~ [0-3] ]] ; then @@ -322,6 +327,10 @@ if $force_init; then echo fi + if $runL2Txs; then + docker-compose run scripts send-l2 --ethamount 100 --to user_l2user --wait + fi + if $l3node; then echo == Funding l3 users docker-compose run scripts send-l2 --ethamount 1000 --to l3owner --wait From 5219ee2f6e1edad4409df9c6e2ed1ccea305e5d0 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Fri, 9 Feb 2024 17:12:21 +0100 Subject: [PATCH 090/180] Fix typo --- .github/workflows/ci.yml | 2 +- .github/workflows/testnode.bash | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 .github/workflows/testnode.bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac76fc5d..a78e451c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,4 +34,4 @@ jobs: restore-keys: ${{ runner.os }}-buildx- - name: Startup Nitro testnode - run: ${{ github.workspace }}/.github/workflows/testnode.sh + run: ${{ github.workspace }}/.github/workflows/testnode.bash diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash old mode 100644 new mode 100755 From 52376108db3b8433b692f9d96a99dd80c3a50b7a Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Fri, 9 Feb 2024 17:15:31 +0100 Subject: [PATCH 091/180] Fix script path in testnode.bash --- .github/workflows/testnode.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 7fa18901..742b30f1 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -2,7 +2,7 @@ # The script starts up the test node (with timeout 1 minute), with option to # run l2 transactions to make sure node is working -timeout 60 ./nitro-testnode/test-node.bash --init --dev || exit_status=$? +timeout 60 ${{ github.workspace }}/nitro-testnode/test-node.bash --init --dev || exit_status=$? if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then echo "Testnode failed." From 69d126abdf6cfd750679c8fb7a80122e5829d7d4 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Tue, 13 Feb 2024 18:16:39 +0200 Subject: [PATCH 092/180] add option to pull latest espresso images --- test-node.bash | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index cd332887..8475f3a6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -3,6 +3,7 @@ set -e NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.1.1-e9d8842-dev +ESPRESSO_VERSION=ghcr.io/espressosystems/nitro-espresso-integration/nitro-node-dev:integration BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` @@ -42,6 +43,7 @@ hotShotAddr=0x217788c286797d56cd59af5e493f3699c39cbbe8 dev_build_nitro=false dev_build_blockscout=false espresso=false +latest_espresso_image=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 @@ -81,6 +83,10 @@ while [[ $# -gt 0 ]]; do espresso=true shift ;; + --latest-espresso-image) + latest_espresso_image=true + shift + ;; --build) force_build=true shift @@ -238,8 +244,13 @@ fi if $dev_build_nitro; then docker tag nitro-node-dev:latest nitro-node-dev-testnode else - docker pull $NITRO_NODE_VERSION - docker tag $NITRO_NODE_VERSION nitro-node-dev-testnode + if $latest_espresso_image; then + docker pull $ESPRESSO_VERSION + docker tag $ESPRESSO_VERSION nitro-node-dev-testnode + else + docker pull $NITRO_NODE_VERSION + docker tag $NITRO_NODE_VERSION nitro-node-dev-testnode + fi fi if $dev_build_blockscout; then From d62114ce0aec72982c744ee7d0167302d581a083 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 15 Feb 2024 11:48:52 -0600 Subject: [PATCH 093/180] Add beacon client URL --- scripts/config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/config.ts b/scripts/config.ts index 76a51aa3..7454773b 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -158,6 +158,9 @@ function writeConfigs(argv: any) { "connection": { "url": argv.l1url, }, + "blob-client": { + "beacon-url": "http://prysm_beacon_chain:3500" + }, }, "chain": { "id": 412346, From a22f63a4f03687f708696f6250cfc1ef5d2d914d Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 15 Feb 2024 16:19:56 -0600 Subject: [PATCH 094/180] Disable blob reader for now --- scripts/config.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 7454773b..23ecff4f 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -158,9 +158,6 @@ function writeConfigs(argv: any) { "connection": { "url": argv.l1url, }, - "blob-client": { - "beacon-url": "http://prysm_beacon_chain:3500" - }, }, "chain": { "id": 412346, @@ -184,7 +181,8 @@ function writeConfigs(argv: any) { }, "sequencer": false, "dangerous": { - "no-sequencer-coordinator": false + "no-sequencer-coordinator": false, + "disable-blob-reader": true, }, "delayed-sequencer": { "enable": false From 24ddce4bca84f34785592796c9d53472f90055bc Mon Sep 17 00:00:00 2001 From: sveitser Date: Mon, 19 Feb 2024 12:33:01 +0100 Subject: [PATCH 095/180] Add demo private staking keys --- .env | 4 ++++ docker-compose.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.env b/.env index 4cc05cca..c1db879a 100644 --- a/.env +++ b/.env @@ -27,3 +27,7 @@ ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true ESPRESSO_SEQUENCER_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5 ESPRESSO_COMMITMENT_TASK_PORT=60000 + +# Example sequencer demo private keys +ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o +ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83 diff --git a/docker-compose.yaml b/docker-compose.yaml index f932d49e..cf3d113d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -389,6 +389,7 @@ services: - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_WS_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG + - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0 - RUST_LOG - RUST_LOG_FORMAT depends_on: @@ -414,6 +415,7 @@ services: - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_WS_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG + - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1 - RUST_LOG - RUST_LOG_FORMAT depends_on: From ec4fce0ecaea7d7611c06fcd286a1d01859f2e2b Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Wed, 21 Feb 2024 11:10:13 +0100 Subject: [PATCH 096/180] Drop send-l2-tx flag --- .github/workflows/testnode.bash | 3 ++- test-node.bash | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 742b30f1..83f1d9cb 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -2,7 +2,8 @@ # The script starts up the test node (with timeout 1 minute), with option to # run l2 transactions to make sure node is working -timeout 60 ${{ github.workspace }}/nitro-testnode/test-node.bash --init --dev || exit_status=$? +timeout 60 ${{ github.workspace }}/nitro-testnode/test-node.bash --init --dev --detach || exit_status=$? +${{ github.workspace }}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then echo "Testnode failed." diff --git a/test-node.bash b/test-node.bash index b09eb6e7..4a778d27 100755 --- a/test-node.bash +++ b/test-node.bash @@ -38,7 +38,6 @@ l3_token_bridge=false batchposters=1 devprivkey=b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659 l1chainid=1337 -runL2Txs=false simple=true while [[ $# -gt 0 ]]; do case $1 in @@ -121,8 +120,6 @@ while [[ $# -gt 0 ]]; do l3node=true shift ;; - --run-l2-txs) - runL2Txs=true --l3-fee-token) if ! $l3node; then echo "Error: --l3-fee-token requires --l3node to be provided." @@ -372,10 +369,6 @@ if $force_init; then echo fi - if $runL2Txs; then - docker-compose run scripts send-l2 --ethamount 100 --to user_l2user --wait - fi - if $l3node; then echo == Funding l3 users docker compose run scripts send-l2 --ethamount 1000 --to l3owner --wait From 47ce5d22b48a760ac84e558202bce905aad9b953 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Wed, 21 Feb 2024 11:26:08 +0100 Subject: [PATCH 097/180] replace github.workspace with GITHUB_WORKSPACE --- .github/workflows/testnode.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 83f1d9cb..1d6dbd2f 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -2,8 +2,9 @@ # The script starts up the test node (with timeout 1 minute), with option to # run l2 transactions to make sure node is working -timeout 60 ${{ github.workspace }}/nitro-testnode/test-node.bash --init --dev --detach || exit_status=$? -${{ github.workspace }}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait +timeout 60 ${GITHUB_WORKSPACE}/nitro-testnode/test-node.bash --init --dev --detach || exit_status=$? +sleep 3s +${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then echo "Testnode failed." From eb8e05d22d2a37a807570394f9976574034ec313 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Wed, 21 Feb 2024 11:51:14 +0100 Subject: [PATCH 098/180] Fix script path --- .github/workflows/testnode.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 1d6dbd2f..50d08ab0 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -2,7 +2,7 @@ # The script starts up the test node (with timeout 1 minute), with option to # run l2 transactions to make sure node is working -timeout 60 ${GITHUB_WORKSPACE}/nitro-testnode/test-node.bash --init --dev --detach || exit_status=$? +timeout 60 ${GITHUB_WORKSPACE}/test-node.bash --init --dev --detach || exit_status=$? sleep 3s ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait From 3cbcbf225d33f077250d099e8771a51a16b9fe3e Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Thu, 22 Feb 2024 12:28:01 +0100 Subject: [PATCH 099/180] wait for 3min before trying to send l2 transaction --- .github/workflows/testnode.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 50d08ab0..c7154c15 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -3,7 +3,7 @@ # run l2 transactions to make sure node is working timeout 60 ${GITHUB_WORKSPACE}/test-node.bash --init --dev --detach || exit_status=$? -sleep 3s +sleep 3m ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then From 3ed91b596769f9f8cfae3a9535cb8e0ad95385d2 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Thu, 22 Feb 2024 12:50:48 +0100 Subject: [PATCH 100/180] Wait 5min until sending l2 transactions --- .github/workflows/testnode.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index c7154c15..ff606487 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -3,7 +3,7 @@ # run l2 transactions to make sure node is working timeout 60 ${GITHUB_WORKSPACE}/test-node.bash --init --dev --detach || exit_status=$? -sleep 3m +sleep 5m ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then From 03e24b2aa7c6a5715f1201793cd88de05a9cd635 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Thu, 22 Feb 2024 17:20:01 +0100 Subject: [PATCH 101/180] Increase wait time --- .github/workflows/testnode.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index ff606487..21a431d4 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -3,7 +3,7 @@ # run l2 transactions to make sure node is working timeout 60 ${GITHUB_WORKSPACE}/test-node.bash --init --dev --detach || exit_status=$? -sleep 5m +sleep 15m ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then From ff7ff3ac451f966e78e4df45e665bb7bd52b2861 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Fri, 23 Feb 2024 16:09:12 +0100 Subject: [PATCH 102/180] Run testnode using latest release (without --dev) --- .github/workflows/testnode.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 21a431d4..6918d403 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -2,9 +2,9 @@ # The script starts up the test node (with timeout 1 minute), with option to # run l2 transactions to make sure node is working -timeout 60 ${GITHUB_WORKSPACE}/test-node.bash --init --dev --detach || exit_status=$? -sleep 15m -${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait +timeout 10m ${GITHUB_WORKSPACE}/test-node.bash --init --detach +sleep 10m +${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait || exit_status=$? if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then echo "Testnode failed." From 74e07df5ad1291bfe079f0975ffb112096b93695 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Fri, 23 Feb 2024 16:34:34 +0100 Subject: [PATCH 103/180] Increase timeout --- .github/workflows/testnode.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 6918d403..64fb160f 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -2,8 +2,8 @@ # The script starts up the test node (with timeout 1 minute), with option to # run l2 transactions to make sure node is working -timeout 10m ${GITHUB_WORKSPACE}/test-node.bash --init --detach -sleep 10m +timeout 20m ${GITHUB_WORKSPACE}/test-node.bash --init --detach +sleep 20m ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait || exit_status=$? if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then From f27a85ec79fc6025220170697554bc2cf49c913d Mon Sep 17 00:00:00 2001 From: nomaxg Date: Fri, 23 Feb 2024 14:20:27 -0500 Subject: [PATCH 104/180] updates from sequencer --- docker-compose.yaml | 21 ++++++++++++++++++++- scripts/config.ts | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index cf3d113d..31d48f5f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -390,6 +390,10 @@ services: - ESPRESSO_SEQUENCER_L1_WS_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0 + - ESPRESSO_STATE_RELAY_SERVER_URL + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX + - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS - RUST_LOG - RUST_LOG_FORMAT depends_on: @@ -416,6 +420,10 @@ services: - ESPRESSO_SEQUENCER_L1_WS_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1 + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX + - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS + - ESPRESSO_STATE_RELAY_SERVER_URL - RUST_LOG - RUST_LOG_FORMAT depends_on: @@ -436,7 +444,7 @@ services: env_file: - espresso.env environment: - - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX - ESPRESSO_COMMITMENT_TASK_PORT - ESPRESSO_SEQUENCER_URL @@ -454,6 +462,17 @@ services: geth: condition: service_started + state-relay-server: + image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main + ports: + - "$ESPRESSO_STATE_RELAY_SERVER_PORT:$ESPRESSO_STATE_RELAY_SERVER_PORT" + environment: + - ESPRESSO_STATE_RELAY_SERVER_PORT + - ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD + - RUST_LOG + - RUST_LOG_FORMAT + + volumes: l1data: consensus: diff --git a/scripts/config.ts b/scripts/config.ts index cb4e11d8..b56777d2 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -173,7 +173,7 @@ function writeConfigs(argv: any) { "enable": false, "espresso": false, "hotshot-url": "", - "espresso-namespace": 100, + "espresso-namespace": 412346, }, }, "node": { From b9588a10c34ee7c358a3025f79573dd8df6dbaf6 Mon Sep 17 00:00:00 2001 From: Nodar Ambroladze Date: Mon, 26 Feb 2024 14:22:52 +0100 Subject: [PATCH 105/180] Poll until timeout or until send-l2 succeeds --- .github/workflows/testnode.bash | 46 ++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 64fb160f..258a47c6 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -1,14 +1,40 @@ -#!/usr/bin/env bash -# The script starts up the test node (with timeout 1 minute), with option to -# run l2 transactions to make sure node is working +#!/bin/bash +# The script starts up the test node and waits until the timeout (10min) or +# until send-l2 succeeds. -timeout 20m ${GITHUB_WORKSPACE}/test-node.bash --init --detach -sleep 20m -${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait || exit_status=$? +# Start the test node and get PID, to terminate it once send-l2 is done. +${GITHUB_WORKSPACE}/test-node.bash --init > output.log 2>&1 & +PID=$! -if [ -n "$exit_status" ] && [ $exit_status -ne 0 ] && [ $exit_status -ne 124 ]; then - echo "Testnode failed." - exit $exit_status +sleep 5m + +START=$(date +%s) +SUCCEDED=0 + +while true; do + if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait; then + echo "Sending l2 transaction succeeded" + SUCCEDED=1 + break + fi + + # Check if the timeout (10 min) has been reached. + NOW=$(date +%s) + DIFF=$((NOW - START)) + if [ "$DIFF" -ge 600 ]; then + echo "Timed out" + break + fi + + sleep 10 +done + +# Shut down the test node and wait for it to terminate. +kill $PID +wait $PID + +if [ "$SUCCEDED" -eq 0 ]; then + exit 1 fi -echo "Testnode succeeded." +exit 0 From 15fe18a055998f2d70c8e2d1a6b8d5c9270efe3e Mon Sep 17 00:00:00 2001 From: nomaxg Date: Sun, 3 Mar 2024 09:58:49 -0700 Subject: [PATCH 106/180] more env updates based on recent sequencer changes --- .env | 13 ++++++++++++- docker-compose.yaml | 6 ++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.env b/.env index c1db879a..c5c4d0ea 100644 --- a/.env +++ b/.env @@ -24,10 +24,21 @@ ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:$ESPRESSO_SEQUENCER_L1_PORT ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:$ESPRESSO_SEQUENCER_L1_WS_PORT ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true # A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. -ESPRESSO_SEQUENCER_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" +ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" +ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5 ESPRESSO_COMMITMENT_TASK_PORT=60000 # Example sequencer demo private keys ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83 + +ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=STATEKEY~YC2YwzvFypi98JLHHEydp6EGMkcSsEZBEnByNBnajgE- +ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=STATEKEY~5JJJJ9OhX320me8TUKZ15iRTVHslYyULwlDm3FG5vAOk + +ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=8 +ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f + +ESPRESSO_STATE_RELAY_SERVER_PORT=40004 +ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3 +ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT diff --git a/docker-compose.yaml b/docker-compose.yaml index 31d48f5f..4ee3ef7d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -387,9 +387,10 @@ services: - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL - ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - - ESPRESSO_SEQUENCER_L1_WS_PROVIDER + - ESPRESSO_SEQUENCER_L1_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0 + - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0 - ESPRESSO_STATE_RELAY_SERVER_URL - ESPRESSO_SEQUENCER_ETH_MNEMONIC - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX @@ -417,9 +418,10 @@ services: - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL - ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - - ESPRESSO_SEQUENCER_L1_WS_PROVIDER + - ESPRESSO_SEQUENCER_L1_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1 + - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 - ESPRESSO_SEQUENCER_ETH_MNEMONIC - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS From 2d372a79531ee19f2e1269096c547efda8f2292d Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 2 Feb 2024 10:19:37 -0700 Subject: [PATCH 107/180] accounts documentation --- scripts/accounts.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/accounts.ts b/scripts/accounts.ts index 4dbb4b0f..2d500406 100644 --- a/scripts/accounts.ts +++ b/scripts/accounts.ts @@ -87,10 +87,11 @@ export function namedAddress( export const namedAccountHelpString = "Valid account names:\n" + - " funnel | sequencer | validator - known keys\n" + - " user_[Alphanumeric] - key will be generated from username\n" + - " threaduser_[Alphanumeric] - same as user_[Alphanumeric]_thread_[thread-id]\n" + - " key_0x[full private key] - user with specified private key\n" + + " funnel | sequencer | validator | l2owner - known keys used by l2\n" + + " l3owner | l3sequencer - known keys used by l3\n" + + " user_[Alphanumeric] - key will be generated from username\n" + + " threaduser_[Alphanumeric] - same as user_[Alphanumeric]_thread_[thread-id]\n" + + " key_0x[full private key] - user with specified private key\n" + "\n" + "Valid addresses: any account name, or\n" + " address_0x[full eth address]\n" + @@ -125,7 +126,7 @@ export const printPrivateKeyCommand = { builder: { account: { string: true, - describe: "address (see general help)", + describe: "account (see general help)", default: "funnel", }, }, From e8846e198f871c9f676f37a845fb6e0c315c99ef Mon Sep 17 00:00:00 2001 From: gzeon Date: Mon, 5 Feb 2024 23:17:22 +0900 Subject: [PATCH 108/180] perf: remove chrome --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 199534c3..1599c0c9 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-bullseye-slim RUN apt-get update && \ - apt-get install -y git docker.io python3 chromium build-essential + apt-get install -y git docker.io python3 build-essential WORKDIR /workspace RUN git clone -b reg-weth-gw https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install From bda0e84e8d2bb6c50dfff5168d61887b60cca76d Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 6 Feb 2024 00:35:13 +0900 Subject: [PATCH 109/180] chore: switch token-bridge-contracts main --- tokenbridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 1599c0c9..344e537d 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -2,7 +2,7 @@ FROM node:16-bullseye-slim RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential WORKDIR /workspace -RUN git clone -b reg-weth-gw https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From 896f519f7d559b50e7d36d4f1c1b1007709fb7c4 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 6 Feb 2024 02:44:18 +0900 Subject: [PATCH 110/180] perf: use slim image --- scripts/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index e9b91b86..c5b7050c 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 +FROM node:16-bullseye-slim WORKDIR /workspace COPY ./package.json ./yarn.lock ./ RUN yarn From 5425c665baccbb11a40df163b823c8dde64c449b Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 15 Feb 2024 11:48:52 -0600 Subject: [PATCH 111/180] Add beacon client URL --- scripts/config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/config.ts b/scripts/config.ts index beb8302f..2864e6cf 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -158,6 +158,9 @@ function writeConfigs(argv: any) { "connection": { "url": argv.l1url, }, + "blob-client": { + "beacon-url": "http://prysm_beacon_chain:3500" + }, }, "chain": { "id": 412346, From 3e0ccb80b37b9bfc45b64c9424811cca16fd3ff1 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Thu, 15 Feb 2024 16:19:56 -0600 Subject: [PATCH 112/180] Disable blob reader for now --- scripts/config.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 2864e6cf..c94e69f1 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -158,9 +158,6 @@ function writeConfigs(argv: any) { "connection": { "url": argv.l1url, }, - "blob-client": { - "beacon-url": "http://prysm_beacon_chain:3500" - }, }, "chain": { "id": 412346, @@ -185,7 +182,8 @@ function writeConfigs(argv: any) { "sequencer": false, "espresso": false, "dangerous": { - "no-sequencer-coordinator": false + "no-sequencer-coordinator": false, + "disable-blob-reader": true, }, "delayed-sequencer": { "enable": false From 50c9a9085e99623232ec3bdd7fbc123a85c6f638 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Thu, 14 Mar 2024 17:52:00 +0800 Subject: [PATCH 113/180] Fix the testnode --- .env | 10 +++++++--- docker-compose.yaml | 32 +++++++++++++++++++++----------- scripts/config.ts | 10 ++++++---- test-node.bash | 2 +- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.env b/.env index 79b58bd8..919dfd8b 100644 --- a/.env +++ b/.env @@ -24,10 +24,14 @@ ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:$ESPRESSO_SEQUENCER_L1_PORT ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:$ESPRESSO_SEQUENCER_L1_WS_PORT ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true # A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. -ESPRESSO_SEQUENCER_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" +ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" +ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=6 ESPRESSO_COMMITMENT_TASK_PORT=60000 # Example sequencer demo private keys -ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o -ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83 +ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o +ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83 + +ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=SCHNORR_SIGNING_KEY~XxPSER8Vh3nFj_m7cUQ--96JfKrycrSKyRQximkQigCo +ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=SCHNORR_SIGNING_KEY~2NpKtvY5F0u1LWgYws-JeX1vDdp5CfECuaMMYxyz4gDM \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 6d3f48aa..924b2593 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -337,7 +337,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock orchestrator: - image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main + image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:arbitrum-integrationmusl ports: - "$ESPRESSO_ORCHESTRATOR_PORT:$ESPRESSO_ORCHESTRATOR_PORT" environment: @@ -352,7 +352,7 @@ services: - RUST_LOG_FORMAT da-server: - image: ghcr.io/espressosystems/espresso-sequencer/web-server:main + image: ghcr.io/espressosystems/espresso-sequencer/web-server:arbitrum-integrationmusl ports: - "$ESPRESSO_DA_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT" environment: @@ -364,7 +364,7 @@ services: condition: service_healthy consensus-server: - image: ghcr.io/espressosystems/espresso-sequencer/web-server:main + image: ghcr.io/espressosystems/espresso-sequencer/web-server:arbitrum-integrationmusl ports: - "$ESPRESSO_CONSENSUS_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT" environment: @@ -376,7 +376,7 @@ services: condition: service_healthy espresso-sequencer0: - image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main + image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API @@ -387,9 +387,14 @@ services: - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL - ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - - ESPRESSO_SEQUENCER_L1_WS_PROVIDER + - ESPRESSO_SEQUENCER_L1_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0 + - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0 + - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX + - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer1:$ESPRESSO_SEQUENCER_API_PORT - RUST_LOG - RUST_LOG_FORMAT depends_on: @@ -403,7 +408,7 @@ services: condition: service_started espresso-sequencer1: - image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main + image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl ports: - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" # Run the API server (with options taken from the environment) @@ -413,11 +418,16 @@ services: - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL - ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - - ESPRESSO_SEQUENCER_L1_WS_PROVIDER + - ESPRESSO_SEQUENCER_L1_PROVIDER - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1 + - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1 + - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX + - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS - RUST_LOG - RUST_LOG_FORMAT + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT depends_on: orchestrator: condition: service_healthy @@ -429,14 +439,14 @@ services: condition: service_started commitment-task: - image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main + image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:arbitrum-integrationmusl ports: - "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT" command: commitment-task --deploy env_file: - espresso.env environment: - - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX - ESPRESSO_COMMITMENT_TASK_PORT - ESPRESSO_SEQUENCER_URL diff --git a/scripts/config.ts b/scripts/config.ts index c94e69f1..55c9650b 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -220,8 +220,9 @@ function writeConfigs(argv: any) { "url": argv.validationNodeUrl, "jwtsecret": valJwtSecret, }, - "espresso": false, - "hotshot-address": "", + "espresso": false, + "hotshot-address": "", + "dangerous": {"reset-block-validation": false}, }, "feed": { "input": { @@ -239,7 +240,7 @@ function writeConfigs(argv: any) { "enable": false, "espresso": false, "hotshot-url": "", - "espresso-namespace": 100, + "espresso-namespace": 412346, }, "forwarding-target": "null", }, @@ -276,13 +277,13 @@ function writeConfigs(argv: any) { validatorConfig.node.staker.enable = true validatorConfig.node.staker["use-smart-contract-wallet"] = true if (argv.espresso) { - validatorConfig.execution["forwarding-target"] = "null" validatorConfig.node["block-validator"]["espresso"] = true // If we don't quote the address it is interpreted as a Number. // The quotes however stick around and make it an invalid address. // Remove the double quote from the hotshot address. // There has to be a better way. validatorConfig.node["block-validator"]["hotshot-address"] = argv["hotshot-address"].replace(/^"(.+(?="$))"$/, '$1') + validatorConfig.node["block-validator"]["dangerous"]["reset-block-validation"] = true } let validconfJSON = JSON.stringify(validatorConfig) fs.writeFileSync(path.join(consts.configpath, "validator_config.json"), validconfJSON) @@ -301,6 +302,7 @@ function writeConfigs(argv: any) { sequencerConfig.execution.sequencer.espresso = true sequencerConfig.execution.sequencer["hotshot-url"] = argv.espressoUrl sequencerConfig.node.feed.output.enable = true + sequencerConfig.node.dangerous["no-sequencer-coordinator"] = true } else { sequencerConfig.node["seq-coordinator"].enable = true } diff --git a/test-node.bash b/test-node.bash index e2031a91..2c242224 100755 --- a/test-node.bash +++ b/test-node.bash @@ -377,7 +377,7 @@ if $force_init; then docker compose run scripts write-config --simple --espresso $espresso --hotshot-address $hotShotAddr else echo == Writing configs - docker compose run scripts write-config + docker compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr echo == Initializing redis docker compose up --wait redis From 32c5f7faa8cf70671b7a148c551c6f7592fb9911 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Wed, 20 Mar 2024 11:25:57 +0100 Subject: [PATCH 114/180] Add rollupcreator container --- docker-compose.yaml | 12 ++++++++++++ rollupcreator/Dockerfile | 8 ++++++++ test-node.bash | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 rollupcreator/Dockerfile diff --git a/docker-compose.yaml b/docker-compose.yaml index b84101e1..6c6d2712 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -161,6 +161,7 @@ services: - "l1keystore:/home/user/l1keystore" - "config:/config" - "tokenbridge-data:/tokenbridge-data" + - "rollupcreator-data:/rollupcreator-data" command: --conf.file /config/sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642 --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain * depends_on: - geth @@ -336,6 +337,16 @@ services: - "tokenbridge-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock + rollupcreator: + depends_on: + - geth + - sequencer + pid: host + build: rollupcreator/ + volumes: + - "rollupcreator-data:/workspace" + - /var/run/docker.sock:/var/run/docker.sock + volumes: l1data: consensus: @@ -352,3 +363,4 @@ volumes: config: postgres-data: tokenbridge-data: + rollupcreator-data: diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile new file mode 100644 index 00000000..07f59469 --- /dev/null +++ b/rollupcreator/Dockerfile @@ -0,0 +1,8 @@ +FROM node:16-bullseye-slim +RUN apt-get update && \ + apt-get install -y git docker.io python3 build-essential +WORKDIR /workspace +RUN git clone https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN yarn install +RUN yarn build +ENTRYPOINT ["yarn"] diff --git a/test-node.bash b/test-node.bash index a48c61ff..599ca286 100755 --- a/test-node.bash +++ b/test-node.bash @@ -198,7 +198,7 @@ if $dev_build_blockscout; then fi fi -NODES="sequencer" +NODES="sequencer rollupcreator" INITIAL_SEQ_NODES="sequencer" if ! $simple; then From d269f8c03ec57fc2fef23531a9473967d9005501 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 21 Mar 2024 13:57:30 +0100 Subject: [PATCH 115/180] Update Dockerfile --- rollupcreator/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index 07f59469..8a58ec3b 100644 --- a/rollupcreator/Dockerfile +++ b/rollupcreator/Dockerfile @@ -1,8 +1,12 @@ FROM node:16-bullseye-slim RUN apt-get update && \ - apt-get install -y git docker.io python3 build-essential + apt-get install -y git docker.io python3 build-essential curl WORKDIR /workspace -RUN git clone https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN git clone -b testnode-deploy https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN curl -L https://foundry.paradigm.xyz | bash +ENV PATH="${PATH}:/root/.foundry/bin" +RUN foundryup +RUN touch scripts/config.ts RUN yarn install -RUN yarn build +RUN yarn build:all ENTRYPOINT ["yarn"] From bf17161fee94ca48af8fe23e493985c74edb3148 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 21 Mar 2024 13:57:59 +0100 Subject: [PATCH 116/180] Draft rollup creation call --- test-node.bash | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 599ca286..05640a06 100755 --- a/test-node.bash +++ b/test-node.bash @@ -340,8 +340,12 @@ if $force_init; then sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` + l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` - docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json + sleep 20 + docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey rollupcreator deploy-factory --network testnode_l1 + #docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=$maxDataSize -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x8569CADe473FD633310d7899c0F5025e1F21f664 rollupcreator deploy-eth-rollup --network testnode_l1 + #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then @@ -365,7 +369,6 @@ if $force_init; then echo == Deploying L1-L2 token bridge sleep 10 # no idea why this sleep is needed but without it the deploy fails randomly rollupAddress=`docker compose run --entrypoint sh poster -c "jq -r '.[0].rollup.rollup' /config/deployed_chain_info.json | tail -n 1 | tr -d '\r\n'"` - l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` docker compose run -e ROLLUP_OWNER_KEY=$l2ownerKey -e ROLLUP_ADDRESS=$rollupAddress -e PARENT_KEY=$devprivkey -e PARENT_RPC=http://geth:8545 -e CHILD_KEY=$devprivkey -e CHILD_RPC=http://sequencer:8547 tokenbridge deploy:local:token-bridge docker compose run --entrypoint sh tokenbridge -c "cat network.json && cp network.json l1l2_network.json && cp network.json localNetwork.json" echo From 492be73a0edc564d8ceac4ba44ddaf4252257e6e Mon Sep 17 00:00:00 2001 From: tbro Date: Thu, 21 Mar 2024 13:18:24 -0500 Subject: [PATCH 117/180] call `docker compose` consistently `docker compose` is used everywhere except these few lines where we switch to `docker-compose`. --- test-node.bash | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-node.bash b/test-node.bash index 2c242224..07ef13e2 100755 --- a/test-node.bash +++ b/test-node.bash @@ -346,22 +346,22 @@ if $force_init; then fi echo == Funding validator, sequencer and l2owner - docker-compose run scripts send-l1 --ethamount 1000 --to validator --wait - docker-compose run scripts send-l1 --ethamount 1000 --to sequencer --wait + docker compose run scripts send-l1 --ethamount 1000 --to validator --wait + docker compose run scripts send-l1 --ethamount 1000 --to sequencer --wait docker compose run scripts send-l1 --ethamount 1000 --to l2owner --wait - docker-compose run scripts send-l1 --ethamount 1000 --to espresso-sequencer --wait + docker compose run scripts send-l1 --ethamount 1000 --to espresso-sequencer --wait echo == create l1 traffic - docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait - docker-compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & + docker compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait + docker compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l2 chain config - docker-compose run scripts write-l2-chain-config --espresso $espresso + docker compose run scripts write-l2-chain-config --espresso $espresso if $espresso; then echo == Deploying Espresso Contract echo "" > espresso.env - docker-compose up -d commitment-task espresso-sequencer0 espresso-sequencer1 --wait + docker compose up -d commitment-task espresso-sequencer0 espresso-sequencer1 --wait hotShotAddr=`curl http://localhost:60000/api/hotshot_contract` echo "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=$hotShotAddr" > espresso.env fi From 1e6f905b0e7ce33cdb2eb56ce1c2c6025c27b46c Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Fri, 22 Mar 2024 12:40:19 +0800 Subject: [PATCH 118/180] Set simple to false when running espresso --- test-node.bash | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test-node.bash b/test-node.bash index 2c242224..3ba1ea8b 100755 --- a/test-node.bash +++ b/test-node.bash @@ -77,6 +77,7 @@ while [[ $# -gt 0 ]]; do fi ;; --espresso) + simple=false espresso=true shift ;; @@ -349,7 +350,8 @@ if $force_init; then docker-compose run scripts send-l1 --ethamount 1000 --to validator --wait docker-compose run scripts send-l1 --ethamount 1000 --to sequencer --wait docker compose run scripts send-l1 --ethamount 1000 --to l2owner --wait - docker-compose run scripts send-l1 --ethamount 1000 --to espresso-sequencer --wait + docker-compose run scripts send-l1 --ethamount 10000 --to espresso-sequencer --wait + docker-compose run scripts send-l2 --ethamount 10000 --to espresso-sequencer --wait echo == create l1 traffic docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait @@ -373,8 +375,8 @@ if $force_init; then docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then - echo == Writing configs --espresso $espresso --hotshot-address $hotShotAddr - docker compose run scripts write-config --simple --espresso $espresso --hotshot-address $hotShotAddr + echo == Writing configs + docker compose run scripts write-config --simple else echo == Writing configs docker compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr From ba1d122a08e379549eb759bdbfcd95f8d3383c36 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Fri, 22 Mar 2024 13:17:38 +0800 Subject: [PATCH 119/180] Fix the fund --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 3ba1ea8b..354dd172 100755 --- a/test-node.bash +++ b/test-node.bash @@ -351,7 +351,6 @@ if $force_init; then docker-compose run scripts send-l1 --ethamount 1000 --to sequencer --wait docker compose run scripts send-l1 --ethamount 1000 --to l2owner --wait docker-compose run scripts send-l1 --ethamount 10000 --to espresso-sequencer --wait - docker-compose run scripts send-l2 --ethamount 10000 --to espresso-sequencer --wait echo == create l1 traffic docker-compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait @@ -389,6 +388,7 @@ if $force_init; then echo == Funding l2 funnel and dev key docker compose up --wait $INITIAL_SEQ_NODES docker compose run scripts bridge-funds --ethamount 100000 --wait + docker-compose run scripts send-l2 --ethamount 10000 --to espresso-sequencer --wait docker compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" if $tokenbridge; then From ea799293b93a8d5885886df83a4d85367c18ff21 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 26 Mar 2024 13:12:45 +0100 Subject: [PATCH 120/180] Update create rollup call --- test-node.bash | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 05640a06..27826fff 100755 --- a/test-node.bash +++ b/test-node.bash @@ -342,8 +342,13 @@ if $force_init; then l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` - sleep 20 - docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey rollupcreator deploy-factory --network testnode_l1 + echo == Deploying + docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e PARENT_CHAIN_RPC="http://geth:8545" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid rollupcreator create-rollup-testnode + # docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e MAX_DATA_SIZE=117964 rollupcreator deploy-factory --network testnode_l1 + # docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=117964 -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x82A3c114b40ecF1FC34745400A1B9B9115c33d31 rollupcreator deploy-eth-rollup --network testnode_l1 + echo == Deployment done + #docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e MAX_DATA_SIZE=$maxDataSize -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x8569CADe473FD633310d7899c0F5025e1F21f664 rollupcreator deploy-eth-rollup --network testnode_l1 + #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://getrollupcreator deploy-factory --network testnode_l1 #docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=$maxDataSize -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x8569CADe473FD633310d7899c0F5025e1F21f664 rollupcreator deploy-eth-rollup --network testnode_l1 #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" From 8885c423f9789606e40b1b3ec7bd883c096b2e7a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Wed, 27 Mar 2024 11:27:52 +0100 Subject: [PATCH 121/180] Update rollupcreator config --- docker-compose.yaml | 1 + rollupcreator/Dockerfile | 2 +- test-node.bash | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6c6d2712..85080fa8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -344,6 +344,7 @@ services: pid: host build: rollupcreator/ volumes: + - "config:/config" - "rollupcreator-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index 8a58ec3b..a1764f87 100644 --- a/rollupcreator/Dockerfile +++ b/rollupcreator/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-bullseye-slim RUN apt-get update && \ - apt-get install -y git docker.io python3 build-essential curl + apt-get install -y git docker.io python3 build-essential curl jq WORKDIR /workspace RUN git clone -b testnode-deploy https://github.com/OffchainLabs/nitro-contracts.git ./ RUN curl -L https://foundry.paradigm.xyz | bash diff --git a/test-node.bash b/test-node.bash index 27826fff..f8fb63fd 100755 --- a/test-node.bash +++ b/test-node.bash @@ -343,7 +343,7 @@ if $force_init; then l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` echo == Deploying - docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e PARENT_CHAIN_RPC="http://geth:8545" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid rollupcreator create-rollup-testnode + docker compose run -e PARENT_CHAIN_RPC="http://geth:8545" -e DEPLOYER_PRIVKEY=$l2ownerKey -e L1_CHAIN_ID=$l1chainid -e CHILD_CHAIN_NAME="arb-dev-test" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l2_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_chain_info.json" rollupcreator create-rollup-testnode # docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e MAX_DATA_SIZE=117964 rollupcreator deploy-factory --network testnode_l1 # docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=117964 -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x82A3c114b40ecF1FC34745400A1B9B9115c33d31 rollupcreator deploy-eth-rollup --network testnode_l1 echo == Deployment done @@ -351,7 +351,7 @@ if $force_init; then #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://getrollupcreator deploy-factory --network testnode_l1 #docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=$maxDataSize -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x8569CADe473FD633310d7899c0F5025e1F21f664 rollupcreator deploy-eth-rollup --network testnode_l1 #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json - docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" + docker compose run --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then echo == Writing configs From 999eb3885da7d9181ff15e0214afaa6fc3bc554a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Wed, 27 Mar 2024 14:31:10 +0100 Subject: [PATCH 122/180] Fix command --- test-node.bash | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/test-node.bash b/test-node.bash index f8fb63fd..2af6a4a4 100755 --- a/test-node.bash +++ b/test-node.bash @@ -198,7 +198,7 @@ if $dev_build_blockscout; then fi fi -NODES="sequencer rollupcreator" +NODES="sequencer" INITIAL_SEQ_NODES="sequencer" if ! $simple; then @@ -255,7 +255,7 @@ if $force_build; then docker build blockscout -t blockscout -f blockscout/docker/Dockerfile fi fi - LOCAL_BUILD_NODES=scripts + LOCAL_BUILD_NODES="scripts rollupcreator" if $tokenbridge || $l3_token_bridge; then LOCAL_BUILD_NODES="$LOCAL_BUILD_NODES tokenbridge" fi @@ -342,15 +342,8 @@ if $force_init; then l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` - echo == Deploying - docker compose run -e PARENT_CHAIN_RPC="http://geth:8545" -e DEPLOYER_PRIVKEY=$l2ownerKey -e L1_CHAIN_ID=$l1chainid -e CHILD_CHAIN_NAME="arb-dev-test" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l2_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_chain_info.json" rollupcreator create-rollup-testnode - # docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e MAX_DATA_SIZE=117964 rollupcreator deploy-factory --network testnode_l1 - # docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=117964 -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x82A3c114b40ecF1FC34745400A1B9B9115c33d31 rollupcreator deploy-eth-rollup --network testnode_l1 - echo == Deployment done - #docker compose run -e DEPLOYER_PRIVKEY=$l2ownerKey -e MAX_DATA_SIZE=$maxDataSize -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x8569CADe473FD633310d7899c0F5025e1F21f664 rollupcreator deploy-eth-rollup --network testnode_l1 - #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://getrollupcreator deploy-factory --network testnode_l1 - #docker compose run -e OWNER_ADDRESS=$l2ownerAddress -e MAX_DATA_SIZE=$maxDataSize -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/deployment.json" -e L1_CHAIN_ID=$l1chainid -e DEPLOYER_PRIVKEY=$l2ownerKey -e ROLLUP_CREATOR_ADDRESS=0x8569CADe473FD633310d7899c0F5025e1F21f664 rollupcreator deploy-eth-rollup --network testnode_l1 - #docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json + echo == Deploying L2 chain + docker compose run -e PARENT_CHAIN_RPC="http://geth:8545" -e DEPLOYER_PRIVKEY=$l2ownerKey -e PARENT_CHAIN_ID=$l1chainid -e CHILD_CHAIN_NAME="arb-dev-test" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l2_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_chain_info.json" rollupcreator create-rollup-testnode docker compose run --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then From c3d3d6401e95cb1346edf49de92fd10e7718adaf Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Wed, 27 Mar 2024 16:46:37 +0100 Subject: [PATCH 123/180] Adjust l3node creation command --- test-node.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 2af6a4a4..369d3dad 100755 --- a/test-node.bash +++ b/test-node.bash @@ -402,8 +402,9 @@ if $force_init; then l3owneraddress=`docker compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` l3ownerkey=`docker compose run scripts print-private-key --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://sequencer:8548 --l1keystore /home/user/l1keystore --sequencerAddress $l3sequenceraddress --ownerAddress $l3owneraddress --l1DeployAccount $l3owneraddress --l1deployment /config/l3deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=412346 --l2chainconfig /config/l3_chain_config.json --l2chainname orbit-dev-test --l2chaininfo /config/deployed_l3_chain_info.json --maxDataSize 104857 $EXTRA_L3_DEPLOY_FLAG - docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" + + docker compose run -e DEPLOYER_PRIVKEY=$l3ownerkey -e PARENT_CHAIN_RPC="http://sequencer:8547" -e PARENT_CHAIN_ID=412346 -e CHILD_CHAIN_NAME="orbit-dev-test" -e MAX_DATA_SIZE=104857 -e OWNER_ADDRESS=$l3owneraddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$l3sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l3_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/l3deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_l3_chain_info.json" rollupcreator create-rollup-testnode + docker compose run --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key docker compose up --wait l3node sequencer From 7ea4b74d895b29a3f85f3c8a34a126ce07103a6a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 12:31:25 +0100 Subject: [PATCH 124/180] Fund deployers with fee token --- scripts/ethcommands.ts | 32 ++++++++++++++++++++++++++++++++ scripts/index.ts | 2 ++ test-node.bash | 1 + 3 files changed, 35 insertions(+) diff --git a/scripts/ethcommands.ts b/scripts/ethcommands.ts index 00fdbb15..82eeadbc 100644 --- a/scripts/ethcommands.ts +++ b/scripts/ethcommands.ts @@ -279,6 +279,38 @@ export const createERC20Command = { }, }; +export const transferERC20Command = { + command: "transfer-erc20", + describe: "transfers ERC20 token", + builder: { + token: { + string: true, + describe: "token address", + }, + amount: { + string: true, + describe: "amount to transfer", + }, + from: { + string: true, + describe: "account (see general help)", + }, + to: { + string: true, + describe: "address (see general help)", + }, + }, + handler: async (argv: any) => { + console.log("transfer-erc20"); + + argv.provider = new ethers.providers.WebSocketProvider(argv.l2url); + const account = namedAccount(argv.from).connect(argv.provider); + const tokenContract = new ethers.Contract(argv.token, ERC20.abi, account); + const decimals = await tokenContract.decimals(); + await(await tokenContract.transfer(namedAccount(argv.to).address, ethers.utils.parseUnits(argv.amount, decimals))).wait(); + argv.provider.destroy(); + }, +}; export const sendL1Command = { command: "send-l1", diff --git a/scripts/index.ts b/scripts/index.ts index 9f25c6e2..2fd189f6 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -14,6 +14,7 @@ import { bridgeNativeTokenToL3Command, bridgeToL3Command, createERC20Command, + transferERC20Command, sendL1Command, sendL2Command, sendL3Command, @@ -35,6 +36,7 @@ async function main() { .command(bridgeToL3Command) .command(bridgeNativeTokenToL3Command) .command(createERC20Command) + .command(transferERC20Command) .command(sendL1Command) .command(sendL2Command) .command(sendL3Command) diff --git a/test-node.bash b/test-node.bash index 369d3dad..19232bab 100755 --- a/test-node.bash +++ b/test-node.bash @@ -395,6 +395,7 @@ if $force_init; then if $l3_custom_fee_token; then echo == Deploying custom fee token nativeTokenAddress=`docker compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer --bridgeable $tokenbridge | tail -n 1 | awk '{ print $NF }'` + docker compose run scripts transfer-erc20 --token $nativeTokenAddress --amount 100 --from user_token_bridge_deployer --to l3owner EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" fi From de506e168050693ddc1e60e8747bf7caa74c1344 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 12:38:51 +0100 Subject: [PATCH 125/180] Properly provide fee token arg --- test-node.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 19232bab..fcb567a8 100755 --- a/test-node.bash +++ b/test-node.bash @@ -396,7 +396,7 @@ if $force_init; then echo == Deploying custom fee token nativeTokenAddress=`docker compose run scripts create-erc20 --deployer user_fee_token_deployer --mintTo user_token_bridge_deployer --bridgeable $tokenbridge | tail -n 1 | awk '{ print $NF }'` docker compose run scripts transfer-erc20 --token $nativeTokenAddress --amount 100 --from user_token_bridge_deployer --to l3owner - EXTRA_L3_DEPLOY_FLAG="--nativeTokenAddress $nativeTokenAddress" + EXTRA_L3_DEPLOY_FLAG="-e FEE_TOKEN_ADDRESS=$nativeTokenAddress" fi echo == Deploying L3 @@ -404,7 +404,7 @@ if $force_init; then l3ownerkey=`docker compose run scripts print-private-key --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - docker compose run -e DEPLOYER_PRIVKEY=$l3ownerkey -e PARENT_CHAIN_RPC="http://sequencer:8547" -e PARENT_CHAIN_ID=412346 -e CHILD_CHAIN_NAME="orbit-dev-test" -e MAX_DATA_SIZE=104857 -e OWNER_ADDRESS=$l3owneraddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$l3sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l3_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/l3deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_l3_chain_info.json" rollupcreator create-rollup-testnode + docker compose run -e DEPLOYER_PRIVKEY=$l3ownerkey -e PARENT_CHAIN_RPC="http://sequencer:8547" -e PARENT_CHAIN_ID=412346 -e CHILD_CHAIN_NAME="orbit-dev-test" -e MAX_DATA_SIZE=104857 -e OWNER_ADDRESS=$l3owneraddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$l3sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l3_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/l3deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_l3_chain_info.json" $EXTRA_L3_DEPLOY_FLAG rollupcreator create-rollup-testnode docker compose run --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key From 3b3ce1a0e417cf7606aedbc7f4132650930a80cc Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 13:14:08 +0100 Subject: [PATCH 126/180] Use latest wasmroot --- test-node.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index fcb567a8..f105842f 100755 --- a/test-node.bash +++ b/test-node.bash @@ -341,9 +341,10 @@ if $force_init; then sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` + wasmroot=`docker compose run --entrypoint sh sequencer -c "cat /home/user/target/machines/latest/module-root.txt"` echo == Deploying L2 chain - docker compose run -e PARENT_CHAIN_RPC="http://geth:8545" -e DEPLOYER_PRIVKEY=$l2ownerKey -e PARENT_CHAIN_ID=$l1chainid -e CHILD_CHAIN_NAME="arb-dev-test" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l2_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_chain_info.json" rollupcreator create-rollup-testnode + docker compose run -e PARENT_CHAIN_RPC="http://geth:8545" -e DEPLOYER_PRIVKEY=$l2ownerKey -e PARENT_CHAIN_ID=$l1chainid -e CHILD_CHAIN_NAME="arb-dev-test" -e MAX_DATA_SIZE=117964 -e OWNER_ADDRESS=$l2ownerAddress -e WASM_MODULE_ROOT=$wasmroot -e SEQUENCER_ADDRESS=$sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l2_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_chain_info.json" rollupcreator create-rollup-testnode docker compose run --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then @@ -404,7 +405,7 @@ if $force_init; then l3ownerkey=`docker compose run scripts print-private-key --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` - docker compose run -e DEPLOYER_PRIVKEY=$l3ownerkey -e PARENT_CHAIN_RPC="http://sequencer:8547" -e PARENT_CHAIN_ID=412346 -e CHILD_CHAIN_NAME="orbit-dev-test" -e MAX_DATA_SIZE=104857 -e OWNER_ADDRESS=$l3owneraddress -e WASM_MODULE_ROOT=0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a -e SEQUENCER_ADDRESS=$l3sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l3_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/l3deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_l3_chain_info.json" $EXTRA_L3_DEPLOY_FLAG rollupcreator create-rollup-testnode + docker compose run -e DEPLOYER_PRIVKEY=$l3ownerkey -e PARENT_CHAIN_RPC="http://sequencer:8547" -e PARENT_CHAIN_ID=412346 -e CHILD_CHAIN_NAME="orbit-dev-test" -e MAX_DATA_SIZE=104857 -e OWNER_ADDRESS=$l3owneraddress -e WASM_MODULE_ROOT=$wasmroot -e SEQUENCER_ADDRESS=$l3sequenceraddress -e AUTHORIZE_VALIDATORS=10 -e CHILD_CHAIN_CONFIG_PATH="/config/l3_chain_config.json" -e CHAIN_DEPLOYMENT_INFO="/config/l3deployment.json" -e CHILD_CHAIN_INFO="/config/deployed_l3_chain_info.json" $EXTRA_L3_DEPLOY_FLAG rollupcreator create-rollup-testnode docker compose run --entrypoint sh rollupcreator -c "jq [.[]] /config/deployed_l3_chain_info.json > /config/l3_chain_info.json" echo == Funding l3 funnel and dev key From 6f70432afcd58df6343b4daf6c5399f54a09ffe2 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 14:06:08 +0100 Subject: [PATCH 127/180] Make nitro-contracts branch configurable --- docker-compose.yaml | 5 ++++- rollupcreator/Dockerfile | 3 ++- test-node.bash | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 85080fa8..2eb00ace 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -342,7 +342,10 @@ services: - geth - sequencer pid: host - build: rollupcreator/ + build: + context: rollupcreator/ + args: + NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-main} volumes: - "config:/config" - "rollupcreator-data:/workspace" diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index a1764f87..51f012e8 100644 --- a/rollupcreator/Dockerfile +++ b/rollupcreator/Dockerfile @@ -1,8 +1,9 @@ FROM node:16-bullseye-slim +ARG NITRO_CONTRACTS_BRANCH=main RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential curl jq WORKDIR /workspace -RUN git clone -b testnode-deploy https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN git clone -b ${NITRO_CONTRACTS_BRANCH} https://github.com/OffchainLabs/nitro-contracts.git ./ RUN curl -L https://foundry.paradigm.xyz | bash ENV PATH="${PATH}:/root/.foundry/bin" RUN foundryup diff --git a/test-node.bash b/test-node.bash index f105842f..ad2737cf 100755 --- a/test-node.bash +++ b/test-node.bash @@ -255,6 +255,10 @@ if $force_build; then docker build blockscout -t blockscout -f blockscout/docker/Dockerfile fi fi + + NITRO_CONTRACTS_BRANCH="testnode-deploy" + export NITRO_CONTRACTS_BRANCH + LOCAL_BUILD_NODES="scripts rollupcreator" if $tokenbridge || $l3_token_bridge; then LOCAL_BUILD_NODES="$LOCAL_BUILD_NODES tokenbridge" From 8246819e19251255f9698b0f9e8878d1b791e2c2 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 18:03:07 +0100 Subject: [PATCH 128/180] Temp change for test --- scripts/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index 23ecff4f..2efba172 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -182,7 +182,7 @@ function writeConfigs(argv: any) { "sequencer": false, "dangerous": { "no-sequencer-coordinator": false, - "disable-blob-reader": true, + // "disable-blob-reader": true, }, "delayed-sequencer": { "enable": false From 00862c2b157a617c238bd0669055ae79fe991030 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 18:20:20 +0100 Subject: [PATCH 129/180] Add option to customize token bridge branch --- docker-compose.yaml | 5 ++++- tokenbridge/Dockerfile | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2eb00ace..27b61677 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -329,7 +329,10 @@ services: - geth - sequencer pid: host - build: tokenbridge/ + build: + context: tokenbridge/ + args: + TOKEN_BRIDGE_BRANCH: ${TOKEN_BRIDGE_BRANCH:-main} environment: - ARB_URL=http://sequencer:8547 - ETH_URL=http://geth:8545 diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index 344e537d..ed53eae2 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -1,8 +1,9 @@ FROM node:16-bullseye-slim +ARG TOKEN_BRIDGE_BRANCH=main RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential WORKDIR /workspace -RUN git clone https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone -b ${TOKEN_BRIDGE_BRANCH} https://github.com/OffchainLabs/token-bridge-contracts.git ./ RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From 4197b54121141715155bc0a2c39caf4be5ec3516 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Thu, 28 Mar 2024 18:59:25 +0100 Subject: [PATCH 130/180] Unused --- docker-compose.yaml | 3 --- test-node.bash | 3 --- 2 files changed, 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 27b61677..a93662e7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -161,7 +161,6 @@ services: - "l1keystore:/home/user/l1keystore" - "config:/config" - "tokenbridge-data:/tokenbridge-data" - - "rollupcreator-data:/rollupcreator-data" command: --conf.file /config/sequencer_config.json --node.feed.output.enable --node.feed.output.port 9642 --http.api net,web3,eth,txpool,debug --node.seq-coordinator.my-url ws://sequencer:8548 --graphql.enable --graphql.vhosts * --graphql.corsdomain * depends_on: - geth @@ -351,7 +350,6 @@ services: NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-main} volumes: - "config:/config" - - "rollupcreator-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock volumes: @@ -370,4 +368,3 @@ volumes: config: postgres-data: tokenbridge-data: - rollupcreator-data: diff --git a/test-node.bash b/test-node.bash index ad2737cf..89b3b857 100755 --- a/test-node.bash +++ b/test-node.bash @@ -256,9 +256,6 @@ if $force_build; then fi fi - NITRO_CONTRACTS_BRANCH="testnode-deploy" - export NITRO_CONTRACTS_BRANCH - LOCAL_BUILD_NODES="scripts rollupcreator" if $tokenbridge || $l3_token_bridge; then LOCAL_BUILD_NODES="$LOCAL_BUILD_NODES tokenbridge" From 7d036e6913f13e16bde8d5dee10e03786b60e506 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Fri, 29 Mar 2024 15:26:07 +0800 Subject: [PATCH 131/180] Fix the testnode --- .env | 3 ++- docker-compose.yaml | 19 +++++++++++++++++-- espresso.env | 3 ++- scripts/config.ts | 12 ++++++------ scripts/index.ts | 3 ++- test-node.bash | 12 ++++++------ 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.env b/.env index b1c0e745..70ed3802 100644 --- a/.env +++ b/.env @@ -26,7 +26,8 @@ ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true # A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" -ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=6 +ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 +ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=$ESPRESSO_DEPLOYER_ACCOUNT_INDEX ESPRESSO_COMMITMENT_TASK_PORT=60000 # Example sequencer demo private keys diff --git a/docker-compose.yaml b/docker-compose.yaml index 27b228a4..17777b00 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -439,11 +439,24 @@ services: geth: condition: service_started + deploy-contracts: + image: ghcr.io/espressosystems/espresso-sequencer/deploy:arbitrum-integrationmusl + environment: + - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL + - ESPRESSO_SEQUENCER_L1_PROVIDER + - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC + - ESPRESSO_DEPLOYER_ACCOUNT_INDEX + - RUST_LOG + - RUST_LOG_FORMAT + - ASYNC_STD_THREAD_COUNT + depends_on: + orchestrator: + condition: service_healthy + commitment-task: image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:arbitrum-integrationmusl ports: - "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT" - command: commitment-task --deploy env_file: - espresso.env environment: @@ -452,7 +465,7 @@ services: - ESPRESSO_COMMITMENT_TASK_PORT - ESPRESSO_SEQUENCER_URL - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG + - ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS - RUST_LOG - RUST_LOG_FORMAT depends_on: @@ -464,6 +477,8 @@ services: condition: service_healthy geth: condition: service_started + deploy-contracts: + condition: service_completed_successfully state-relay-server: image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main diff --git a/espresso.env b/espresso.env index 0cec9def..d8839db5 100644 --- a/espresso.env +++ b/espresso.env @@ -1 +1,2 @@ -ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x217788c286797d56cd59af5e493f3699c39cbbe8" +ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x75745a1124de342716a94cbdfdea12f4f93d1b80" +ESPRESSO_SEQUENCER_LIGHT_CLIENT_ADDRESS="0xae05733adeebc16f9e7f377c89b6ac7369fc9b07" diff --git a/scripts/config.ts b/scripts/config.ts index 55c9650b..df8b77ed 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -213,7 +213,9 @@ function writeConfigs(argv: any) { "signing-key": "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" }, "wait-for-l1-finality": false - } + }, + "hotshot-url": "", + "light-client-address": "", }, "block-validator": { "validation-server" : { @@ -278,11 +280,7 @@ function writeConfigs(argv: any) { validatorConfig.node.staker["use-smart-contract-wallet"] = true if (argv.espresso) { validatorConfig.node["block-validator"]["espresso"] = true - // If we don't quote the address it is interpreted as a Number. - // The quotes however stick around and make it an invalid address. - // Remove the double quote from the hotshot address. - // There has to be a better way. - validatorConfig.node["block-validator"]["hotshot-address"] = argv["hotshot-address"].replace(/^"(.+(?="$))"$/, '$1') + validatorConfig.node["block-validator"]["hotshot-address"] = argv.hotshotAddress validatorConfig.node["block-validator"]["dangerous"]["reset-block-validation"] = true } let validconfJSON = JSON.stringify(validatorConfig) @@ -311,6 +309,8 @@ function writeConfigs(argv: any) { let posterConfig = JSON.parse(baseConfJSON) if (argv.espresso) { posterConfig.node.feed.input.url.push("ws://sequencer:9642") + posterConfig.node["batch-poster"]["hotshot-url"] = argv.espressoUrl + posterConfig.node["batch-poster"]["light-client-address"] = argv.lightClientAddress } else { posterConfig.node["seq-coordinator"].enable = true } diff --git a/scripts/index.ts b/scripts/index.ts index 6addce48..102456f4 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -34,7 +34,8 @@ async function main() { .options({ espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-sequencer0:50000' }, - hotshotAddress: { sring: true, description: 'address of the HotShot contract', default: '' } + hotshotAddress: { string: true, description: 'address of the HotShot contract', default: '' }, + lightClientAddress: { string: true, description: 'address of the light client contract', default: ''}, }) .command(bridgeFundsCommand) .command(bridgeToL3Command) diff --git a/test-node.bash b/test-node.bash index 4abc69c6..7dbb467e 100755 --- a/test-node.bash +++ b/test-node.bash @@ -32,7 +32,8 @@ tokenbridge=false l3node=false consensusclient=false redundantsequencers=0 -hotShotAddr=0x217788c286797d56cd59af5e493f3699c39cbbe8 +hotShotAddr=0x75745a1124de342716a94cbdfdea12f4f93d1b80 +lightClientAddr=0xae05733adeebc16f9e7f377c89b6ac7369fc9b07 dev_build_nitro=false dev_build_blockscout=false espresso=false @@ -361,10 +362,9 @@ if $force_init; then if $espresso; then echo == Deploying Espresso Contract - echo "" > espresso.env - docker compose up -d commitment-task espresso-sequencer0 espresso-sequencer1 --wait - hotShotAddr=`curl http://localhost:60000/api/hotshot_contract` - echo "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=$hotShotAddr" > espresso.env + docker compose up -d commitment-task deploy-contracts espresso-sequencer0 espresso-sequencer1 --wait + addr=`curl http://localhost:60000/api/hotshot_contract` + echo $addr fi sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` @@ -378,7 +378,7 @@ if $force_init; then docker compose run scripts write-config --simple else echo == Writing configs - docker compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr + docker compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr --light-client-address $lightClientAddr echo == Initializing redis docker compose up --wait redis From 4887ed5a4b86c10e19c4c48b62bbd02754461b64 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Tue, 2 Apr 2024 18:43:44 +0800 Subject: [PATCH 132/180] Remove the espresso.env --- .env | 3 +++ docker-compose.yaml | 2 -- espresso.env | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 espresso.env diff --git a/.env b/.env index 70ed3802..fd2e8159 100644 --- a/.env +++ b/.env @@ -43,3 +43,6 @@ ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aB ESPRESSO_STATE_RELAY_SERVER_PORT=40004 ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3 ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT + +ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x75745a1124de342716a94cbdfdea12f4f93d1b80" +ESPRESSO_SEQUENCER_LIGHT_CLIENT_ADDRESS="0xae05733adeebc16f9e7f377c89b6ac7369fc9b07" diff --git a/docker-compose.yaml b/docker-compose.yaml index 17777b00..1a78ce8a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -457,8 +457,6 @@ services: image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:arbitrum-integrationmusl ports: - "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT" - env_file: - - espresso.env environment: - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX diff --git a/espresso.env b/espresso.env deleted file mode 100644 index d8839db5..00000000 --- a/espresso.env +++ /dev/null @@ -1,2 +0,0 @@ -ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x75745a1124de342716a94cbdfdea12f4f93d1b80" -ESPRESSO_SEQUENCER_LIGHT_CLIENT_ADDRESS="0xae05733adeebc16f9e7f377c89b6ac7369fc9b07" From 7a9528605f78fbc496f0a517973e375eee87d765 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Wed, 17 Apr 2024 16:04:26 +0800 Subject: [PATCH 133/180] Fix the test node --- .env | 48 +++++++++++---- docker-compose.yaml | 145 ++++++++++++++++++++++++++++++++------------ test-node.bash | 2 +- 3 files changed, 145 insertions(+), 50 deletions(-) diff --git a/.env b/.env index fd2e8159..43d927d4 100644 --- a/.env +++ b/.env @@ -7,28 +7,42 @@ RUST_LOG_FORMAT=full L1_BLOCK_TIME_SEC=3 # Internal port inside container -ESPRESSO_WEB_SERVER_PORT=40000 +ESPRESSO_CDN_SERVER_PORT=40000 +ESPRESSO_CDN_SERVER_METRICS_PORT=9090 ESPRESSO_ORCHESTRATOR_PORT=40001 -ESPRESSO_CONSENSUS_SERVER_PORT=40002 -ESPRESSO_DA_SERVER_PORT=40003 -ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:$ESPRESSO_WEB_SERVER_PORT -ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL=http://consensus-server:$ESPRESSO_WEB_SERVER_PORT -ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:$ESPRESSO_ORCHESTRATOR_PORT +ESPRESSO_ORCHESTRATOR_NUM_NODES=2 +ESPRESSO_ORCHESTRATOR_START_DELAY=5s +ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s +ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=50 +ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=1s +ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=2s +ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal-0:${ESPRESSO_CDN_SERVER_PORT} +ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT} ESPRESSO_SEQUENCER_API_PORT=50000 +ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT=42000 ESPRESSO_SEQUENCER1_API_PORT=50001 -ESPRESSO_SEQUENCER_URL=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT +ESPRESSO_SEQUENCER_URL=http://espresso-sequencer0:${ESPRESSO_SEQUENCER_API_PORT} ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer ESPRESSO_SEQUENCER_L1_PORT=8545 ESPRESSO_SEQUENCER_L1_WS_PORT=8546 -ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:$ESPRESSO_SEQUENCER_L1_PORT -ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:$ESPRESSO_SEQUENCER_L1_WS_PORT +ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:${ESPRESSO_SEQUENCER_L1_PORT} +ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:${ESPRESSO_SEQUENCER_L1_WS_PORT} ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true # A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" -ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 -ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=$ESPRESSO_DEPLOYER_ACCOUNT_INDEX +ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f ESPRESSO_COMMITMENT_TASK_PORT=60000 +ESPRESSO_STATE_RELAY_SERVER_PORT=40004 +ESPRESSO_SEQUENCER_DB_PORT=5432 +ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT} + +ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3 + +ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=6 +ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX=6 +ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=6 +ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 # Example sequencer demo private keys ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o @@ -46,3 +60,15 @@ ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_ ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x75745a1124de342716a94cbdfdea12f4f93d1b80" ESPRESSO_SEQUENCER_LIGHT_CLIENT_ADDRESS="0xae05733adeebc16f9e7f377c89b6ac7369fc9b07" + +# Builder service +ESPRESSO_BUILDER_L1_PROVIDER=${ESPRESSO_SEQUENCER_L1_PROVIDER} +ESPRESSO_BUILDER_ETH_MNEMONIC=${ESPRESSO_SEQUENCER_ETH_MNEMONIC} +ESPRESSO_BUILDER_SERVER_PORT=41003 +ESPRESSO_BUILDER_PRIVATE_STAKING_KEY=BLS_SIGNING_KEY~tI9He_sCnEbfEajycUXz9Scfy6ocLr0yL9ceD53s8QPa +ESPRESSO_BUILDER_PRIVATE_STATE_KEY=SCHNORR_SIGNING_KEY~IftHINvgzqcd9agX13HHY3Uhz8vsH46i8soKgV7ZUQV- +ESPRESSO_BUILDER_CHANNEL_CAPACITY=1024 +ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW=0 + +ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0=7000 +ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1=7001 diff --git a/docker-compose.yaml b/docker-compose.yaml index 1a78ce8a..d6f1745e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -342,37 +342,84 @@ services: - "$ESPRESSO_ORCHESTRATOR_PORT:$ESPRESSO_ORCHESTRATOR_PORT" environment: - ESPRESSO_ORCHESTRATOR_PORT - - ESPRESSO_ORCHESTRATOR_NUM_NODES=2 - - ESPRESSO_ORCHESTRATOR_START_DELAY=5s - - ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s - - ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=1 - - ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=0s - - ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=1s + - ESPRESSO_ORCHESTRATOR_NUM_NODES + - ESPRESSO_ORCHESTRATOR_START_DELAY + - ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT + - ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS + - ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME + - ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME - RUST_LOG - RUST_LOG_FORMAT - da-server: - image: ghcr.io/espressosystems/espresso-sequencer/web-server:arbitrum-integrationmusl - ports: - - "$ESPRESSO_DA_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT" + keydb: + image: docker.io/eqalpha/keydb:latest + command: ["--requirepass", "changemeplease!!"] + healthcheck: + # Attempt to PING the database + test: keydb-cli --pass changemeplease!! --raw incr PING + interval: 5s + timeout: 4s + retries: 20 + + # The CDN system's main entry point; where users contact first. + marshal-0: environment: - - ESPRESSO_WEB_SERVER_PORT - - RUST_LOG=error - - RUST_LOG_FORMAT + - RUST_LOG + - ESPRESSO_CDN_SERVER_METRICS_PORT + image: ghcr.io/espressosystems/espresso-sequencer/cdn-marshal:main + command: + - cdn-marshal + - -d + - redis://:changemeplease!!@keydb:6379 + - --bind-port + - $ESPRESSO_CDN_SERVER_PORT + - --metrics-enabled + - --metrics-port + - $ESPRESSO_CDN_SERVER_METRICS_PORT depends_on: - orchestrator: + keydb: condition: service_healthy - consensus-server: - image: ghcr.io/espressosystems/espresso-sequencer/web-server:arbitrum-integrationmusl - ports: - - "$ESPRESSO_CONSENSUS_SERVER_PORT:$ESPRESSO_WEB_SERVER_PORT" + # A broker is the main message-routing unit of the CDN + broker-0: environment: - - ESPRESSO_WEB_SERVER_PORT - - RUST_LOG=error - - RUST_LOG_FORMAT + - RUST_LOG + - ESPRESSO_CDN_SERVER_METRICS_PORT + image: ghcr.io/espressosystems/espresso-sequencer/cdn-broker:main + command: + - cdn-broker + - -d + - redis://:changemeplease!!@keydb:6379 + - --public-advertise-address + - broker-0:1738 + - --private-advertise-address + - broker-0:1739 + - --metrics-enabled + - --metrics-port + - $ESPRESSO_CDN_SERVER_METRICS_PORT depends_on: - orchestrator: + keydb: + condition: service_healthy + + # A broker is the main message-routing unit of the CDN + broker-1: + environment: + - RUST_LOG + - ESPRESSO_CDN_SERVER_METRICS_PORT + image: ghcr.io/espressosystems/espresso-sequencer/cdn-broker:main + command: + - cdn-broker + - -d + - redis://:changemeplease!!@keydb:6379 + - --public-advertise-address + - broker-1:1738 + - --private-advertise-address + - broker-1:1739 + - --metrics-enabled + - --metrics-port + - $ESPRESSO_CDN_SERVER_METRICS_PORT + depends_on: + keydb: condition: service_healthy espresso-sequencer0: @@ -383,14 +430,15 @@ services: command: sequencer -- http -- query -- status -- submit environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_SEQUENCER_DA_SERVER_URL - - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL + - ESPRESSO_SEQUENCER_CDN_ENDPOINT - ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0 - - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 + - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0 + - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 + - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 - ESPRESSO_STATE_RELAY_SERVER_URL - ESPRESSO_SEQUENCER_ETH_MNEMONIC - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX @@ -401,9 +449,13 @@ services: depends_on: orchestrator: condition: service_healthy - consensus-server: + sequencer-db: + condition: service_healthy + broker-0: condition: service_healthy - da-server: + broker-1: + condition: service_healthy + marshal-0: condition: service_healthy geth: condition: service_started @@ -415,26 +467,31 @@ services: # Run the API server (with options taken from the environment) environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_SEQUENCER_DA_SERVER_URL - - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL + - ESPRESSO_SEQUENCER_CDN_ENDPOINT - ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1 - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 + - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 + - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer1:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 - ESPRESSO_SEQUENCER_ETH_MNEMONIC - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - RUST_LOG - RUST_LOG_FORMAT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT depends_on: orchestrator: condition: service_healthy - consensus-server: + sequencer-db: condition: service_healthy - da-server: + broker-0: + condition: service_healthy + broker-1: + condition: service_healthy + marshal-0: condition: service_healthy geth: condition: service_started @@ -469,10 +526,6 @@ services: depends_on: espresso-sequencer0: condition: service_healthy - consensus-server: - condition: service_healthy - da-server: - condition: service_healthy geth: condition: service_started deploy-contracts: @@ -488,6 +541,22 @@ services: - RUST_LOG - RUST_LOG_FORMAT + sequencer-db: + image: postgres + user: postgres + ports: + - "$ESPRESSO_SEQUENCER_DB_PORT:5432" + environment: + - POSTGRES_PASSWORD=password + - POSTGRES_USER=root + healthcheck: + # Postgres can be falsely "ready" once before running init scripts. + # See https://github.com/docker-library/postgres/issues/146 for discussion. + test: "pg_isready && sleep 1 && pg_isready" + interval: 5s + timeout: 4s + retries: 20 + volumes: l1data: diff --git a/test-node.bash b/test-node.bash index 7dbb467e..32a81a48 100755 --- a/test-node.bash +++ b/test-node.bash @@ -250,7 +250,7 @@ if $blockscout; then NODES="$NODES blockscout" fi if $espresso; then - NODES="$NODES orchestrator da-server consensus-server espresso-sequencer0 espresso-sequencer1 commitment-task" + NODES="$NODES orchestrator espresso-sequencer0 espresso-sequencer1 commitment-task" fi if $force_build; then From 49e72538df9b0387a30873c37be63a33d088815d Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 17 Apr 2024 10:00:17 -0500 Subject: [PATCH 134/180] Add builder to docker-compose --- .env | 1 + docker-compose.yaml | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/.env b/.env index 43d927d4..f6b56117 100644 --- a/.env +++ b/.env @@ -69,6 +69,7 @@ ESPRESSO_BUILDER_PRIVATE_STAKING_KEY=BLS_SIGNING_KEY~tI9He_sCnEbfEajycUXz9Scfy6o ESPRESSO_BUILDER_PRIVATE_STATE_KEY=SCHNORR_SIGNING_KEY~IftHINvgzqcd9agX13HHY3Uhz8vsH46i8soKgV7ZUQV- ESPRESSO_BUILDER_CHANNEL_CAPACITY=1024 ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW=0 +BUILDER_ADDRESS=0x23618e81e3f5cdf7f54c3d65f7fbc0abf5b21e8f ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0=7000 ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1=7001 diff --git a/docker-compose.yaml b/docker-compose.yaml index d6f1745e..a964ba9a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -557,6 +557,27 @@ services: timeout: 4s retries: 20 + permissionless-builder: + image: ghcr.io/espressosystems/espresso-sequencer/permissionless-builder:main + ports: + - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" + environment: + - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_URL=http://sequencer0:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT + - ESPRESSO_SEQUENCER_STATE_PEERS=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_BUILDER_PRIVATE_STAKING_KEY + - ESPRESSO_BUILDER_PRIVATE_STATE_KEY + - ESPRESSO_BUILDER_ETH_MNEMONIC + - ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX + - ESPRESSO_BUILDER_L1_PROVIDER + - ESPRESSO_BUILDER_SERVER_PORT + - ESPRESSO_BUILDER_CHANNEL_CAPACITY + - ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW + - RUST_LOG + - RUST_LOG_FORMAT + - ASYNC_STD_THREAD_COUNT + depends_on: + sequencer0: + condition: service_healthy volumes: l1data: From 9aaaf297473ed99931918d3b57f7697cae54ed86 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Thu, 18 Apr 2024 10:00:46 +0800 Subject: [PATCH 135/180] start builder --- docker-compose.yaml | 6 +++--- test-node.bash | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a964ba9a..471eb560 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -562,8 +562,8 @@ services: ports: - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" environment: - - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_URL=http://sequencer0:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_URL=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_BUILDER_PRIVATE_STAKING_KEY - ESPRESSO_BUILDER_PRIVATE_STATE_KEY - ESPRESSO_BUILDER_ETH_MNEMONIC @@ -576,7 +576,7 @@ services: - RUST_LOG_FORMAT - ASYNC_STD_THREAD_COUNT depends_on: - sequencer0: + espresso-sequencer0: condition: service_healthy volumes: diff --git a/test-node.bash b/test-node.bash index 32a81a48..78b41c1e 100755 --- a/test-node.bash +++ b/test-node.bash @@ -250,7 +250,7 @@ if $blockscout; then NODES="$NODES blockscout" fi if $espresso; then - NODES="$NODES orchestrator espresso-sequencer0 espresso-sequencer1 commitment-task" + NODES="$NODES orchestrator espresso-sequencer0 espresso-sequencer1 commitment-task permissionless-builder" fi if $force_build; then From 318edb3d4f1aa05f90cef80a08474e191212f8d6 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Thu, 18 Apr 2024 10:36:35 +0800 Subject: [PATCH 136/180] Fix builder image --- docker-compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 471eb560..79a33a91 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -426,8 +426,9 @@ services: image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" + - "$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query -- status -- submit + command: sequencer -- http -- query -- status -- submit -- hotshot-events environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_CDN_ENDPOINT @@ -558,7 +559,7 @@ services: retries: 20 permissionless-builder: - image: ghcr.io/espressosystems/espresso-sequencer/permissionless-builder:main + image: ghcr.io/espressosystems/espresso-sequencer/builder:main ports: - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" environment: From c6495fc787a80685fedb2f24645131439c08c385 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Thu, 18 Apr 2024 17:16:36 +0800 Subject: [PATCH 137/180] Update builder image --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 79a33a91..77912b8f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -559,7 +559,7 @@ services: retries: 20 permissionless-builder: - image: ghcr.io/espressosystems/espresso-sequencer/builder:main + image: ghcr.io/espressosystems/espresso-sequencer/builder:ma-builder-ecdsa-signature ports: - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" environment: From f82e25c80ad947b616c9db8e9df689e4a1c83cb3 Mon Sep 17 00:00:00 2001 From: Diego Ximenes Date: Thu, 18 Apr 2024 21:30:51 -0300 Subject: [PATCH 138/180] fix relay service --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b84101e1..ee8eb4b9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -320,8 +320,8 @@ services: image: nitro-node-dev-testnode ports: - "127.0.0.1:9652:9652" - entrypoint: bin/relay - command: --node.feed.output.port 9652 --node.feed.input.url ws://sequencer:9652 + entrypoint: /usr/local/bin/relay + command: --chain.id 412346 --node.feed.input.url ws://sequencer:9642 --node.feed.output.port 9652 tokenbridge: depends_on: From 6172c4d43032ed63cef53e10f51fc74fc45b58fa Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 19 Apr 2024 15:55:24 -0600 Subject: [PATCH 139/180] update nitro version --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index a48c61ff..440aea7f 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.2-8f33fea-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` From a2bad35144d935cf1406572c7ef8050076070c70 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 19 Apr 2024 15:55:48 -0600 Subject: [PATCH 140/180] add init-force option that isn't interactive --- test-node.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test-node.bash b/test-node.bash index 440aea7f..1e8506a6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -54,6 +54,10 @@ while [[ $# -gt 0 ]]; do fi shift ;; + --init-force) + force_init=true + shift + ;; --dev) simple=false shift From b493760ae38f5fb38e0392638877be04b5f24a5c Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 19 Apr 2024 15:56:36 -0600 Subject: [PATCH 141/180] fix ci script --- .github/workflows/testnode.bash | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 258a47c6..29525cb0 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -3,10 +3,9 @@ # until send-l2 succeeds. # Start the test node and get PID, to terminate it once send-l2 is done. -${GITHUB_WORKSPACE}/test-node.bash --init > output.log 2>&1 & -PID=$! +cd ${GITHUB_WORKSPACE} -sleep 5m +./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0 @@ -29,11 +28,10 @@ while true; do sleep 10 done -# Shut down the test node and wait for it to terminate. -kill $PID -wait $PID +docker-compose stop if [ "$SUCCEDED" -eq 0 ]; then + docker-compose logs exit 1 fi From c258219d9db16f52639d2ae19d5f6f66e690e5a1 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 11:15:42 +0200 Subject: [PATCH 142/180] Separate checkout step --- rollupcreator/Dockerfile | 3 ++- tokenbridge/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index 51f012e8..17b065a9 100644 --- a/rollupcreator/Dockerfile +++ b/rollupcreator/Dockerfile @@ -3,7 +3,8 @@ ARG NITRO_CONTRACTS_BRANCH=main RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential curl jq WORKDIR /workspace -RUN git clone -b ${NITRO_CONTRACTS_BRANCH} https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN git clone --no-checkout https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN git checkout ${NITRO_CONTRACTS_BRANCH} RUN curl -L https://foundry.paradigm.xyz | bash ENV PATH="${PATH}:/root/.foundry/bin" RUN foundryup diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index ed53eae2..3d8cbacb 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -3,7 +3,8 @@ ARG TOKEN_BRIDGE_BRANCH=main RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential WORKDIR /workspace -RUN git clone -b ${TOKEN_BRIDGE_BRANCH} https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone --no-checkout https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git checkout ${TOKEN_BRIDGE_BRANCH} RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From fb6eac390df36ff432051019197f32cc2b303865 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 11:34:14 +0200 Subject: [PATCH 143/180] Disable blobs --- scripts/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index 2efba172..23ecff4f 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -182,7 +182,7 @@ function writeConfigs(argv: any) { "sequencer": false, "dangerous": { "no-sequencer-coordinator": false, - // "disable-blob-reader": true, + "disable-blob-reader": true, }, "delayed-sequencer": { "enable": false From 2d516bcf547eb762d916bc724cb5c838cf6c8ffd Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 12:50:48 +0200 Subject: [PATCH 144/180] Temporary use custom nitro-contracts branch 'e2e-to-ci' 'e2e-to-ci' implements support for testnode to use custom nitro-contracts branches Once 'e2e-to-ci' is in master, 'NITRO_CONTRACTS_BRANCH' env var can be removed from CI --- .github/workflows/testnode.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 29525cb0..1ebfd6af 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -5,7 +5,8 @@ # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} -./test-node.bash --init-force --detach +# TODO once e2e-to-ci is merged into master, remove the NITRO_CONTRACTS_BRANCH env var +NITRO_CONTRACTS_BRANCH=e2e-to-ci ./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0 From 8f9881cadad437a4c52e6fe839907e81ab15271a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 13:19:50 +0200 Subject: [PATCH 145/180] Use nitro-contract's develop temporary --- .github/workflows/testnode.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 1ebfd6af..9ce69348 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -5,8 +5,8 @@ # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} -# TODO once e2e-to-ci is merged into master, remove the NITRO_CONTRACTS_BRANCH env var -NITRO_CONTRACTS_BRANCH=e2e-to-ci ./test-node.bash --init-force --detach +# TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var +NITRO_CONTRACTS_BRANCH=develop ./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0 From 138c4d1ff38b46a52ce3d2c32cfc1e1c7c50a120 Mon Sep 17 00:00:00 2001 From: Diego Ximenes Date: Thu, 25 Apr 2024 11:50:08 -0300 Subject: [PATCH 146/180] enable poster's output feed --- docker-compose.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ee8eb4b9..f72973d2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -229,11 +229,12 @@ services: ports: - "127.0.0.1:8147:8547" - "127.0.0.1:8148:8548" + - "127.0.0.1:9800:9800" volumes: - "poster-data:/home/user/.arbitrum/local/nitro" - "l1keystore:/home/user/l1keystore" - "config:/config" - command: --conf.file /config/poster_config.json + command: --conf.file /config/poster_config.json --node.feed.output.enable --node.feed.output.port 9800 depends_on: - geth - redis From 04ada288994aed98abbbdb9fe9c60b5493e77c96 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 26 Apr 2024 14:33:23 +0200 Subject: [PATCH 147/180] Set default contracts versions in the test-node.bash --- docker-compose.yaml | 4 ++-- test-node.bash | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a93662e7..3d4ad9b9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -331,7 +331,7 @@ services: build: context: tokenbridge/ args: - TOKEN_BRIDGE_BRANCH: ${TOKEN_BRIDGE_BRANCH:-main} + TOKEN_BRIDGE_BRANCH: ${TOKEN_BRIDGE_BRANCH:-} environment: - ARB_URL=http://sequencer:8547 - ETH_URL=http://geth:8545 @@ -347,7 +347,7 @@ services: build: context: rollupcreator/ args: - NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-main} + NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-} volumes: - "config:/config" - /var/run/docker.sock:/var/run/docker.sock diff --git a/test-node.bash b/test-node.bash index 79fd3006..8776d451 100755 --- a/test-node.bash +++ b/test-node.bash @@ -5,6 +5,20 @@ set -e NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 +# This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. +# Once v1.2.2 is released, we can switch to that version. +DEFAULT_NITRO_CONTRACTS_VERSION="2e8eeb9f28104465de0557851aa7607b037cafcf" +DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1" + +# Set default versions if not overriden by provided env vars +: ${NITRO_CONTRACTS_BRANCH:=$DEFAULT_NITRO_CONTRACTS_VERSION} +: ${TOKEN_BRIDGE_BRANCH:=$DEFAULT_TOKEN_BRIDGE_VERSION} +export NITRO_CONTRACTS_BRANCH +export TOKEN_BRIDGE_BRANCH + +echo "Using NITRO_CONTRACTS_BRANCH: $NITRO_CONTRACTS_BRANCH" +echo "Using TOKEN_BRIDGE_BRANCH: $TOKEN_BRIDGE_BRANCH" + mydir=`dirname $0` cd "$mydir" From 5efefbedde2febc602c89dedeb71cfb601f285a1 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Fri, 26 Apr 2024 14:58:25 +0200 Subject: [PATCH 148/180] Use default version --- .github/workflows/testnode.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 9ce69348..b6d1f596 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -6,7 +6,7 @@ cd ${GITHUB_WORKSPACE} # TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var -NITRO_CONTRACTS_BRANCH=develop ./test-node.bash --init-force --detach +./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0 From c88e2ed9fce3ef1c4baf814f1c95ca7ad44bf55c Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 6 May 2024 19:20:47 -0600 Subject: [PATCH 149/180] update blockscout pin --- blockscout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockscout b/blockscout index c8db5b1b..8419b9c5 160000 --- a/blockscout +++ b/blockscout @@ -1 +1 @@ -Subproject commit c8db5b1bb99b31f7348e6f760ba6dd22643c725a +Subproject commit 8419b9c5a47ec165c8892fa8ba48689fc0b163af From 6521bcd816ce7e295c191d5a0ed3aa134f4c519e Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Tue, 7 May 2024 10:02:32 +0800 Subject: [PATCH 150/180] Update the docker compose --- docker-compose.yaml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 77912b8f..016ea4f3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -371,11 +371,10 @@ services: - cdn-marshal - -d - redis://:changemeplease!!@keydb:6379 - - --bind-port + - -b - $ESPRESSO_CDN_SERVER_PORT - - --metrics-enabled - - --metrics-port - - $ESPRESSO_CDN_SERVER_METRICS_PORT + - -m + - 0.0.0.0:$ESPRESSO_CDN_SERVER_METRICS_PORT depends_on: keydb: condition: service_healthy @@ -390,13 +389,12 @@ services: - cdn-broker - -d - redis://:changemeplease!!@keydb:6379 - - --public-advertise-address + - --public-advertise-endpoint - broker-0:1738 - - --private-advertise-address + - --private-advertise-endpoint - broker-0:1739 - - --metrics-enabled - - --metrics-port - - $ESPRESSO_CDN_SERVER_METRICS_PORT + - -m + - 0.0.0.0:$ESPRESSO_CDN_SERVER_METRICS_PORT depends_on: keydb: condition: service_healthy @@ -411,13 +409,12 @@ services: - cdn-broker - -d - redis://:changemeplease!!@keydb:6379 - - --public-advertise-address + - --public-advertise-endpoint - broker-1:1738 - - --private-advertise-address + - --private-advertise-endpoint - broker-1:1739 - - --metrics-enabled - - --metrics-port - - $ESPRESSO_CDN_SERVER_METRICS_PORT + - -m + - 0.0.0.0:$ESPRESSO_CDN_SERVER_METRICS_PORT depends_on: keydb: condition: service_healthy From bbbb3a918a45cd2d95fc557f310fdb5bd733df78 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Tue, 7 May 2024 19:51:59 +0800 Subject: [PATCH 151/180] Use the latest version of espresso images --- .env | 10 +++++++--- docker-compose.yaml | 48 +++++++++++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.env b/.env index f6b56117..e89fa99d 100644 --- a/.env +++ b/.env @@ -6,16 +6,20 @@ RUST_LOG_FORMAT=full L1_BLOCK_TIME_SEC=3 +# Parallelism config +# Since we have many processes using async-std, limit them to one thread each to keep the CPU +# requirements for the local demo down. +ASYNC_STD_THREAD_COUNT=1 + # Internal port inside container ESPRESSO_CDN_SERVER_PORT=40000 ESPRESSO_CDN_SERVER_METRICS_PORT=9090 ESPRESSO_ORCHESTRATOR_PORT=40001 ESPRESSO_ORCHESTRATOR_NUM_NODES=2 +ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb +ESPRESSO_SEQUENCER_BASE_FEE=1 ESPRESSO_ORCHESTRATOR_START_DELAY=5s ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s -ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=50 -ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=1s -ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=2s ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal-0:${ESPRESSO_CDN_SERVER_PORT} ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT} ESPRESSO_SEQUENCER_API_PORT=50000 diff --git a/docker-compose.yaml b/docker-compose.yaml index 016ea4f3..2cb2dad4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -337,19 +337,19 @@ services: - /var/run/docker.sock:/var/run/docker.sock orchestrator: - image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:arbitrum-integrationmusl + image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main ports: - "$ESPRESSO_ORCHESTRATOR_PORT:$ESPRESSO_ORCHESTRATOR_PORT" environment: + - ESPRESSO_ORCHESTRATOR_BUILDER_URL=http://permissionless-builder:$ESPRESSO_BUILDER_SERVER_PORT - ESPRESSO_ORCHESTRATOR_PORT - ESPRESSO_ORCHESTRATOR_NUM_NODES - ESPRESSO_ORCHESTRATOR_START_DELAY - ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT - - ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS - - ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME - - ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME + - ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT - RUST_LOG - RUST_LOG_FORMAT + - ASYNC_STD_THREAD_COUNT keydb: image: docker.io/eqalpha/keydb:latest @@ -420,30 +420,32 @@ services: condition: service_healthy espresso-sequencer0: - image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl + image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - "$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query -- status -- submit -- hotshot-events + command: sequencer -- http -- query -- catchup -- status -- submit -- hotshot-events environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_CDN_ENDPOINT - ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer1:$ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_PROVIDER + - ESPRESSO_STATE_RELAY_SERVER_URL - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0 - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0 - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 - - ESPRESSO_STATE_RELAY_SERVER_URL - - ESPRESSO_SEQUENCER_ETH_MNEMONIC - - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer1:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE + - ESPRESSO_SEQUENCER_BASE_FEE + - ESPRESSO_SEQUENCER_IS_DA=true - RUST_LOG - RUST_LOG_FORMAT + - ASYNC_STD_THREAD_COUNT depends_on: orchestrator: condition: service_healthy @@ -459,27 +461,34 @@ services: condition: service_started espresso-sequencer1: - image: ghcr.io/espressosystems/espresso-sequencer/sequencer:arbitrum-integrationmusl + image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main ports: - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" + command: sequencer -- storage-sql -- http -- query -- catchup -- state # Run the API server (with options taken from the environment) environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_CDN_ENDPOINT - ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STORAGE_PATH + - ESPRESSO_SEQUENCER_API_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db + - ESPRESSO_SEQUENCER_POSTGRES_USER=root + - ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password + - ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer - ESPRESSO_SEQUENCER_L1_PROVIDER + - ESPRESSO_STATE_RELAY_SERVER_URL - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1 - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer1:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 - - ESPRESSO_SEQUENCER_ETH_MNEMONIC - - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE + - ESPRESSO_SEQUENCER_BASE_FEE + - ESPRESSO_SEQUENCER_IS_DA=true - RUST_LOG - RUST_LOG_FORMAT + - ASYNC_STD_THREAD_COUNT depends_on: orchestrator: condition: service_healthy @@ -495,7 +504,7 @@ services: condition: service_started deploy-contracts: - image: ghcr.io/espressosystems/espresso-sequencer/deploy:arbitrum-integrationmusl + image: ghcr.io/espressosystems/espresso-sequencer/deploy:main environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_L1_PROVIDER @@ -509,7 +518,7 @@ services: condition: service_healthy commitment-task: - image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:arbitrum-integrationmusl + image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main ports: - "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT" environment: @@ -547,6 +556,7 @@ services: environment: - POSTGRES_PASSWORD=password - POSTGRES_USER=root + - POSTGRES_DB=sequencer healthcheck: # Postgres can be falsely "ready" once before running init scripts. # See https://github.com/docker-library/postgres/issues/146 for discussion. @@ -556,7 +566,7 @@ services: retries: 20 permissionless-builder: - image: ghcr.io/espressosystems/espresso-sequencer/builder:ma-builder-ecdsa-signature + image: ghcr.io/espressosystems/espresso-sequencer/builder:main ports: - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" environment: From b42aae0ae353039edc8dd531556394b5d94270a7 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Wed, 8 May 2024 15:12:39 +0200 Subject: [PATCH 152/180] Bump default nitro-contracts version to include fix for a blocker Fix: https://github.com/OffchainLabs/nitro-contracts/commit/a00d2faac01e050339ff7b0ac5bc91df06e8dbff --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 8776d451..0b5f3d85 100755 --- a/test-node.bash +++ b/test-node.bash @@ -7,7 +7,7 @@ BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. # Once v1.2.2 is released, we can switch to that version. -DEFAULT_NITRO_CONTRACTS_VERSION="2e8eeb9f28104465de0557851aa7607b037cafcf" +DEFAULT_NITRO_CONTRACTS_VERSION="a00d2faac01e050339ff7b0ac5bc91df06e8dbff" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1" # Set default versions if not overriden by provided env vars From 11cff6f852be98d07dd4a44c79b807454c98b78a Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 8 May 2024 10:43:58 -0500 Subject: [PATCH 153/180] set max_block_size to 10kb Sequencer expects a u64. --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index e89fa99d..29ecc664 100644 --- a/.env +++ b/.env @@ -16,7 +16,7 @@ ESPRESSO_CDN_SERVER_PORT=40000 ESPRESSO_CDN_SERVER_METRICS_PORT=9090 ESPRESSO_ORCHESTRATOR_PORT=40001 ESPRESSO_ORCHESTRATOR_NUM_NODES=2 -ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb +ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10240 ESPRESSO_SEQUENCER_BASE_FEE=1 ESPRESSO_ORCHESTRATOR_START_DELAY=5s ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s From ea8c45026d58c8f077e1b5586a051dbe53c593be Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 8 May 2024 13:45:44 -0500 Subject: [PATCH 154/180] Revert "set max_block_size to 10kb" This reverts commit 11cff6f852be98d07dd4a44c79b807454c98b78a. --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 29ecc664..e89fa99d 100644 --- a/.env +++ b/.env @@ -16,7 +16,7 @@ ESPRESSO_CDN_SERVER_PORT=40000 ESPRESSO_CDN_SERVER_METRICS_PORT=9090 ESPRESSO_ORCHESTRATOR_PORT=40001 ESPRESSO_ORCHESTRATOR_NUM_NODES=2 -ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10240 +ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb ESPRESSO_SEQUENCER_BASE_FEE=1 ESPRESSO_ORCHESTRATOR_START_DELAY=5s ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s From 410c13c798dd0fb3d9edc9b50b668d9f24ea664b Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Fri, 10 May 2024 13:53:42 +0800 Subject: [PATCH 155/180] Update docker compose file and env --- .env | 36 +++++------ docker-compose.yaml | 141 +++++++++++++++++++++++++++++--------------- 2 files changed, 113 insertions(+), 64 deletions(-) diff --git a/.env b/.env index e89fa99d..e6948384 100644 --- a/.env +++ b/.env @@ -16,14 +16,16 @@ ESPRESSO_CDN_SERVER_PORT=40000 ESPRESSO_CDN_SERVER_METRICS_PORT=9090 ESPRESSO_ORCHESTRATOR_PORT=40001 ESPRESSO_ORCHESTRATOR_NUM_NODES=2 -ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb -ESPRESSO_SEQUENCER_BASE_FEE=1 ESPRESSO_ORCHESTRATOR_START_DELAY=5s ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s +ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT=2s ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal-0:${ESPRESSO_CDN_SERVER_PORT} ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT} ESPRESSO_SEQUENCER_API_PORT=50000 ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT=42000 +ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb +ESPRESSO_SEQUENCER_BASE_FEE=0 +ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT=42000 ESPRESSO_SEQUENCER1_API_PORT=50001 ESPRESSO_SEQUENCER_URL=http://espresso-sequencer0:${ESPRESSO_SEQUENCER_API_PORT} ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer @@ -31,7 +33,6 @@ ESPRESSO_SEQUENCER_L1_PORT=8545 ESPRESSO_SEQUENCER_L1_WS_PORT=8546 ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:${ESPRESSO_SEQUENCER_L1_PORT} ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:${ESPRESSO_SEQUENCER_L1_WS_PORT} -ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true # A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" @@ -41,13 +42,20 @@ ESPRESSO_STATE_RELAY_SERVER_PORT=40004 ESPRESSO_SEQUENCER_DB_PORT=5432 ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT} -ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3 +ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=1 +# Ethereum accounts (note 11-15 are used by the sequencer nodes) ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=6 ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX=6 +ESPRESSO_SEQUENCER_STATE_PROVER_ACCOUNT_INDEX=6 ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=6 ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 +# Conctracts +ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=0x217788c286797d56cd59af5e493f3699c39cbbe8 +ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0xb075b82c7a23e0994df4793422a1f03dbcf9136f +ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS=$ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS + # Example sequencer demo private keys ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83 @@ -55,25 +63,19 @@ ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=SCHNORR_SIGNING_KEY~XxPSER8Vh3nFj_m7cUQ--96JfKrycrSKyRQximkQigCo ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=SCHNORR_SIGNING_KEY~2NpKtvY5F0u1LWgYws-JeX1vDdp5CfECuaMMYxyz4gDM -ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=8 -ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f - -ESPRESSO_STATE_RELAY_SERVER_PORT=40004 -ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3 -ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT - -ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS="0x75745a1124de342716a94cbdfdea12f4f93d1b80" -ESPRESSO_SEQUENCER_LIGHT_CLIENT_ADDRESS="0xae05733adeebc16f9e7f377c89b6ac7369fc9b07" - # Builder service ESPRESSO_BUILDER_L1_PROVIDER=${ESPRESSO_SEQUENCER_L1_PROVIDER} ESPRESSO_BUILDER_ETH_MNEMONIC=${ESPRESSO_SEQUENCER_ETH_MNEMONIC} ESPRESSO_BUILDER_SERVER_PORT=41003 -ESPRESSO_BUILDER_PRIVATE_STAKING_KEY=BLS_SIGNING_KEY~tI9He_sCnEbfEajycUXz9Scfy6ocLr0yL9ceD53s8QPa -ESPRESSO_BUILDER_PRIVATE_STATE_KEY=SCHNORR_SIGNING_KEY~IftHINvgzqcd9agX13HHY3Uhz8vsH46i8soKgV7ZUQV- ESPRESSO_BUILDER_CHANNEL_CAPACITY=1024 ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW=0 -BUILDER_ADDRESS=0x23618e81e3f5cdf7f54c3d65f7fbc0abf5b21e8f +ESPRESSO_BUILDER_WEBSERVER_RESPONSE_TIMEOUT_DURATION=1s +ESPRESSO_BUILDER_BUFFER_VIEW_NUM_COUNT=15 +ESPRESSO_BUILDER_INIT_NODE_COUNT=$ESPRESSO_ORCHESTRATOR_NUM_NODES ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0=7000 ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1=7001 + +# Prover service +ESPRESSO_PROVER_SERVICE_PORT=60001 +ESPRESSO_STATE_PROVER_UPDATE_INTERVAL=30s diff --git a/docker-compose.yaml b/docker-compose.yaml index 2cb2dad4..8bfb726f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -336,6 +336,24 @@ services: - "tokenbridge-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock + deploy-contracts: + command: deploy --use-mock-contract + image: ghcr.io/espressosystems/espresso-sequencer/deploy:main + environment: + - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL + - ESPRESSO_SEQUENCER_L1_PROVIDER + - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 + - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC + - ESPRESSO_DEPLOYER_ACCOUNT_INDEX + - RUST_LOG + - RUST_LOG_FORMAT + - ASYNC_STD_THREAD_COUNT + depends_on: + orchestrator: + condition: service_healthy + extra_hosts: + - "host.docker.internal:host-gateway" + orchestrator: image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main ports: @@ -349,8 +367,34 @@ services: - ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT - RUST_LOG - RUST_LOG_FORMAT + + permissionless-builder: + image: ghcr.io/espressosystems/espresso-sequencer/builder:main + ports: + - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" + environment: + - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_URL=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT + - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE + - ESPRESSO_BUILDER_ETH_MNEMONIC + - ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX + - ESPRESSO_BUILDER_L1_PROVIDER + - ESPRESSO_BUILDER_SERVER_PORT + - ESPRESSO_BUILDER_CHANNEL_CAPACITY + - ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW + - ESPRESSO_BUILDER_WEBSERVER_RESPONSE_TIMEOUT_DURATION + - ESPRESSO_BUILDER_BUFFER_VIEW_NUM_COUNT + - ESPRESSO_BUILDER_INIT_NODE_COUNT + - RUST_LOG + - RUST_LOG_FORMAT - ASYNC_STD_THREAD_COUNT + depends_on: + espresso-sequencer0: + condition: service_healthy + + # We use KeyDB (a Redis variant) to maintain consistency between + # different parts of the CDN keydb: image: docker.io/eqalpha/keydb:latest command: ["--requirepass", "changemeplease!!"] @@ -361,7 +405,6 @@ services: timeout: 4s retries: 20 - # The CDN system's main entry point; where users contact first. marshal-0: environment: - RUST_LOG @@ -379,7 +422,6 @@ services: keydb: condition: service_healthy - # A broker is the main message-routing unit of the CDN broker-0: environment: - RUST_LOG @@ -405,7 +447,7 @@ services: - RUST_LOG - ESPRESSO_CDN_SERVER_METRICS_PORT image: ghcr.io/espressosystems/espresso-sequencer/cdn-broker:main - command: + command: - cdn-broker - -d - redis://:changemeplease!!@keydb:6379 @@ -423,34 +465,41 @@ services: image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - - "$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT" # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- http -- query -- catchup -- status -- submit -- hotshot-events + command: sequencer -- storage-sql -- http -- query -- submit -- status -- state -- hotshot-events environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_CDN_ENDPOINT - ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer1:$ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_PROVIDER - ESPRESSO_STATE_RELAY_SERVER_URL - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0 + - ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db + - ESPRESSO_SEQUENCER_POSTGRES_USER=root + - ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password + - ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0 - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX + - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer1:$ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE - ESPRESSO_SEQUENCER_BASE_FEE - ESPRESSO_SEQUENCER_IS_DA=true - RUST_LOG - RUST_LOG_FORMAT - - ASYNC_STD_THREAD_COUNT depends_on: orchestrator: condition: service_healthy sequencer-db: condition: service_healthy + state-relay-server: + condition: service_healthy broker-0: condition: service_healthy broker-1: @@ -459,63 +508,52 @@ services: condition: service_healthy geth: condition: service_started + extra_hosts: + - "host.docker.internal:host-gateway" espresso-sequencer1: image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main ports: - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - command: sequencer -- storage-sql -- http -- query -- catchup -- state # Run the API server (with options taken from the environment) + command: sequencer -- http environment: - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - ESPRESSO_SEQUENCER_CDN_ENDPOINT - ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_API_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db - - ESPRESSO_SEQUENCER_POSTGRES_USER=root - - ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password - - ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer + - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT + - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_PROVIDER - ESPRESSO_STATE_RELAY_SERVER_URL - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1 - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer1:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 + - ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS + - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 + - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE - ESPRESSO_SEQUENCER_BASE_FEE - ESPRESSO_SEQUENCER_IS_DA=true - RUST_LOG - RUST_LOG_FORMAT - - ASYNC_STD_THREAD_COUNT depends_on: orchestrator: condition: service_healthy sequencer-db: condition: service_healthy + state-relay-server: + condition: service_healthy broker-0: condition: service_healthy broker-1: condition: service_healthy marshal-0: condition: service_healthy - geth: - condition: service_started - - deploy-contracts: - image: ghcr.io/espressosystems/espresso-sequencer/deploy:main - environment: - - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - - ESPRESSO_DEPLOYER_ACCOUNT_INDEX - - RUST_LOG - - RUST_LOG_FORMAT - - ASYNC_STD_THREAD_COUNT - depends_on: - orchestrator: - condition: service_healthy + extra_hosts: + - "host.docker.internal:host-gateway" commitment-task: image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main @@ -533,10 +571,12 @@ services: depends_on: espresso-sequencer0: condition: service_healthy - geth: - condition: service_started + geth: + condition: service_started deploy-contracts: condition: service_completed_successfully + extra_hosts: + - "host.docker.internal:host-gateway" state-relay-server: image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main @@ -565,27 +605,34 @@ services: timeout: 4s retries: 20 - permissionless-builder: - image: ghcr.io/espressosystems/espresso-sequencer/builder:main + prover-service: + image: ghcr.io/espressosystems/espresso-sequencer/prover-service:main ports: - - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" + - "$ESPRESSO_PROVER_SERVICE_PORT:$ESPRESSO_PROVER_SERVICE_PORT" environment: - - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_URL=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_BUILDER_PRIVATE_STAKING_KEY - - ESPRESSO_BUILDER_PRIVATE_STATE_KEY - - ESPRESSO_BUILDER_ETH_MNEMONIC - - ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX - - ESPRESSO_BUILDER_L1_PROVIDER - - ESPRESSO_BUILDER_SERVER_PORT - - ESPRESSO_BUILDER_CHANNEL_CAPACITY - - ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW + - ESPRESSO_STATE_RELAY_SERVER_URL + - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL + - ESPRESSO_STATE_PROVER_UPDATE_INTERVAL + - ESPRESSO_SEQUENCER_L1_PROVIDER + - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC + - RAYON_NUM_THREADS=2 + - ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS + - MNEMONIC=$ESPRESSO_SEQUENCER_ETH_MNEMONIC + - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 + - ESPRESSO_SEQUENCER_STATE_PROVER_ACCOUNT_INDEX - RUST_LOG - RUST_LOG_FORMAT - ASYNC_STD_THREAD_COUNT + - RAYON_NUM_THREADS depends_on: - espresso-sequencer0: + orchestrator: + condition: service_healthy + state-relay-server: condition: service_healthy + deploy-contracts: + condition: service_completed_successfully + extra_hosts: + - "host.docker.internal:host-gateway" volumes: l1data: From a9b73027688cd04aaa842643fb7cc18db8460185 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Fri, 10 May 2024 19:24:19 +0800 Subject: [PATCH 156/180] Fix --- .env | 4 ++-- docker-compose.yaml | 4 ++-- scripts/config.ts | 4 ++-- test-node.bash | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index e6948384..77799b0a 100644 --- a/.env +++ b/.env @@ -52,8 +52,8 @@ ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=6 ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 # Conctracts -ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=0x217788c286797d56cd59af5e493f3699c39cbbe8 -ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0xb075b82c7a23e0994df4793422a1f03dbcf9136f +ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=0x75745a1124de342716a94cbdfdea12f4f93d1b80 +ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0xae05733adeebc16f9e7f377c89b6ac7369fc9b07 ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS=$ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS # Example sequencer demo private keys diff --git a/docker-compose.yaml b/docker-compose.yaml index 8bfb726f..bbb75b09 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -571,8 +571,8 @@ services: depends_on: espresso-sequencer0: condition: service_healthy - geth: - condition: service_started + geth: + condition: service_started deploy-contracts: condition: service_completed_successfully extra_hosts: diff --git a/scripts/config.ts b/scripts/config.ts index df8b77ed..c9f6294c 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -223,7 +223,7 @@ function writeConfigs(argv: any) { "jwtsecret": valJwtSecret, }, "espresso": false, - "hotshot-address": "", + "light-client-address": "", "dangerous": {"reset-block-validation": false}, }, "feed": { @@ -280,7 +280,7 @@ function writeConfigs(argv: any) { validatorConfig.node.staker["use-smart-contract-wallet"] = true if (argv.espresso) { validatorConfig.node["block-validator"]["espresso"] = true - validatorConfig.node["block-validator"]["hotshot-address"] = argv.hotshotAddress + validatorConfig.node["block-validator"]["light-client-address"] = argv.lightClientAddress validatorConfig.node["block-validator"]["dangerous"]["reset-block-validation"] = true } let validconfJSON = JSON.stringify(validatorConfig) diff --git a/test-node.bash b/test-node.bash index 78b41c1e..4b8be37b 100755 --- a/test-node.bash +++ b/test-node.bash @@ -378,7 +378,7 @@ if $force_init; then docker compose run scripts write-config --simple else echo == Writing configs - docker compose run scripts write-config --espresso $espresso --hotshot-address $hotShotAddr --light-client-address $lightClientAddr + docker compose run scripts write-config --espresso $espresso --lightClientAddress $lightClientAddr echo == Initializing redis docker compose up --wait redis From c22fd4bc1e85433f3873ca3015a69854faaa147c Mon Sep 17 00:00:00 2001 From: sveitser Date: Fri, 10 May 2024 14:37:24 +0200 Subject: [PATCH 157/180] Start builder with sequencer nodes Without the builder only empty blocks will be built. --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 4b8be37b..ce2becd0 100755 --- a/test-node.bash +++ b/test-node.bash @@ -362,7 +362,7 @@ if $force_init; then if $espresso; then echo == Deploying Espresso Contract - docker compose up -d commitment-task deploy-contracts espresso-sequencer0 espresso-sequencer1 --wait + docker compose up -d commitment-task deploy-contracts espresso-sequencer0 espresso-sequencer1 permissionless-builder --wait addr=`curl http://localhost:60000/api/hotshot_contract` echo $addr fi From a4263b62eefda81026f3fcee4f959e9d1e328476 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 10 May 2024 16:41:30 +0200 Subject: [PATCH 158/180] Don't use ports in dynamic ports range (#33) Things fails if a local service is already using one of the ports. See https://github.com/EspressoSystems/espresso-sequencer/issues/1194 --- .env | 9 ++++----- scripts/index.ts | 2 +- test-node.bash | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 77799b0a..af0d509a 100644 --- a/.env +++ b/.env @@ -21,12 +21,11 @@ ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT=2s ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal-0:${ESPRESSO_CDN_SERVER_PORT} ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT} -ESPRESSO_SEQUENCER_API_PORT=50000 +ESPRESSO_SEQUENCER_API_PORT=44000 ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT=42000 ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb ESPRESSO_SEQUENCER_BASE_FEE=0 -ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT=42000 -ESPRESSO_SEQUENCER1_API_PORT=50001 +ESPRESSO_SEQUENCER1_API_PORT=44001 ESPRESSO_SEQUENCER_URL=http://espresso-sequencer0:${ESPRESSO_SEQUENCER_API_PORT} ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer ESPRESSO_SEQUENCER_L1_PORT=8545 @@ -37,7 +36,7 @@ ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:${ESPRESSO_SEQUENCER_L1_WS_PORT} ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f -ESPRESSO_COMMITMENT_TASK_PORT=60000 +ESPRESSO_COMMITMENT_TASK_PORT=45000 ESPRESSO_STATE_RELAY_SERVER_PORT=40004 ESPRESSO_SEQUENCER_DB_PORT=5432 ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT} @@ -77,5 +76,5 @@ ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0=7000 ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1=7001 # Prover service -ESPRESSO_PROVER_SERVICE_PORT=60001 +ESPRESSO_PROVER_SERVICE_PORT=40050 ESPRESSO_STATE_PROVER_UPDATE_INTERVAL=30s diff --git a/scripts/index.ts b/scripts/index.ts index 102456f4..03311fea 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -33,7 +33,7 @@ async function main() { .options(stressOptions) .options({ espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, - espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-sequencer0:50000' }, + espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-sequencer0:44000' }, hotshotAddress: { string: true, description: 'address of the HotShot contract', default: '' }, lightClientAddress: { string: true, description: 'address of the light client contract', default: ''}, }) diff --git a/test-node.bash b/test-node.bash index ce2becd0..d1bcd0b5 100755 --- a/test-node.bash +++ b/test-node.bash @@ -363,7 +363,7 @@ if $force_init; then if $espresso; then echo == Deploying Espresso Contract docker compose up -d commitment-task deploy-contracts espresso-sequencer0 espresso-sequencer1 permissionless-builder --wait - addr=`curl http://localhost:60000/api/hotshot_contract` + addr=`curl http://localhost:45000/api/hotshot_contract` echo $addr fi From 74bbb975bb29bbc1ec6c79dc3545977e113e9183 Mon Sep 17 00:00:00 2001 From: Diego Ximenes Date: Thu, 23 May 2024 18:51:54 -0300 Subject: [PATCH 159/180] Revert "enable poster's output feed" This reverts commit 138c4d1ff38b46a52ce3d2c32cfc1e1c7c50a120. --- docker-compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f72973d2..ee8eb4b9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -229,12 +229,11 @@ services: ports: - "127.0.0.1:8147:8547" - "127.0.0.1:8148:8548" - - "127.0.0.1:9800:9800" volumes: - "poster-data:/home/user/.arbitrum/local/nitro" - "l1keystore:/home/user/l1keystore" - "config:/config" - command: --conf.file /config/poster_config.json --node.feed.output.enable --node.feed.output.port 9800 + command: --conf.file /config/poster_config.json depends_on: - geth - redis From b97efc43c62588ea6430627f033700554f4fbe23 Mon Sep 17 00:00:00 2001 From: ariskk Date: Mon, 27 May 2024 12:47:57 +0100 Subject: [PATCH 160/180] Fix typo in --l3node flag in test-node.bash options --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 0b5f3d85..3f0e4ae6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -182,7 +182,7 @@ while [[ $# -gt 0 ]]; do echo --init remove all data, rebuild, deploy new rollup echo --pos l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate heavy computation, validating all blocks in WASM - echo --l3-node deploys an L3 node on top of the L2 + echo --l3node deploys an L3 node on top of the L2 echo --l3-fee-token L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided echo --l3-token-bridge Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided echo --batchposters batch posters [0-3] From 1f83198a8f8b7cdebbd99421c0a1626bb7e9b712 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 11:24:33 -0600 Subject: [PATCH 161/180] use nitro 3.0 and arbos v30 --- scripts/config.ts | 4 ++-- test-node.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 23ecff4f..3fd49ef5 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -344,7 +344,7 @@ function writeL2ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, + "InitialArbOSVersion": 30, "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } @@ -377,7 +377,7 @@ function writeL3ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, + "InitialArbOSVersion": 30, "InitialChainOwner": "0x0000000000000000000000000000000000000000", "GenesisBlockNum": 0 } diff --git a/test-node.bash b/test-node.bash index 0b5f3d85..50041423 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.0-e6f81cb-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. From 014b44e0bfe35d9ead344254fe64ba1ddf66613c Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 11:36:21 -0600 Subject: [PATCH 162/180] update readme for by-default stylus --- README.md | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 45665ca8..e8c3983d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Nitro Testnode -Nitro-testnode brings up a full environment for local nitro testing (with or without Stylus support) including a dev-mode geth L1, and multiple instances with different roles. +Nitro-testnode brings up a full environment for local nitro testing (with Stylus support) including a dev-mode geth L1, and multiple instances with different roles. ### Requirements @@ -11,8 +11,6 @@ All must be installed in PATH. ## Using latest nitro release (recommended) -### Without Stylus support - Check out the release branch of the repository. > Notice: release branch may be force-pushed at any time. @@ -29,30 +27,12 @@ Initialize the node ``` To see more options, use `--help`. -### With Stylus support - -Check out the stylus branch of the repository. -> Notice: stylus branch may be force-pushed at any time. - -```bash -git clone -b stylus --recurse-submodules https://github.com/OffchainLabs/nitro-testnode.git -cd nitro-testnode -``` - -Initialize the node - -```bash -./test-node.bash --init -``` -To see more options, use `--help`. - ## Using current nitro code (local compilation) -Check out the nitro or stylus repository. Use the test-node submodule of nitro repository. +Check out the nitro repository. Use the test-node submodule of nitro repository. > Notice: testnode may not always be up-to-date with config options of current nitro node, and is not considered stable when operated in that way. -### Without Stylus support ```bash git clone --recurse-submodules https://github.com/OffchainLabs/nitro.git cd nitro/nitro-testnode @@ -64,18 +44,6 @@ Initialize the node in dev-mode (this will build the docker images from source) ``` To see more options, use `--help`. -### With Stylus support -```bash -git clone --recurse-submodules https://github.com/OffchainLabs/stylus.git -cd stylus/nitro-testnode -``` - -Initialize the node in dev-mode (this will build the docker images from source) -```bash -./test-node.bash --init --dev -``` -To see more options, use `--help`. - ## Further information ### Working with docker containers From dec82b6c9f4b64e0e2414c55e202b4e9ce849440 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 15:45:57 -0600 Subject: [PATCH 163/180] docker-compose: use nitro entrypoint fort testnode we don't need the split-val entry --- docker-compose.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 12895609..f889cb11 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -152,6 +152,7 @@ services: sequencer: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8547:8547" - "127.0.0.1:8548:8548" @@ -168,6 +169,7 @@ services: sequencer_b: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8647:8547" - "127.0.0.1:8648:8548" @@ -182,6 +184,7 @@ services: sequencer_c: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8747:8547" - "127.0.0.1:8748:8548" @@ -196,6 +199,7 @@ services: sequencer_d: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8847:8547" - "127.0.0.1:8848:8548" @@ -210,6 +214,7 @@ services: staker-unsafe: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8047:8547" - "127.0.0.1:8048:8548" @@ -226,6 +231,7 @@ services: poster: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8147:8547" - "127.0.0.1:8148:8548" @@ -241,6 +247,7 @@ services: poster_b: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9147:8547" - "127.0.0.1:9148:8548" @@ -256,6 +263,7 @@ services: poster_c: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9247:8547" - "127.0.0.1:9248:8548" @@ -271,6 +279,7 @@ services: validator: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8247:8547" - "127.0.0.1:8248:8548" @@ -286,6 +295,7 @@ services: l3node: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:3347:3347" - "127.0.0.1:3348:3348" @@ -301,6 +311,7 @@ services: validation_node: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8949:8549" volumes: @@ -318,6 +329,7 @@ services: relay: pid: host image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9652:9652" entrypoint: /usr/local/bin/relay From 22ecaea53ba2b37536f880269a7ae846d0fba3d2 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 16:31:26 -0600 Subject: [PATCH 164/180] fix docker-compose --- docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f889cb11..e21e1cf6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -317,7 +317,6 @@ services: volumes: - "config:/config" command: --conf.file /config/validation_node_config.json - entrypoint: /usr/local/bin/nitro-val scripts: build: scripts/ @@ -332,7 +331,6 @@ services: entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9652:9652" - entrypoint: /usr/local/bin/relay command: --chain.id 412346 --node.feed.input.url ws://sequencer:9642 --node.feed.output.port 9652 tokenbridge: From ff0e517d4d9a7b6800c8c2a9e5a2b388667d8335 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 14 Jun 2024 08:57:55 -0600 Subject: [PATCH 165/180] return to nitro 2.3.3 --- scripts/config.ts | 4 ++-- test-node.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 3fd49ef5..d9d895c7 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -344,7 +344,7 @@ function writeL2ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 30, + "InitialArbOSVersion": 20, "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } @@ -377,7 +377,7 @@ function writeL3ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 30, + "InitialArbOSVersion": 20, "InitialChainOwner": "0x0000000000000000000000000000000000000000", "GenesisBlockNum": 0 } diff --git a/test-node.bash b/test-node.bash index 89d18ddc..3f0e4ae6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.0-e6f81cb-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. From 962d6c048ebdbd92a7b9aaf5c798307d565ace54 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Mon, 17 Jun 2024 14:24:43 +0200 Subject: [PATCH 166/180] Deploy CacheManager on L2 --- test-node.bash | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test-node.bash b/test-node.bash index 3f0e4ae6..43ae9fab 100755 --- a/test-node.bash +++ b/test-node.bash @@ -354,11 +354,12 @@ if $force_init; then docker compose run scripts send-l1 --ethamount 1000 --to user_l1user --wait docker compose run scripts send-l1 --ethamount 0.0001 --from user_l1user --to user_l1user_b --wait --delay 500 --times 1000000 > /dev/null & + l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` + echo == Writing l2 chain config - docker compose run scripts write-l2-chain-config + docker compose run scripts --l2owner $l2ownerAddress write-l2-chain-config sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` - l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` l2ownerKey=`docker compose run scripts print-private-key --account l2owner | tail -n 1 | tr -d '\r\n'` wasmroot=`docker compose run --entrypoint sh sequencer -c "cat /home/user/target/machines/latest/module-root.txt"` @@ -381,7 +382,7 @@ if $force_init; then echo == Funding l2 funnel and dev key docker compose up --wait $INITIAL_SEQ_NODES docker compose run scripts bridge-funds --ethamount 100000 --wait - docker compose run scripts bridge-funds --ethamount 1000 --wait --from "key_0x$devprivkey" + docker compose run scripts send-l2 --ethamount 100 --to l2owner --wait if $tokenbridge; then echo == Deploying L1-L2 token bridge @@ -392,6 +393,10 @@ if $force_init; then echo fi + echo == Deploy CacheManager on L2 + docker compose run -e CHILD_CHAIN_RPC="http://sequencer:8547" -e CHAIN_OWNER_PRIVKEY=$l2ownerKey rollupcreator deploy-cachemanager-testnode + + if $l3node; then echo == Funding l3 users docker compose run scripts send-l2 --ethamount 1000 --to l3owner --wait From a294ad319cde1f250d5fc6b9eb85daafca30530c Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 17 Jun 2024 08:59:48 -0600 Subject: [PATCH 167/180] re-enable stylus on 3.0.1-rc.2 --- scripts/config.ts | 4 ++-- test-node.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index d9d895c7..3fd49ef5 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -344,7 +344,7 @@ function writeL2ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 20, + "InitialArbOSVersion": 30, "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } @@ -377,7 +377,7 @@ function writeL3ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 20, + "InitialArbOSVersion": 30, "InitialChainOwner": "0x0000000000000000000000000000000000000000", "GenesisBlockNum": 0 } diff --git a/test-node.bash b/test-node.bash index 3f0e4ae6..8958bb4d 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-rc.2-cf4b74e-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. From 365e01e9ab5940583e5c26f4f73399dddcc2cf83 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 17 Jun 2024 09:21:52 -0600 Subject: [PATCH 168/180] fix wrongfully changed entry-points --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index e21e1cf6..0287f4be 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -311,7 +311,7 @@ services: validation_node: pid: host # allow debugging image: nitro-node-dev-testnode - entrypoint: /usr/local/bin/nitro + entrypoint: /usr/local/bin/nitro-val ports: - "127.0.0.1:8949:8549" volumes: @@ -328,7 +328,7 @@ services: relay: pid: host image: nitro-node-dev-testnode - entrypoint: /usr/local/bin/nitro + entrypoint: /usr/local/bin/relay ports: - "127.0.0.1:9652:9652" command: --chain.id 412346 --node.feed.input.url ws://sequencer:9642 --node.feed.output.port 9652 From d389fbcca42429ea4e8204c1c65b2e8a48013b32 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 17 Jun 2024 10:38:31 -0600 Subject: [PATCH 169/180] nitro 3.0.1 released --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 8958bb4d..2ad9109f 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-rc.2-cf4b74e-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-cf4b74e-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. From caa897c8a77bb9a4ac3b2330c6c28bd5b66a5a45 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 18 Jun 2024 09:29:10 +0200 Subject: [PATCH 170/180] Deploy CacheManager to L3 --- scripts/config.ts | 2 +- test-node.bash | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 3fd49ef5..eefcdd29 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -378,7 +378,7 @@ function writeL3ChainConfig(argv: any) { "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, "InitialArbOSVersion": 30, - "InitialChainOwner": "0x0000000000000000000000000000000000000000", + "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } } diff --git a/test-node.bash b/test-node.bash index 1f870b70..cda10490 100755 --- a/test-node.bash +++ b/test-node.bash @@ -415,7 +415,9 @@ if $force_init; then docker compose run scripts send-l2 --ethamount 0.0001 --from user_traffic_generator --to user_fee_token_deployer --wait --delay 500 --times 1000000 > /dev/null & echo == Writing l3 chain config - docker compose run scripts write-l3-chain-config + l3owneraddress=`docker compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` + echo l3owneraddress $l3owneraddress + docker compose run scripts --l2owner $l3owneraddress write-l3-chain-config if $l3_custom_fee_token; then echo == Deploying custom fee token @@ -425,7 +427,6 @@ if $force_init; then fi echo == Deploying L3 - l3owneraddress=`docker compose run scripts print-address --account l3owner | tail -n 1 | tr -d '\r\n'` l3ownerkey=`docker compose run scripts print-private-key --account l3owner | tail -n 1 | tr -d '\r\n'` l3sequenceraddress=`docker compose run scripts print-address --account l3sequencer | tail -n 1 | tr -d '\r\n'` @@ -457,8 +458,12 @@ if $force_init; then docker compose run scripts send-l3 --ethamount 500 --from user_token_bridge_deployer --to "key_0x$devprivkey" --wait else docker compose run scripts bridge-to-l3 --ethamount 50000 --wait - docker compose run scripts bridge-to-l3 --ethamount 500 --wait --from "key_0x$devprivkey" fi + docker compose run scripts send-l3 --ethamount 100 --to l3owner --wait + + + echo == Deploy CacheManager on L3 + docker compose run -e CHILD_CHAIN_RPC="http://l3node:3347" -e CHAIN_OWNER_PRIVKEY=$l3ownerkey rollupcreator deploy-cachemanager-testnode fi fi From 703bf6abce790a3f538f8ea970d5aea0a9a813b6 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 18 Jun 2024 09:37:01 +0200 Subject: [PATCH 171/180] Bump nitro-contracts to support CacheManager deployment --- test-node.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index cda10490..d18a5c33 100755 --- a/test-node.bash +++ b/test-node.bash @@ -5,9 +5,9 @@ set -e NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-cf4b74e-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 -# This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. +# This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment. # Once v1.2.2 is released, we can switch to that version. -DEFAULT_NITRO_CONTRACTS_VERSION="a00d2faac01e050339ff7b0ac5bc91df06e8dbff" +DEFAULT_NITRO_CONTRACTS_VERSION="867663657b98a66b60ff244e46226e0cb368ab94" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1" # Set default versions if not overriden by provided env vars From f223401855a3a047aee3a5ba4cc95a125b360a92 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 18 Jun 2024 09:41:29 +0200 Subject: [PATCH 172/180] Format --- test-node.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index d18a5c33..dd112c95 100755 --- a/test-node.bash +++ b/test-node.bash @@ -461,7 +461,6 @@ if $force_init; then fi docker compose run scripts send-l3 --ethamount 100 --to l3owner --wait - echo == Deploy CacheManager on L3 docker compose run -e CHILD_CHAIN_RPC="http://l3node:3347" -e CHAIN_OWNER_PRIVKEY=$l3ownerkey rollupcreator deploy-cachemanager-testnode From 89b4cbc8d52616a86f82d66f5ee4947a7ea21bcd Mon Sep 17 00:00:00 2001 From: Diego Ximenes Date: Fri, 21 Jun 2024 15:07:55 -0300 Subject: [PATCH 173/180] Removes deprecated version field from docker-compose --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 0287f4be..81deb6d1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.9" services: blockscout: depends_on: From 9d527abe7c8215cee1308730d3cd8a05997ed223 Mon Sep 17 00:00:00 2001 From: Diego Ximenes Date: Fri, 21 Jun 2024 15:36:20 -0300 Subject: [PATCH 174/180] Runs CI with l3node and no-simple --- .github/workflows/testnode.bash | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index b6d1f596..0e57e13d 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -1,20 +1,35 @@ #!/bin/bash -# The script starts up the test node and waits until the timeout (10min) or +# The script starts up the test node and waits until the timeout (10min) or # until send-l2 succeeds. # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} # TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var -./test-node.bash --init-force --detach +./test-node.bash --init-force --l3node --no-simple --detach START=$(date +%s) -SUCCEDED=0 +L2_TRANSACTION_SUCCEEDED=false +L3_TRANSACTION_SUCCEEDED=false +SUCCEEDED=false while true; do - if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait; then - echo "Sending l2 transaction succeeded" - SUCCEDED=1 + if [ "$L2_TRANSACTION_SUCCEEDED" = false ]; then + if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait; then + echo "Sending l2 transaction succeeded" + L2_TRANSACTION_SUCCEEDED=true + fi + fi + + if [ "$L3_TRANSACTION_SUCCEEDED" = false ]; then + if ${GITHUB_WORKSPACE}/test-node.bash script send-l3 --ethamount 100 --to user_l3user --wait; then + echo "Sending l3 transaction succeeded" + L3_TRANSACTION_SUCCEEDED=true + fi + fi + + if [ "$L2_TRANSACTION_SUCCEEDED" = true ] && [ "$L3_TRANSACTION_SUCCEEDED" = true ]; then + SUCCEEDED=true break fi @@ -31,7 +46,7 @@ done docker-compose stop -if [ "$SUCCEDED" -eq 0 ]; then +if [ "$SUCCEEDED" = false ]; then docker-compose logs exit 1 fi From 99ad328570f49d204bafa7601a489a4f4ff38757 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Mon, 1 Jul 2024 14:50:59 -0400 Subject: [PATCH 175/180] update test node to use sequencer dev node --- .env | 88 ++------------ docker-compose.yaml | 289 +++----------------------------------------- scripts/index.ts | 2 +- test-node.bash | 16 ++- 4 files changed, 37 insertions(+), 358 deletions(-) diff --git a/.env b/.env index af0d509a..3b944c27 100644 --- a/.env +++ b/.env @@ -1,80 +1,12 @@ -# Environment for local demo network. -# This file is meant to work with docker-compose.yaml +ESPRESSO_SEQUENCER_L1_PROVIDER=http://host.docker.internal:8545 +ESPRESSO_SEQUENCER_ETH_MNEMONIC=indoor dish desk flag debris potato excuse depart ticket judge file exit +ESPRESSO_DEPLOYER_ACCOUNT_INDEX=5 +ESPRESSO_SEQUENCER_API_PORT=41000 +ESPRESSO_BUILDER_PORT=41003 +ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db +ESPRESSO_SEQUENCER_POSTGRES_PORT=5432 +ESPRESSO_SEQUENCER_POSTGRES_USER=root +ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password +ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer -RUST_LOG=info,libp2p=off -RUST_LOG_FORMAT=full -L1_BLOCK_TIME_SEC=3 - -# Parallelism config -# Since we have many processes using async-std, limit them to one thread each to keep the CPU -# requirements for the local demo down. -ASYNC_STD_THREAD_COUNT=1 - -# Internal port inside container -ESPRESSO_CDN_SERVER_PORT=40000 -ESPRESSO_CDN_SERVER_METRICS_PORT=9090 -ESPRESSO_ORCHESTRATOR_PORT=40001 -ESPRESSO_ORCHESTRATOR_NUM_NODES=2 -ESPRESSO_ORCHESTRATOR_START_DELAY=5s -ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s -ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT=2s -ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal-0:${ESPRESSO_CDN_SERVER_PORT} -ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT} -ESPRESSO_SEQUENCER_API_PORT=44000 -ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT=42000 -ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE=10kb -ESPRESSO_SEQUENCER_BASE_FEE=0 -ESPRESSO_SEQUENCER1_API_PORT=44001 -ESPRESSO_SEQUENCER_URL=http://espresso-sequencer0:${ESPRESSO_SEQUENCER_API_PORT} -ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer -ESPRESSO_SEQUENCER_L1_PORT=8545 -ESPRESSO_SEQUENCER_L1_WS_PORT=8546 -ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:${ESPRESSO_SEQUENCER_L1_PORT} -ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:${ESPRESSO_SEQUENCER_L1_WS_PORT} -# A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details. -ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit" -ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk" -ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f -ESPRESSO_COMMITMENT_TASK_PORT=45000 -ESPRESSO_STATE_RELAY_SERVER_PORT=40004 -ESPRESSO_SEQUENCER_DB_PORT=5432 -ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT} - -ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=1 - -# Ethereum accounts (note 11-15 are used by the sequencer nodes) -ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=6 -ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX=6 -ESPRESSO_SEQUENCER_STATE_PROVER_ACCOUNT_INDEX=6 -ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=6 -ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 - -# Conctracts -ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=0x75745a1124de342716a94cbdfdea12f4f93d1b80 -ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0xae05733adeebc16f9e7f377c89b6ac7369fc9b07 -ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS=$ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS - -# Example sequencer demo private keys -ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o -ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83 - -ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=SCHNORR_SIGNING_KEY~XxPSER8Vh3nFj_m7cUQ--96JfKrycrSKyRQximkQigCo -ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=SCHNORR_SIGNING_KEY~2NpKtvY5F0u1LWgYws-JeX1vDdp5CfECuaMMYxyz4gDM - -# Builder service -ESPRESSO_BUILDER_L1_PROVIDER=${ESPRESSO_SEQUENCER_L1_PROVIDER} -ESPRESSO_BUILDER_ETH_MNEMONIC=${ESPRESSO_SEQUENCER_ETH_MNEMONIC} -ESPRESSO_BUILDER_SERVER_PORT=41003 -ESPRESSO_BUILDER_CHANNEL_CAPACITY=1024 -ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW=0 -ESPRESSO_BUILDER_WEBSERVER_RESPONSE_TIMEOUT_DURATION=1s -ESPRESSO_BUILDER_BUFFER_VIEW_NUM_COUNT=15 -ESPRESSO_BUILDER_INIT_NODE_COUNT=$ESPRESSO_ORCHESTRATOR_NUM_NODES - -ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0=7000 -ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1=7001 - -# Prover service -ESPRESSO_PROVER_SERVICE_PORT=40050 -ESPRESSO_STATE_PROVER_UPDATE_INTERVAL=30s diff --git a/docker-compose.yaml b/docker-compose.yaml index bbb75b09..e2a4e0c9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -336,304 +336,47 @@ services: - "tokenbridge-data:/workspace" - /var/run/docker.sock:/var/run/docker.sock - deploy-contracts: - command: deploy --use-mock-contract - image: ghcr.io/espressosystems/espresso-sequencer/deploy:main - environment: - - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 - - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - - ESPRESSO_DEPLOYER_ACCOUNT_INDEX - - RUST_LOG - - RUST_LOG_FORMAT - - ASYNC_STD_THREAD_COUNT - depends_on: - orchestrator: - condition: service_healthy - extra_hosts: - - "host.docker.internal:host-gateway" - - orchestrator: - image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main - ports: - - "$ESPRESSO_ORCHESTRATOR_PORT:$ESPRESSO_ORCHESTRATOR_PORT" - environment: - - ESPRESSO_ORCHESTRATOR_BUILDER_URL=http://permissionless-builder:$ESPRESSO_BUILDER_SERVER_PORT - - ESPRESSO_ORCHESTRATOR_PORT - - ESPRESSO_ORCHESTRATOR_NUM_NODES - - ESPRESSO_ORCHESTRATOR_START_DELAY - - ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT - - ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT - - RUST_LOG - - RUST_LOG_FORMAT - - permissionless-builder: - image: ghcr.io/espressosystems/espresso-sequencer/builder:main - ports: - - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" - environment: - - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_URL=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE - - ESPRESSO_BUILDER_ETH_MNEMONIC - - ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX - - ESPRESSO_BUILDER_L1_PROVIDER - - ESPRESSO_BUILDER_SERVER_PORT - - ESPRESSO_BUILDER_CHANNEL_CAPACITY - - ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW - - ESPRESSO_BUILDER_WEBSERVER_RESPONSE_TIMEOUT_DURATION - - ESPRESSO_BUILDER_BUFFER_VIEW_NUM_COUNT - - ESPRESSO_BUILDER_INIT_NODE_COUNT - - RUST_LOG - - RUST_LOG_FORMAT - - ASYNC_STD_THREAD_COUNT - depends_on: - espresso-sequencer0: - condition: service_healthy - - - # We use KeyDB (a Redis variant) to maintain consistency between - # different parts of the CDN - keydb: - image: docker.io/eqalpha/keydb:latest - command: ["--requirepass", "changemeplease!!"] - healthcheck: - # Attempt to PING the database - test: keydb-cli --pass changemeplease!! --raw incr PING - interval: 5s - timeout: 4s - retries: 20 - - marshal-0: - environment: - - RUST_LOG - - ESPRESSO_CDN_SERVER_METRICS_PORT - image: ghcr.io/espressosystems/espresso-sequencer/cdn-marshal:main - command: - - cdn-marshal - - -d - - redis://:changemeplease!!@keydb:6379 - - -b - - $ESPRESSO_CDN_SERVER_PORT - - -m - - 0.0.0.0:$ESPRESSO_CDN_SERVER_METRICS_PORT - depends_on: - keydb: - condition: service_healthy - - broker-0: - environment: - - RUST_LOG - - ESPRESSO_CDN_SERVER_METRICS_PORT - image: ghcr.io/espressosystems/espresso-sequencer/cdn-broker:main - command: - - cdn-broker - - -d - - redis://:changemeplease!!@keydb:6379 - - --public-advertise-endpoint - - broker-0:1738 - - --private-advertise-endpoint - - broker-0:1739 - - -m - - 0.0.0.0:$ESPRESSO_CDN_SERVER_METRICS_PORT - depends_on: - keydb: - condition: service_healthy - - # A broker is the main message-routing unit of the CDN - broker-1: - environment: - - RUST_LOG - - ESPRESSO_CDN_SERVER_METRICS_PORT - image: ghcr.io/espressosystems/espresso-sequencer/cdn-broker:main - command: - - cdn-broker - - -d - - redis://:changemeplease!!@keydb:6379 - - --public-advertise-endpoint - - broker-1:1738 - - --private-advertise-endpoint - - broker-1:1739 - - -m - - 0.0.0.0:$ESPRESSO_CDN_SERVER_METRICS_PORT - depends_on: - keydb: - condition: service_healthy - - espresso-sequencer0: - image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main + espresso-dev-node: + image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:jh-dev-nodemusl ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - # Run the API server (with options taken from the environment) and the optional submission API - command: sequencer -- storage-sql -- http -- query -- submit -- status -- state -- hotshot-events + - "$ESPRESSO_BUILDER_PORT:$ESPRESSO_BUILDER_PORT" environment: - - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_SEQUENCER_CDN_ENDPOINT - - ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STORAGE_PATH - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_STATE_RELAY_SERVER_URL - - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0 - - ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db - - ESPRESSO_SEQUENCER_POSTGRES_USER=root - - ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password - - ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer - - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0 - - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 - - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 - ESPRESSO_SEQUENCER_ETH_MNEMONIC - - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 - - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer1:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE - - ESPRESSO_SEQUENCER_BASE_FEE - - ESPRESSO_SEQUENCER_IS_DA=true - - RUST_LOG - - RUST_LOG_FORMAT - depends_on: - orchestrator: - condition: service_healthy - sequencer-db: - condition: service_healthy - state-relay-server: - condition: service_healthy - broker-0: - condition: service_healthy - broker-1: - condition: service_healthy - marshal-0: - condition: service_healthy - geth: - condition: service_started - extra_hosts: - - "host.docker.internal:host-gateway" - - espresso-sequencer1: - image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main - ports: - - "$ESPRESSO_SEQUENCER1_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - # Run the API server (with options taken from the environment) - command: sequencer -- http - environment: - - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_SEQUENCER_CDN_ENDPOINT + - ESPRESSO_DEPLOYER_ACCOUNT_INDEX - ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT - - ESPRESSO_SEQUENCER_STORAGE_PATH - - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_STATE_RELAY_SERVER_URL - - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1 - - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1 - - ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS=0.0.0.0:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 - - ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS=espresso-sequencer1:$ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 - - ESPRESSO_SEQUENCER_ETH_MNEMONIC - - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX - - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS - - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 - - ESPRESSO_SEQUENCER_STATE_PEERS=http://espresso-sequencer0:$ESPRESSO_SEQUENCER_API_PORT - - ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE - - ESPRESSO_SEQUENCER_BASE_FEE - - ESPRESSO_SEQUENCER_IS_DA=true - - RUST_LOG + - ESPRESSO_BUILDER_PORT + - ESPRESSO_SEQUENCER_POSTGRES_HOST + - ESPRESSO_SEQUENCER_POSTGRES_PORT + - ESPRESSO_SEQUENCER_POSTGRES_USER + - ESPRESSO_SEQUENCER_POSTGRES_PASSWORD + - ESPRESSO_SEQUENCER_POSTGRES_DATABASE + - RUST_LOG=info - RUST_LOG_FORMAT depends_on: - orchestrator: - condition: service_healthy sequencer-db: condition: service_healthy - state-relay-server: - condition: service_healthy - broker-0: - condition: service_healthy - broker-1: - condition: service_healthy - marshal-0: - condition: service_healthy extra_hosts: - "host.docker.internal:host-gateway" - commitment-task: - image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main - ports: - - "$ESPRESSO_COMMITMENT_TASK_PORT:$ESPRESSO_COMMITMENT_TASK_PORT" - environment: - - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - - ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX - - ESPRESSO_COMMITMENT_TASK_PORT - - ESPRESSO_SEQUENCER_URL - - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS - - RUST_LOG - - RUST_LOG_FORMAT - depends_on: - espresso-sequencer0: - condition: service_healthy - geth: - condition: service_started - deploy-contracts: - condition: service_completed_successfully - extra_hosts: - - "host.docker.internal:host-gateway" - - state-relay-server: - image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main - ports: - - "$ESPRESSO_STATE_RELAY_SERVER_PORT:$ESPRESSO_STATE_RELAY_SERVER_PORT" - environment: - - ESPRESSO_STATE_RELAY_SERVER_PORT - - ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD - - RUST_LOG - - RUST_LOG_FORMAT - sequencer-db: image: postgres user: postgres ports: - - "$ESPRESSO_SEQUENCER_DB_PORT:5432" + - "$ESPRESSO_SEQUENCER_POSTGRES_PORT:$ESPRESSO_SEQUENCER_POSTGRES_PORT" environment: - - POSTGRES_PASSWORD=password - - POSTGRES_USER=root - - POSTGRES_DB=sequencer + - POSTGRES_PASSWORD=$ESPRESSO_SEQUENCER_POSTGRES_PASSWORD + - POSTGRES_USER=$ESPRESSO_SEQUENCER_POSTGRES_USER + - POSTGRES_DB=$ESPRESSO_SEQUENCER_POSTGRES_DATABASE healthcheck: # Postgres can be falsely "ready" once before running init scripts. # See https://github.com/docker-library/postgres/issues/146 for discussion. - test: "pg_isready && sleep 1 && pg_isready" + test: "pg_isready -U root && sleep 1 && pg_isready -U root" interval: 5s timeout: 4s retries: 20 - prover-service: - image: ghcr.io/espressosystems/espresso-sequencer/prover-service:main - ports: - - "$ESPRESSO_PROVER_SERVICE_PORT:$ESPRESSO_PROVER_SERVICE_PORT" - environment: - - ESPRESSO_STATE_RELAY_SERVER_URL - - ESPRESSO_SEQUENCER_ORCHESTRATOR_URL - - ESPRESSO_STATE_PROVER_UPDATE_INTERVAL - - ESPRESSO_SEQUENCER_L1_PROVIDER - - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC - - RAYON_NUM_THREADS=2 - - ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS - - MNEMONIC=$ESPRESSO_SEQUENCER_ETH_MNEMONIC - - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10 - - ESPRESSO_SEQUENCER_STATE_PROVER_ACCOUNT_INDEX - - RUST_LOG - - RUST_LOG_FORMAT - - ASYNC_STD_THREAD_COUNT - - RAYON_NUM_THREADS - depends_on: - orchestrator: - condition: service_healthy - state-relay-server: - condition: service_healthy - deploy-contracts: - condition: service_completed_successfully - extra_hosts: - - "host.docker.internal:host-gateway" - volumes: l1data: consensus: diff --git a/scripts/index.ts b/scripts/index.ts index 03311fea..15693f3f 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -33,7 +33,7 @@ async function main() { .options(stressOptions) .options({ espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, - espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-sequencer0:44000' }, + espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://localhost:41000' }, hotshotAddress: { string: true, description: 'address of the HotShot contract', default: '' }, lightClientAddress: { string: true, description: 'address of the light client contract', default: ''}, }) diff --git a/test-node.bash b/test-node.bash index d1bcd0b5..ce3c614e 100755 --- a/test-node.bash +++ b/test-node.bash @@ -250,7 +250,7 @@ if $blockscout; then NODES="$NODES blockscout" fi if $espresso; then - NODES="$NODES orchestrator espresso-sequencer0 espresso-sequencer1 commitment-task permissionless-builder" + NODES="$NODES espresso-dev-node" fi if $force_build; then @@ -264,7 +264,11 @@ if $force_build; then echo execute from a sub-directory of nitro or use NITRO_SRC environment variable exit 1 fi - docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev + if $espresso; then + docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev -f "${NITRO_SRC}/Dockerfile.espresso" + else + docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev -f + fi fi if $dev_build_blockscout; then if $blockscout; then @@ -361,12 +365,12 @@ if $force_init; then docker compose run scripts write-l2-chain-config --espresso $espresso if $espresso; then - echo == Deploying Espresso Contract - docker compose up -d commitment-task deploy-contracts espresso-sequencer0 espresso-sequencer1 permissionless-builder --wait - addr=`curl http://localhost:45000/api/hotshot_contract` - echo $addr + echo == Deploying Espresso Network + docker compose up -d espresso-dev-node --wait + echo == Done deploying the espresso network fi + sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` From 6dd2ecd285ff976ca1b33893ce25237272fe3d21 Mon Sep 17 00:00:00 2001 From: nomaxg Date: Mon, 1 Jul 2024 16:06:45 -0400 Subject: [PATCH 176/180] use the correct index --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index ce3c614e..dd3dd122 100755 --- a/test-node.bash +++ b/test-node.bash @@ -33,7 +33,7 @@ l3node=false consensusclient=false redundantsequencers=0 hotShotAddr=0x75745a1124de342716a94cbdfdea12f4f93d1b80 -lightClientAddr=0xae05733adeebc16f9e7f377c89b6ac7369fc9b07 +lightClientAddr=0xb075b82c7a23e0994df4793422a1f03dbcf9136f dev_build_nitro=false dev_build_blockscout=false espresso=false From 34840a8d31aec21cecbedc1c2c316298359f3d2f Mon Sep 17 00:00:00 2001 From: nomaxg Date: Mon, 1 Jul 2024 16:15:16 -0400 Subject: [PATCH 177/180] use the correct index --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 3b944c27..a3a591d4 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ ESPRESSO_SEQUENCER_L1_PROVIDER=http://host.docker.internal:8545 ESPRESSO_SEQUENCER_ETH_MNEMONIC=indoor dish desk flag debris potato excuse depart ticket judge file exit -ESPRESSO_DEPLOYER_ACCOUNT_INDEX=5 +ESPRESSO_DEPLOYER_ACCOUNT_INDEX=6 ESPRESSO_SEQUENCER_API_PORT=41000 ESPRESSO_BUILDER_PORT=41003 ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db From c643ae9a1147079fa50f5cad460f49adad7289b1 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Tue, 2 Jul 2024 17:17:25 +0800 Subject: [PATCH 178/180] Update the espresso url --- .env | 2 -- docker-compose.yaml | 2 +- scripts/index.ts | 2 +- test-node.bash | 15 ++++++--------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.env b/.env index a3a591d4..b5b580f3 100644 --- a/.env +++ b/.env @@ -8,5 +8,3 @@ ESPRESSO_SEQUENCER_POSTGRES_PORT=5432 ESPRESSO_SEQUENCER_POSTGRES_USER=root ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer - - diff --git a/docker-compose.yaml b/docker-compose.yaml index e2a4e0c9..3f70aeee 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -337,7 +337,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock espresso-dev-node: - image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:jh-dev-nodemusl + image: ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main ports: - "$ESPRESSO_SEQUENCER_API_PORT:$ESPRESSO_SEQUENCER_API_PORT" - "$ESPRESSO_BUILDER_PORT:$ESPRESSO_BUILDER_PORT" diff --git a/scripts/index.ts b/scripts/index.ts index 15693f3f..89abd73b 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -33,7 +33,7 @@ async function main() { .options(stressOptions) .options({ espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, - espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://localhost:41000' }, + espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-dev-node:41000' }, hotshotAddress: { string: true, description: 'address of the HotShot contract', default: '' }, lightClientAddress: { string: true, description: 'address of the light client contract', default: ''}, }) diff --git a/test-node.bash b/test-node.bash index dd3dd122..6315d8c1 100755 --- a/test-node.bash +++ b/test-node.bash @@ -250,7 +250,11 @@ if $blockscout; then NODES="$NODES blockscout" fi if $espresso; then - NODES="$NODES espresso-dev-node" + if $force_build; then + INITIAL_SEQ_NODES="$INITIAL_SEQ_NODES espresso-dev-node" + else + NODES="$NODES espresso-dev-node" + fi fi if $force_build; then @@ -267,7 +271,7 @@ if $force_build; then if $espresso; then docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev -f "${NITRO_SRC}/Dockerfile.espresso" else - docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev -f + docker build "$NITRO_SRC" -t nitro-node-dev --target nitro-node-dev -f fi fi if $dev_build_blockscout; then @@ -364,13 +368,6 @@ if $force_init; then echo == Writing l2 chain config docker compose run scripts write-l2-chain-config --espresso $espresso - if $espresso; then - echo == Deploying Espresso Network - docker compose up -d espresso-dev-node --wait - echo == Done deploying the espresso network - fi - - sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` From b36cb808e07acb5551d7e88f2a27e84e925a333e Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Tue, 2 Jul 2024 19:00:58 +0800 Subject: [PATCH 179/180] Remove hotshot contract address --- scripts/index.ts | 1 - test-node.bash | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/index.ts b/scripts/index.ts index 89abd73b..806802da 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -34,7 +34,6 @@ async function main() { .options({ espresso: { boolean: true, decription: 'use Espresso Sequencer for sequencing and DA', default: false }, espressoUrl: { string: true, description: 'Espresso Sequencer url', default: 'http://espresso-dev-node:41000' }, - hotshotAddress: { string: true, description: 'address of the HotShot contract', default: '' }, lightClientAddress: { string: true, description: 'address of the light client contract', default: ''}, }) .command(bridgeFundsCommand) diff --git a/test-node.bash b/test-node.bash index 6315d8c1..5ae3a387 100755 --- a/test-node.bash +++ b/test-node.bash @@ -32,7 +32,6 @@ tokenbridge=false l3node=false consensusclient=false redundantsequencers=0 -hotShotAddr=0x75745a1124de342716a94cbdfdea12f4f93d1b80 lightClientAddr=0xb075b82c7a23e0994df4793422a1f03dbcf9136f dev_build_nitro=false dev_build_blockscout=false @@ -371,7 +370,7 @@ if $force_init; then sequenceraddress=`docker compose run scripts print-address --account sequencer | tail -n 1 | tr -d '\r\n'` l2ownerAddress=`docker compose run scripts print-address --account l2owner | tail -n 1 | tr -d '\r\n'` - docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json --hotshot $hotShotAddr + docker compose run --entrypoint /usr/local/bin/deploy sequencer --l1conn ws://geth:8546 --l1keystore /home/user/l1keystore --sequencerAddress $sequenceraddress --ownerAddress $l2ownerAddress --l1DeployAccount $l2ownerAddress --l1deployment /config/deployment.json --authorizevalidators 10 --wasmrootpath /home/user/target/machines --l1chainid=$l1chainid --l2chainconfig /config/l2_chain_config.json --l2chainname arb-dev-test --l2chaininfo /config/deployed_chain_info.json docker compose run --entrypoint sh sequencer -c "jq [.[]] /config/deployed_chain_info.json > /config/l2_chain_info.json" if $simple; then From 6706180af3a77ebd87047aaf340144e0207e0fe9 Mon Sep 17 00:00:00 2001 From: ImJeremyHe Date: Mon, 8 Jul 2024 12:43:52 +0800 Subject: [PATCH 180/180] Update the light client contract address --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index 6ee8b6d0..b3175f5e 100755 --- a/test-node.bash +++ b/test-node.bash @@ -46,7 +46,7 @@ tokenbridge=false l3node=false consensusclient=false redundantsequencers=0 -lightClientAddr=0xb075b82c7a23e0994df4793422a1f03dbcf9136f +lightClientAddr=0xb6eb235fa509e3206f959761d11e3777e16d0e98 dev_build_nitro=false dev_build_blockscout=false espresso=false