Develop

.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/

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# global owner
+*       @invocamanman
+
+# src owners
+/contracts/   @invocamanman @krlosMata @ignasirv @laisolizq

.github/workflows/build-docker.yml

@@ -4,57 +4,31 @@
 name: Build-Docker image
 
 on:
-  push:
-    branches: [main]
+    push:
+        branches: [main, develop, feature/ongoingPP]
+    pull_request:
+        branches: [main, develop, feature/ongoingPP]
 jobs:
-  build:
-    runs-on: ubuntu-latest
+    build:
+        runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [16.x]
+        strategy:
+            matrix:
+                node-version: [18.x]
 
-    steps:
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Set int-bot SSH key
-        run: |
-          touch /tmp/ssh-key
-          echo "${{ secrets.INT_BOT_SSH_KEY }}" > /tmp/ssh-key
-          chmod 400 /tmp/ssh-key
-          eval "$(ssh-agent -s)"
-          ssh-add /tmp/ssh-key
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: setup
-        run: |
-          eval "$(ssh-agent -s)"
-          ssh-add /tmp/ssh-key
-          npm i
-          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: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build docker
-        run: npm run docker:contracts
-      - name: Push docker image
-        run: npm run push:docker:contracts
-      # Steps to push multi-platform image, it relies on the previous step:
-      #  npm run docker:contracts
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: hermeznetwork/geth-zkevm-contracts:1.5-integration
-          file: docker/Dockerfile
-          context: .
+        steps:
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v3
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Checkout code
+              uses: actions/checkout@v3
+            - name: Setup docker
+              run: |
+                  npm i
+                  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 dockerv2:contracts
+            - name: Test docker
+              run: npm run docker:tests

.github/workflows/compile.yml

@@ -0,0 +1,32 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Main CI
+
+on:
+    push:
+        branches: [feature/ongoingPP]
+    pull_request:
+        branches: [feature/ongoingPP]
+
+jobs:
+    lint-and-test:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version: [18.x]
+
+        steps:
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v3
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Checkout code
+              uses: actions/checkout@v3
+            - name: setup
+              run: npm i
+            - name: linter
+              run: npm run lint
+            - name: compile
+              run: npm run compile

.github/workflows/main.yml

@@ -4,30 +4,29 @@
 name: Main CI
 
 on:
-  push:
-    branches: [main, develop]
-  pull_request:
-    branches: [main, develop]
+    push:
+        branches: [main, develop]
+    pull_request:
+        branches: [main, develop]
 
 jobs:
-  lint-and-test:
-    runs-on: ubuntu-latest
+    lint-and-test:
+        runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [16.x]
+        strategy:
+            matrix:
+                node-version: [18.x]
 
-    steps:
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: setup
-        run: npm i
-      - name: linter
-        run: npm run lint
-      - name: test
-        run: npm run test
-
+        steps:
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v3
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Checkout code
+              uses: actions/checkout@v3
+            - name: setup
+              run: npm i
+            - name: linter
+              run: npm run lint
+            - name: test
+              run: npm run test