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/buildsetup fork.5 #215

Merged
merged 5 commits into from
Sep 22, 2023
Merged

Feature/buildsetup fork.5 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46b33fa
buildsetup v2.0.0-RC4-fork.5
zkronos73 Aug 14, 2023
bdfb042
fix inexistent version of storage on package.json
zkronos73 Sep 14, 2023
ccb9604
update packages
krlosMata Sep 21, 2023
d40dab0
Merge branch 'develop' into feature/buildsetup-fork.5
krlosMata Sep 21, 2023
974bbb1
Fix returnData at FT tests
ignasirv Sep 21, 2023
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.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Clone repos
run: |
cd ..
git clone https://github.com/0xPolygonHermez/zkevm-testvectors.git
git clone https://github.com/0xPolygonHermez/zkevm-testvectors.git --branch v2.0.0-fork.5
cd zkevm-testvectors/tools/ethereum-tests
git clone https://github.com/0xPolygonHermez/ethereum-tests tests
cd tests
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"dependencies": {
"@0xpolygonhermez/zkasmcom": "https://github.com/0xPolygonHermez/zkasmcom.git#v1.0.0",
"@0xpolygonhermez/zkevm-commonjs": "https://github.com/0xPolygonHermez/zkevm-commonjs.git#v2.0.0-fork.5",
"@0xpolygonhermez/zkevm-rom": "https://github.com/0xPolygonHermez/zkevm-rom.git#v1.1.0-fork.4",
"@0xpolygonhermez/zkevm-rom": "https://github.com/0xPolygonHermez/zkevm-rom.git#v2.0.0-fork.5",
"@0xpolygonhermez/zkevm-storage-rom": "https://github.com/0xPolygonHermez/zkevm-storage-rom.git#v1.0.0-fork.3",
"@grpc/grpc-js": "^1.8.14",
"chalk": "^3.0.0",
Expand All @@ -134,7 +134,7 @@
"lodash": "^4.17.21",
"pil-stark": "https://github.com/0xPolygonHermez/pil-stark.git#develop",
"pilcom": "0.0.23",
"snarkjs": "0.6.9",
"snarkjs": "0.7.0",
"yargs": "^17.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tools/full-tracer-tests/full-tracer-tests-prover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ function compareDefaultTrace(geth, fullTracer, i) {
// memSize?
stack: step.stack,
depth: step.depth,
// returndata?
returnData: step.return_data,
};
if (Number(step.gas_refund) > 0) {
newStep.refund = Number(step.gas_refund);
Expand Down
2 changes: 1 addition & 1 deletion tools/full-tracer-tests/full-tracer-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ async function compareDefaultTracer(geth, fullTracer, i) {
// memSize?
stack: step.stack,
depth: step.depth,
// returndata?
returnData: step.return_data,
};
if (Number(step.gas_refund) > 0) {
newStep.refund = Number(step.gas_refund);
Expand Down
Loading