Skip to content

Commit

Permalink
Merge pull request #349 from 0xPolygonHermez/feature/fix-pre-revert
Browse files Browse the repository at this point in the history
fix call precompiled revert
  • Loading branch information
laisolizq authored Feb 21, 2024
2 parents c6ca831 + 2a9c307 commit 7389a4c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Test executor inputs
on:
workflow_dispatch:
pull_request:
branches: [main, develop, develop-feijoa]
branches: [main, develop, develop-no-opt, develop-feijoa]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion main/precompiled/revert-precompiled.zkasm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ revertPrecompiled:
$${eventLog(onError, revert)}
:CALL(revertBlockInfoTree)
; check if it is the first context
$ => A :MLOAD(originCTX), JMPZ(handleGas) ; first context
$ => A :MLOAD(originCTX), JMPZ(handleGasFromError) ; first context
A => CTX :MSTORE(currentCTX)

; clear retDataCTX, no return data in revert precompiled
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"yargs": "^17.5.1"
},
"devDependencies": {
"@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v4.0.0-fork.7",
"@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#develop-no-opt",
"@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#develop-eldelberry",
"@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#develop-no-opt",
"chai": "^4.3.6",
Expand Down

0 comments on commit 7389a4c

Please sign in to comment.