Skip to content

Commit

Permalink
latest spec-tests (#67)
Browse files Browse the repository at this point in the history 
* latest spec-tests

* install founrdy (for rip7560 contracts)

* remove docker-compose warnings
  • Loading branch information
@drortirosh
drortirosh authored Oct 20, 2024
1 parent b8f13d6 commit 056ff6e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,22 @@ jobs:
- run: pip install jq yq
- run: which xq

- run: curl -L https://foundry.paradigm.xyz | bash ; ~/.config/.foundry/bin/foundryup
name: Install foundry (for rip7560 contracts)
- run: mv ~/.config/.foundry/bin/* `dirname \`which xq\` `
- run: forge --version || echo no forge found

- run: curl -sSL https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm.py | python3 -

- uses: actions/checkout@v4
with:
submodules: recursive
show-progress: false

# - uses: actions/checkout@v3
# with:
# repository: eth-infinitism/bundler-spec-tests
# path: bundler-spec-tests
# submodules: true

# - run: test -d bundler-spec-tests || git clone --recurse-submodules --depth 1 https://github.com/eth-infinitism/bundler-spec-tests -b v07
# name: clone bundler-spec-tests

- run: cd bundler-spec-tests && (git describe --tags; git submodule ) | tee .git.status
- run: git submodule status --recursive
name: check bundler-spec-tests and submodules status

# restore cache of bundler-spec-tests, and its submodules
Expand Down
2 changes: 1 addition & 1 deletion bundler-spec-tests
Submodule bundler-spec-tests updated 67 files
+112 −20 .circleci/config.yml
+1 −0 .gitignore
+3 −0 .gitmodules
+1 −1 @account-abstraction
+1 −0 @rip7560
+19 −6 README.md
+23 −0 docker/Dockerfile
+822 −661 pdm.lock
+5 −3 pyproject.toml
+13 −0 scripts/clone-helper
+1 −1 spec
+52 −16 tests/conftest.py
+1 −1 tests/contracts/Helper.sol
+3 −1 tests/contracts/ITestAccount.sol
+7 −0 tests/contracts/SimpleWallet.sol
+1 −1 tests/contracts/Stakable.sol
+1 −1 tests/contracts/TestCodeHashFactory.sol
+1 −1 tests/contracts/TestCoin.sol
+4 −0 tests/contracts/TestReputationAccount.sol
+29 −0 tests/contracts/TestReputationAccountFactory.sol
+1 −1 tests/contracts/TestRulesAccount.sol
+1 −1 tests/contracts/TestRulesAccountFactory.sol
+1 −1 tests/contracts/TestRulesAggregator.sol
+1 −1 tests/contracts/TestRulesFactory.sol
+2 −2 tests/contracts/TestRulesPaymaster.sol
+52 −4 tests/contracts/ValidationRules.sol
+26 −0 tests/contracts/rip7560/OpcodesTestAccount.sol
+11 −0 tests/contracts/rip7560/OpcodesTestAccountFactory.sol
+30 −0 tests/contracts/rip7560/OpcodesTestPaymaster.sol
+57 −0 tests/contracts/rip7560/RIP7560Deployer.sol
+29 −0 tests/contracts/rip7560/RIP7560NonceManager.sol
+57 −0 tests/contracts/rip7560/RIP7560Paymaster.sol
+51 −0 tests/contracts/rip7560/RIP7560TestRulesAccount.sol
+27 −0 tests/contracts/rip7560/RIP7560TestRulesAccountDeployer.sol
+20 −0 tests/contracts/rip7560/RIP7560TransactionType4.sol
+70 −0 tests/contracts/rip7560/TestAccount.sol
+12 −0 tests/contracts/rip7560/TestAccountFactory.sol
+10 −0 tests/contracts/rip7560/TestCounter.sol
+27 −0 tests/contracts/rip7560/TestPaymaster.sol
+39 −0 tests/contracts/rip7560/TestPostOpPaymaster.sol
+32 −0 tests/contracts/rip7560/gaswaste/GasWasteAccount.sol
+33 −0 tests/contracts/rip7560/gaswaste/GasWastePaymaster.sol
+138 −0 tests/contracts/rip7560/utils/TestUtils.sol
+1 −0 tests/p2p/test_p2p.py
+0 −0 tests/rip7560/__init__.py
+109 −0 tests/rip7560/conftest.py
+20 −0 tests/rip7560/devnet/test_devnet.py
+139 −0 tests/rip7560/test_env_opcodes.py
+81 −0 tests/rip7560/test_gas_usage.py
+603 −0 tests/rip7560/test_rip7560.py
+55 −0 tests/rip7560/test_rip7712.py
+318 −0 tests/rip7560/test_send_failed.py
+150 −0 tests/rip7560/test_validation_rules.py
+86 −0 tests/rip7560/types.py
+46 −39 tests/single/bundle/test_bundle.py
+8 −5 tests/single/bundle/test_codehash.py
+47 −0 tests/single/bundle/test_paymaster.py
+186 −110 tests/single/bundle/test_storage_rules.py
+43 −1 tests/single/opbanning/test_op_banning.py
+113 −0 tests/single/reputation/test_erep.py
+8 −6 tests/single/reputation/test_reputation.py
+6 −2 tests/single/rpc/conftest.py
+7 −5 tests/single/rpc/test_eth_estimateUserOperationGas.py
+1 −1 tests/single/rpc/test_eth_getUserOperationReceipt.py
+5 −4 tests/single/rpc/test_eth_sendUserOperation.py
+29 −3 tests/types.py
+129 −48 tests/utils.py
1 change: 0 additions & 1 deletion empty.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#first "docker-compose" file referenced by "runbundler"
#Used to make sure all paths are relative to project root,
#regardless from where the "real" docker-compose is loaded.
version: '3'
3 changes: 2 additions & 1 deletion runall.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ name=`sed -ne 's/ *NAME=[ "]*\([^"]*\)"*/\1/p' $bundler`
test -z $name && name=$basename

echo "`date`: starting bundler $bundler, name=$name" | tee -a $outraw
if $root/runbundler/runbundler.sh $bundler pull-start; then
test -z "$CMD" && CMD=pull-start
if $root/runbundler/runbundler.sh $bundler $CMD ; then

echo "`date`: started bundler $bundler, name=$name" | tee -a $outraw

Expand Down
2 changes: 1 addition & 1 deletion runbundler/runbundler.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ case "$file" in

esac

DC="docker-compose $DCPARAMS -f $root/empty.yml -f $DCFILE"
DC="docker compose $DCPARAMS -f $root/empty.yml -f $DCFILE"
cmd=$cmd
case "$cmd" in

Expand Down
1 change: 0 additions & 1 deletion runbundler/runbundler.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# docker-compose to bring up a single bundler, with all needed services
version: '3'

services:

Expand Down

0 comments on commit 056ff6e

Please sign in to comment.