Feature/feijoa

.githooks/pre-commit

@@ -3,9 +3,9 @@
 ## To use this hook execute in the project root:
 ## git config --local core.hooksPath .githooks/
 if npm run lint; then
-    npx hardhat compile --force
-    npm run docgen
-    git add docs
+    # npx hardhat compile --force
+    # npm run docgen
+    # git add docs
     cp artifacts/contracts/PolygonZkEVMBridge.sol/PolygonZkEVMBridge.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVMGlobalExitRoot.sol/PolygonZkEVMGlobalExitRoot.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVMGlobalExitRootL2.sol/PolygonZkEVMGlobalExitRootL2.json compiled-contracts/
@@ -25,18 +25,15 @@ if npm run lint; then
 
     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/
 
     cp artifacts/contracts/v2/PolygonZkEVMBridgeV2.sol/PolygonZkEVMBridgeV2.json compiled-contracts/
     cp artifacts/contracts/v2/PolygonZkEVMGlobalExitRootV2.sol/PolygonZkEVMGlobalExitRootV2.json compiled-contracts/
 
     cp artifacts/contracts/v2/PolygonZkEVMGlobalExitRootV2.sol/PolygonZkEVMGlobalExitRootV2.json compiled-contracts/
-    cp artifacts/contracts/v2/consensus/zkEVM/PolygonZkEVMEtrog.sol/PolygonZkEVMEtrog.json compiled-contracts/
-    cp artifacts/contracts/v2/consensus/zkEVM/PolygonZkEVMExistentEtrog.sol/PolygonZkEVMExistentEtrog.json compiled-contracts/
-    cp artifacts/contracts/v2/previousVersions/PolygonZkEVMEtrogPrevious.sol/PolygonZkEVMEtrogPrevious.json compiled-contracts/
+    cp artifacts/contracts/v2/consensus/feijoa/zkEVM/PolygonZkEVMFeijoa.sol/PolygonZkEVMFeijoa.json compiled-contracts/
 
-    cp artifacts/contracts/v2/consensus/validium/PolygonValidiumEtrog.sol/PolygonValidiumEtrog.json compiled-contracts/
-    cp artifacts/contracts/v2/consensus/validium/PolygonDataCommittee.sol/PolygonDataCommittee.json compiled-contracts/
+    cp artifacts/contracts/v2/consensus/feijoa/validium/PolygonValidiumFeijoa.sol/PolygonValidiumFeijoa.json compiled-contracts/
+    cp artifacts/contracts/v2/consensus/feijoa/validium/PolygonDataCommittee.sol/PolygonDataCommittee.json compiled-contracts/
 
     cp artifacts/contracts/v2/utils/ClaimCompressor.sol/ClaimCompressor.json compiled-contracts/
 

.github/workflows/main.yml

@@ -15,15 +15,15 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: setup
         run: npm i
       - name: linter

.solhint.json

@@ -1,14 +1,14 @@
 {
-  "extends": "solhint:recommended",
-  "rules": {
-    "mark-callable-contracts": "off",
-    "no-empty-blocks": "off",
-    "compiler-version": ["error", "0.8.20"],
-    "private-vars-leading-underscore": "error",
-    "bracket-align": "off",
-    "reason-string": "off",
-    "not-rely-on-time": "off",
-    "no-inline-assembly": "off",
-    "check-send-result": "off"
-  }
+    "extends": "solhint:recommended",
+    "rules": {
+        "mark-callable-contracts": "off",
+        "no-empty-blocks": "off",
+        "compiler-version": ["error", "0.8.24"],
+        "private-vars-leading-underscore": "error",
+        "bracket-align": "off",
+        "reason-string": "off",
+        "not-rely-on-time": "off",
+        "no-inline-assembly": "off",
+        "check-send-result": "off"
+    }
 }

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
   "editor.formatOnSave": true,
   "solidity.linter": "solhint",
-  "solidity.compileUsingRemoteVersion": "v0.8.20+commit.a1b79de6",
   "solidity.remappings": [
     "@openzeppelin/=node_modules/@openzeppelin"
   ],
@@ -13,4 +12,6 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true
   },
+  "solidity.compileUsingRemoteVersion": "v0.8.24+commit.e11b9ed9",
+  "solidity.evmVersion": "cancun"
 }