Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/25 update #396

Merged
merged 6 commits into from
Sep 23, 2024
Merged

Feature/25 update #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98ab32c
update test-vectors fork 11
laisolizq Jul 23, 2024
6d4b3c6
update GHA tests
laisolizq Jul 23, 2024
81a47e4
update sample tests parallel
laisolizq Jul 24, 2024
8f81f45
update test-vectors tag 11
laisolizq Jul 24, 2024
85e64b4
Improved fix
ignasirv Sep 3, 2024
e1b4876
Update packages
ignasirv Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
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-no-opt, develop-feijoa]
branches: [main, develop, develop-no-opt, develop-feijoa, feature/25]

jobs:
build:
Expand Down
7 changes: 4 additions & 3 deletions main/opcodes/stack-operations.zkasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,17 @@ opPUSH32:
opAuxPUSHA:
; checks zk-counters
%MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
; check out-of-gas
GAS - %GAS_FASTEST_STEP => GAS :JMPN(outOfGas)

$ => B :MLOAD(bytecodeLength)
PC + D - B :JMPN(opAuxPUSHA2)
B - PC => D
B - PC => D,E :JMPZ(lastOpcodeIsPush)

opAuxPUSHA2:
; check out-of-gas
GAS - %GAS_FASTEST_STEP => GAS :JMPN(outOfGas)
; read bytes from calldata
D => E :CALL(readPush); in: [D,E: bytes to read] out: [E: value read]
lastOpcodeIsPush:
; store stack output
E :MSTORE(SP++); [pushed_value(E) => SP]
; check stack overflow
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"yargs": "^17.5.1"
},
"devDependencies": {
"@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v6.0.0-fork.9",
"@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#b8c17caeb6fe1c234f2c1d2dba5c26c6c3951665",
"@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#v6.0.1-fork.9",
"@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v7.0.0-fork.10-11",
"@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#v7.0.0-fork.10-11",
"@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#v7.0.0-fork.11",
"chai": "^4.3.6",
"chalk": "^3.0.0",
"eslint": "^8.25.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/parallel-testing/parallel-tests-sample/sample.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const smMain = require('@0xpolygonhermez/zkevm-proverjs/src/sm/sm_main/sm_main')

let rom = require('../../../build/rom.json');

let stepsN = 2 ** 23;
let stepsN = 2 ** 25;
let counters = false;

const fileCachePil = path.join(__dirname, '../../../node_modules/@0xpolygonhermez/zkevm-proverjs/cache-main-pil.json');
Expand Down
Loading