From 4c90cd5ce944ae6e0e663b28439b8fb3e00dfb61 Mon Sep 17 00:00:00 2001 From: krlosMata Date: Mon, 20 Nov 2023 15:56:26 +0100 Subject: [PATCH] update packages --- .github/workflows/main.yml | 9 +++------ package.json | 6 +++--- tools/full-tracer-tests/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bbfb31f..b577cf74 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ name: Main CI on: pull_request: - branches: + branches: - main - develop push: @@ -27,18 +27,15 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: ${{ secrets.INT_BOT_SSH_KEY }} - name: Clone repos run: | cd .. - git clone https://github.com/0xPolygonHermez/zkevm-testvectors.git --branch v2.0.0-fork.5 + git clone https://github.com/0xPolygonHermez/zkevm-testvectors.git --branch v3.0.0-rc.1-fork.6 cd zkevm-testvectors/tools/ethereum-tests git clone https://github.com/0xPolygonHermez/ethereum-tests tests cd tests git checkout test-vectors - cd ../../../../zkevm-proverjs-internal + cd ../../../../zkevm-proverjs - name: setup zkevm-proverjs run: | npm i diff --git a/package.json b/package.json index 001e88db..700b8d3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@0xpolygonhermez/zkevm-proverjs", - "version": "1.1.0", + "version": "3.0.0", "description": "JS version of the zkProver.", "main": "index.js", "config": { @@ -118,8 +118,8 @@ "license": "UNLICENSED", "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-internal.git#v3.0.0-fork.6", + "@0xpolygonhermez/zkevm-commonjs": "https://github.com/0xPolygonHermez/zkevm-commonjs.git#v3.0.0-fork.6", + "@0xpolygonhermez/zkevm-rom": "https://github.com/0xPolygonHermez/zkevm-rom.git#feature/incaberry", "@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", diff --git a/tools/full-tracer-tests/Dockerfile b/tools/full-tracer-tests/Dockerfile index cede39e0..bd88dcd1 100644 --- a/tools/full-tracer-tests/Dockerfile +++ b/tools/full-tracer-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:latest +FROM ethereum/client-go:v1.12.0 COPY node1 /node1 COPY boot.key /