Merge branch 'eth-infinitism:master' into master

eth-infinitism · Oct 4, 2023 · f591ba8 · f591ba8
2 parents eba1c07 + 9163ed2
commit f591ba8
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 26 deletions.
diff --git 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 '<hello>a<world tag="123"/>b</hello>' | 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/launchers/aa-bundler-rust-launcher.sh b/launchers/aa-bundler-rust-launcher.sh
diff --git a/launchers/aa-bundler-rust/docker-compose.yml b/launchers/aa-bundler-rust/docker-compose.yml
diff --git a/launchers/aabundler-launcher.sh b/launchers/aabundler-launcher.sh
@@ -1 +1 @@
-aabundler/aabundler-launcher.sh
+./aabundler/aabundler-launcher.sh
diff --git 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.2
 cd `dirname \`realpath $0\``
 case $1 in
 

diff --git a/launchers/silius-launcher.sh b/launchers/silius-launcher.sh
@@ -0,0 +1 @@
+silius/silius-launcher.sh
diff --git a/launchers/aa-bundler-rust/.env → launchers/silius/.env b/launchers/aa-bundler-rust/.env → launchers/silius/.env
diff --git a/launchers/aa-bundler-rust/README.md → launchers/silius/README.md b/launchers/aa-bundler-rust/README.md → 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
 ```
diff --git a/launchers/silius/docker-compose.yml b/launchers/silius/docker-compose.yml
@@ -0,0 +1,39 @@
+version: '2'
+
+services:
+  bundler:
+    image: ghcr.io/vid201/silius:latest
+    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
+    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' ]
diff --git a/...chers/aa-bundler-rust/geth-dev/Dockerfile → launchers/silius/geth-dev/Dockerfile b/...chers/aa-bundler-rust/geth-dev/Dockerfile → launchers/silius/geth-dev/Dockerfile
diff --git a/...xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 → ...xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 b/...xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 → ...xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
diff --git a/...-bundler-rust/aa-bundler-rust-launcher.sh → launchers/silius/silius-launcher.sh b/...-bundler-rust/aa-bundler-rust-launcher.sh → launchers/silius/silius-launcher.sh
@@ -1,19 +1,19 @@
 #!/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)
 	docker-compose up -d
 	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/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.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:
     image: ethereum/client-go:release-1.10

diff --git 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