From 54fa7a7d3a24dbac56d56da8e1bd8f36ce142ab8 Mon Sep 17 00:00:00 2001 From: Utkir S Date: Mon, 29 May 2023 05:06:04 +0500 Subject: [PATCH 1/9] Update config.json (#23) --- launchers/skandha/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/skandha/config.json b/launchers/skandha/config.json index f3ed59c..0aade89 100644 --- a/launchers/skandha/config.json +++ b/launchers/skandha/config.json @@ -2,7 +2,7 @@ "networks": { "dev": { "entryPoints": [ - "0x0576a174D229E3cFA37253523E645A78A0C91B57" + "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789" ], "relayer": "test test test test test test test test test test test junk", "beneficiary": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", From 5fc6b4e410419c64159d8d5fa214600d3045c6a5 Mon Sep 17 00:00:00 2001 From: Sherif Abdelmoatty Date: Sun, 18 Jun 2023 11:31:01 +0300 Subject: [PATCH 2/9] Voltaire: support entrypoint v0.6.0 (#20) --- launchers/voltaire-bundler/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launchers/voltaire-bundler/docker-compose.yml b/launchers/voltaire-bundler/docker-compose.yml index 14dd617..b0287bb 100644 --- a/launchers/voltaire-bundler/docker-compose.yml +++ b/launchers/voltaire-bundler/docker-compose.yml @@ -7,8 +7,8 @@ services: bundler: ports: [ '3000:3000' ] - image: sherifahmed990/voltaire-bundler:0.02 - command: --entrypoint 0x0576a174D229E3cFA37253523E645A78A0C91B57 --bundler_secret 0xc6cbc5ffad570fdad0544d1b5358a36edeb98d163b6567912ac4754e144d4edb --rpc_url 0.0.0.0 --geth_url http://geth-dev:8545 --chain_id 1337 --verbose + image: sherifahmed990/voltaire-bundler:0.13 + command: --entrypoint 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789 --bundler_secret 0xc6cbc5ffad570fdad0544d1b5358a36edeb98d163b6567912ac4754e144d4edb --rpc_url 0.0.0.0 --ethereum_node_url http://geth-dev:8545 --chain_id 1337 --bundle_interval 0 --verbose --debug fund-signer: image: ethereum/client-go:release-1.10 From e05cd6b67bfcb8f27ea9bd28deb87887bd72d451 Mon Sep 17 00:00:00 2001 From: Vid Kersic <38610409+Vid201@users.noreply.github.com> Date: Sun, 18 Jun 2023 13:25:37 +0200 Subject: [PATCH 3/9] Rust bundler: support entrypoint v0.6.0 (#22) --- launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh | 2 +- launchers/aa-bundler-rust/docker-compose.yml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh b/launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh index 9314c37..3572ed0 100755 --- a/launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh +++ b/launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh @@ -13,7 +13,7 @@ case $1 in cd ../../bundler-spec-tests/@account-abstraction && yarn deploy --network localhost ;; stop) - docker-compose down -t 3 + docker-compose down -t 1 ;; *) diff --git a/launchers/aa-bundler-rust/docker-compose.yml b/launchers/aa-bundler-rust/docker-compose.yml index 3a1f340..9f34769 100644 --- a/launchers/aa-bundler-rust/docker-compose.yml +++ b/launchers/aa-bundler-rust/docker-compose.yml @@ -3,11 +3,19 @@ version: '2' services: bundler: image: ghcr.io/vid201/aa-bundler:latest - command: --rpc-listen-address 0.0.0.0:3000 --eth-client-address http://geth-dev:8545 --mnemonic-file /root/${BUNDLER_ACCOUNT} --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --gas-factor 600 --min-balance 1 --entry-points 0x0576a174D229E3cFA37253523E645A78A0C91B57 --min-stake 1 --min-unstake-delay 0 --min-priority-fee-per-gas 0 --max-verification-gas 1500000 --rpc-api eth,debug + command: --rpc-listen-address 0.0.0.0:3000 --eth-client-address http://geth-dev:8545 --mnemonic-file /root/${BUNDLER_ACCOUNT} --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --gas-factor 600 --min-balance 1 --entry-points 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789 --min-stake 1 --min-unstake-delay 0 --min-priority-fee-per-gas 0 --max-verification-gas 1500000 --rpc-api eth,debug ports: [ '3000:3000' ] volumes: - ./keys:/root depends_on: [ geth-dev ] + + fund-signer: + image: ethereum/client-go:release-1.10 + entrypoint: 'geth --exec "eth.sendTransaction({from: eth.accounts[0], to: \"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266\", value: web3.toWei(10000, \"ether\")})" attach http://geth-dev:8545' + depends_on: + geth-dev: + condition: service_started + geth-dev: build: geth-dev ports: [ '8545:8545' ] \ No newline at end of file From baf5aa2212b0e9a25f7c4226913397ecd35d1c6b Mon Sep 17 00:00:00 2001 From: Vid Kersic <38610409+Vid201@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:29:43 +0200 Subject: [PATCH 4/9] chore: rename aa-bundler rust to silius (#28) --- launchers/aa-bundler-rust-launcher.sh | 1 - launchers/silius-launcher.sh | 1 + launchers/{aa-bundler-rust => silius}/.env | 0 launchers/{aa-bundler-rust => silius}/README.md | 6 +++--- launchers/{aa-bundler-rust => silius}/docker-compose.yml | 2 +- launchers/{aa-bundler-rust => silius}/geth-dev/Dockerfile | 0 .../keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 | 0 .../silius-launcher.sh} | 4 ++-- 8 files changed, 7 insertions(+), 7 deletions(-) delete mode 120000 launchers/aa-bundler-rust-launcher.sh create mode 120000 launchers/silius-launcher.sh rename launchers/{aa-bundler-rust => silius}/.env (100%) rename launchers/{aa-bundler-rust => silius}/README.md (70%) rename launchers/{aa-bundler-rust => silius}/docker-compose.yml (95%) rename launchers/{aa-bundler-rust => silius}/geth-dev/Dockerfile (100%) rename launchers/{aa-bundler-rust => silius}/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 (100%) rename launchers/{aa-bundler-rust/aa-bundler-rust-launcher.sh => silius/silius-launcher.sh} (78%) diff --git a/launchers/aa-bundler-rust-launcher.sh b/launchers/aa-bundler-rust-launcher.sh deleted file mode 120000 index 1017724..0000000 --- a/launchers/aa-bundler-rust-launcher.sh +++ /dev/null @@ -1 +0,0 @@ -aa-bundler-rust/aa-bundler-rust-launcher.sh \ No newline at end of file diff --git a/launchers/silius-launcher.sh b/launchers/silius-launcher.sh new file mode 120000 index 0000000..eb9dee6 --- /dev/null +++ b/launchers/silius-launcher.sh @@ -0,0 +1 @@ +silius/silius-launcher.sh \ No newline at end of file diff --git a/launchers/aa-bundler-rust/.env b/launchers/silius/.env similarity index 100% rename from launchers/aa-bundler-rust/.env rename to launchers/silius/.env diff --git a/launchers/aa-bundler-rust/README.md b/launchers/silius/README.md similarity index 70% rename from launchers/aa-bundler-rust/README.md rename to launchers/silius/README.md index c175ccd..051f36b 100644 --- a/launchers/aa-bundler-rust/README.md +++ b/launchers/silius/README.md @@ -6,15 +6,15 @@ It also deploys the entrypoint, and fund the signer account. usage: -`aa-bundler-rust-launcher.sh start` +`silius-launcher.sh start` start the bundler (and node) in the background -`aa-bundler-rust-launcher.sh stop` +`silius-launcher.sh stop` stop runnning docker images can be used to launch a test (from bundler-spec-test) using ``` -pdm run test --launcher-script=path/aa-bundler-rust-launcher.sh +pdm run test --launcher-script=path/silius-launcher.sh ``` \ No newline at end of file diff --git a/launchers/aa-bundler-rust/docker-compose.yml b/launchers/silius/docker-compose.yml similarity index 95% rename from launchers/aa-bundler-rust/docker-compose.yml rename to launchers/silius/docker-compose.yml index 9f34769..31bcd6d 100644 --- a/launchers/aa-bundler-rust/docker-compose.yml +++ b/launchers/silius/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: bundler: - image: ghcr.io/vid201/aa-bundler:latest + image: ghcr.io/vid201/silius:latest command: --rpc-listen-address 0.0.0.0:3000 --eth-client-address http://geth-dev:8545 --mnemonic-file /root/${BUNDLER_ACCOUNT} --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --gas-factor 600 --min-balance 1 --entry-points 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789 --min-stake 1 --min-unstake-delay 0 --min-priority-fee-per-gas 0 --max-verification-gas 1500000 --rpc-api eth,debug ports: [ '3000:3000' ] volumes: diff --git a/launchers/aa-bundler-rust/geth-dev/Dockerfile b/launchers/silius/geth-dev/Dockerfile similarity index 100% rename from launchers/aa-bundler-rust/geth-dev/Dockerfile rename to launchers/silius/geth-dev/Dockerfile diff --git a/launchers/aa-bundler-rust/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 b/launchers/silius/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 similarity index 100% rename from launchers/aa-bundler-rust/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 rename to launchers/silius/keys/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 diff --git a/launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh b/launchers/silius/silius-launcher.sh similarity index 78% rename from launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh rename to launchers/silius/silius-launcher.sh index 3572ed0..9c25a77 100755 --- a/launchers/aa-bundler-rust/aa-bundler-rust-launcher.sh +++ b/launchers/silius/silius-launcher.sh @@ -1,11 +1,11 @@ #!/bin/bash -# Launcher script for the aa-bundler in Rust. +# Launcher script for the Silius. cd `dirname \`realpath $0\`` case $1 in name) - echo "aa-bundler in Rust" + echo "Silius - ERC-4337 bundler in Rust" ;; start) From ca8b63f175bb75338e73ea5f738836d5435e3881 Mon Sep 17 00:00:00 2001 From: Sherif Abdelmoatty Date: Thu, 3 Aug 2023 13:30:18 +0300 Subject: [PATCH 5/9] Voltaire: update version (#26) --- launchers/voltaire-bundler/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/voltaire-bundler/docker-compose.yml b/launchers/voltaire-bundler/docker-compose.yml index b0287bb..f3f5fb0 100644 --- a/launchers/voltaire-bundler/docker-compose.yml +++ b/launchers/voltaire-bundler/docker-compose.yml @@ -7,7 +7,7 @@ services: bundler: ports: [ '3000:3000' ] - image: sherifahmed990/voltaire-bundler:0.13 + image: sherifahmed990/voltaire-bundler:0.19 command: --entrypoint 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789 --bundler_secret 0xc6cbc5ffad570fdad0544d1b5358a36edeb98d163b6567912ac4754e144d4edb --rpc_url 0.0.0.0 --ethereum_node_url http://geth-dev:8545 --chain_id 1337 --bundle_interval 0 --verbose --debug fund-signer: From d7b6a10b548c6398308c75a1ba381609b5e6e774 Mon Sep 17 00:00:00 2001 From: Dror Tirosh Date: Thu, 3 Aug 2023 13:31:20 +0300 Subject: [PATCH 6/9] updated ref bundler to 0.6.1 (verificaitonGasLimit field rename) (#27) * updated ref bundler to 0.6.1 (verificaitonGasLimit field rename) --- launchers/aabundler-launcher.sh | 2 +- launchers/aabundler/aabundler-launcher.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/launchers/aabundler-launcher.sh b/launchers/aabundler-launcher.sh index 0c89c64..cb49c09 120000 --- a/launchers/aabundler-launcher.sh +++ b/launchers/aabundler-launcher.sh @@ -1 +1 @@ -aabundler/aabundler-launcher.sh \ No newline at end of file +./aabundler/aabundler-launcher.sh \ No newline at end of file diff --git a/launchers/aabundler/aabundler-launcher.sh b/launchers/aabundler/aabundler-launcher.sh index fb5481e..5827856 100755 --- a/launchers/aabundler/aabundler-launcher.sh +++ b/launchers/aabundler/aabundler-launcher.sh @@ -2,7 +2,7 @@ #launcher script for the AA reference bundler. # copied from https://github.com/eth-infinitism/bundler/blob/main/dockers/test/aabundler-launcher.sh -export TAG=0.6.0 +export TAG=0.6.1 cd `dirname \`realpath $0\`` case $1 in From 1c7f62dac352b0fe000f2aba1d6276a70e36cf17 Mon Sep 17 00:00:00 2001 From: Dror Tirosh Date: Tue, 12 Sep 2023 18:09:27 +0300 Subject: [PATCH 7/9] github action test (#30) * github action test * fix path --- .github/workflows/build.yml | 5 ++++- runall.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5697a8f..35681bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,9 @@ jobs: - run: curl -sSL https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py | python3 - - run: pip install jq yq + - run: which xq + - run: echo $PATH + - run: echo 'ab' | xq - uses: actions/checkout@v1 @@ -42,7 +45,7 @@ jobs: name: check bundler-spec-tests and submodules status # restore cache of bundler-spec-tests, and its submodules - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: bundler-spec-tests key: ${{ runner.os }}-${{ hashFiles('bundler-spec-tests/pdm.lock') }} diff --git a/runall.sh b/runall.sh index cc59208..123afe7 100755 --- a/runall.sh +++ b/runall.sh @@ -45,7 +45,7 @@ OPTIONS="--launcher-script=$launcher --junit-xml $outxml" OPTIONS="$OPTIONS -o junit_logging=all -o junit_log_passing_tests=false" # --log-rpc pdm run test -o junit_suite_name="$name" $OPTIONS "$@" | tee -a $outraw -xq . $outxml > $outjson +test -r $outxml && xq . $outxml > $outjson done From 975a8e1ee79db2a2f50260b33f40844bc4c86c8f Mon Sep 17 00:00:00 2001 From: Vid Kersic <38610409+Vid201@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:27:54 +0200 Subject: [PATCH 8/9] silius: update args (#29) * silius: remove extra params * silius: add http flag * silius: update args --- launchers/silius/docker-compose.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/launchers/silius/docker-compose.yml b/launchers/silius/docker-compose.yml index 31bcd6d..dac571e 100644 --- a/launchers/silius/docker-compose.yml +++ b/launchers/silius/docker-compose.yml @@ -3,7 +3,25 @@ version: '2' services: bundler: image: ghcr.io/vid201/silius:latest - command: --rpc-listen-address 0.0.0.0:3000 --eth-client-address http://geth-dev:8545 --mnemonic-file /root/${BUNDLER_ACCOUNT} --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 --gas-factor 600 --min-balance 1 --entry-points 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789 --min-stake 1 --min-unstake-delay 0 --min-priority-fee-per-gas 0 --max-verification-gas 1500000 --rpc-api eth,debug + command: + - bundler + - --eth-client-address + - http://geth-dev:8545 + - --datadir + - data/silius + - --mnemonic-file + - /root/${BUNDLER_ACCOUNT} + - --beneficiary + - 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 + - --entry-points + - 0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789 + - --http + - --http.addr + - 0.0.0.0 + - --http.port + - "3000" + - --http.api + - eth,debug,web3 ports: [ '3000:3000' ] volumes: - ./keys:/root @@ -18,4 +36,4 @@ services: geth-dev: build: geth-dev - ports: [ '8545:8545' ] \ No newline at end of file + ports: [ '8545:8545' ] From 9163ed219fdd480160b5223ea9ad3871a96e1ac4 Mon Sep 17 00:00:00 2001 From: Dror Tirosh Date: Tue, 3 Oct 2023 11:02:56 +0300 Subject: [PATCH 9/9] fix aabundler. --- launchers/aabundler/aabundler-launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/aabundler/aabundler-launcher.sh b/launchers/aabundler/aabundler-launcher.sh index 5827856..17ffaa7 100755 --- a/launchers/aabundler/aabundler-launcher.sh +++ b/launchers/aabundler/aabundler-launcher.sh @@ -2,7 +2,7 @@ #launcher script for the AA reference bundler. # copied from https://github.com/eth-infinitism/bundler/blob/main/dockers/test/aabundler-launcher.sh -export TAG=0.6.1 +export TAG=0.6.2 cd `dirname \`realpath $0\`` case $1 in