Merge branch 'feature/verifier-v9.0.0-rc.1-fork.13' into rebase-sov-b…

…anana
0xPolygonHermez · Oct 24, 2024 · f686020 · f686020
2 parents 29023ea + fb877be
commit f686020
Show file tree

Hide file tree

Showing 27 changed files with 1,981 additions and 859 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -17,12 +17,12 @@ if npm run lint; then
     cp artifacts/contracts/mocks/PolygonZkEVMMock.sol/PolygonZkEVMMock.json compiled-contracts/
     cp artifacts/contracts/mocks/VerifierRollupHelperMock.sol/VerifierRollupHelperMock.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVM.sol/PolygonZkEVM.json compiled-contracts/
-    cp artifacts/contracts/verifiers/FflonkVerifier.sol/FflonkVerifier.json compiled-contracts/
+    cp artifacts/contracts/verifiers/FflonkVerifier_10.sol/FflonkVerifier_10.json compiled-contracts/FflonkVerifier.json
     cp artifacts/@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json compiled-contracts/
     cp artifacts/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json compiled-contracts/
     cp artifacts/contracts/deployment/PolygonZkEVMDeployer.sol/PolygonZkEVMDeployer.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVMTimelock.sol/PolygonZkEVMTimelock.json compiled-contracts/
-    
+
     cp artifacts/contracts/v2/PolygonRollupManager.sol/PolygonRollupManager.json compiled-contracts/
     cp artifacts/contracts/v2/mocks/PolygonRollupManagerMock.sol/PolygonRollupManagerMock.json compiled-contracts/
     cp artifacts/contracts/v2/mocks/PolygonRollupManagerMockInternalTest.sol/PolygonRollupManagerMockInternalTest.json compiled-contracts/

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -14,7 +14,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [20.x]
+                node-version: [18.x]
 
         steps:
             - name: Use Node.js ${{ matrix.node-version }}
@@ -29,4 +29,6 @@ jobs:
                   sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
                   sudo chmod +x /usr/local/bin/docker-compose
             - name: Build docker
-              run: npm run docker:contracts
+              run: npm run dockerv2:contracts
+            - name: Test docker
+              run: npm run docker:tests
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -15,7 +15,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [20.x]
+                node-version: [18.x]
 
         steps:
             - name: Use Node.js ${{ matrix.node-version }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [20.x]
+                node-version: [18.x]
 
         steps:
             - name: Use Node.js ${{ matrix.node-version }}

diff --git a/compiled-contracts/ClaimCompressor.json b/compiled-contracts/ClaimCompressor.json
diff --git a/compiled-contracts/FflonkVerifier.json b/compiled-contracts/FflonkVerifier.json