Sync main to forcerelay-dev branch (#1643)

Due to 922fc38, Hardfork CI will failed in [forcerelay-dev](https://github.com/axonweb3/axon/tree/forcerelay-dev) branch. It's under expectation. ### What is the impact of this PR? **Breaking Change** **PR relation**: - #1642
axonweb3 · Dec 19, 2023 · 343f329 · 343f329
2 parents 922fc38 + 2074ff1
commit 343f329
Show file tree

Hide file tree

Showing 50 changed files with 1,078 additions and 417 deletions.
diff --git a/.github/workflows/axon-start-test.yml b/.github/workflows/axon-start-test.yml
@@ -60,7 +60,7 @@ jobs:
 
     - name: Archive logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: single-axon-node-logs
         path: |
@@ -131,7 +131,7 @@ jobs:
 
     - name: Archive logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: multi-axon-nodes-logs
         path: |

diff --git a/.github/workflows/build_image_ghcr.yml b/.github/workflows/build_image_ghcr.yml
@@ -103,7 +103,7 @@ jobs:
     - name: Modify the Axon image of in devtools/chain/docker-compose.yml
       env:
         AXON_IMAGE: "${{ needs.build-amd64-image-to-ghcr.outputs.image_name }}:${{ needs.build-amd64-image-to-ghcr.outputs.image_tag }}"
-      uses: mikefarah/[email protected].4
+      uses: mikefarah/[email protected].5
       with:
         cmd: yq -i '.services.axon.image = "${{ env.AXON_IMAGE }}"' 'devtools/chain/docker-compose.yml'
 

diff --git a/.github/workflows/chaos.yml b/.github/workflows/chaos.yml
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -82,7 +82,7 @@ jobs:
           token: ${{secrets.CODECOV_TOKEN}}
 
       - name: archive code coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: cobertura.xml

diff --git a/.github/workflows/hardfork_test.yml b/.github/workflows/hardfork_test.yml
@@ -74,15 +74,15 @@ jobs:
         EOF
       timeout-minutes: 1
 
-    - name: Checkout axonweb3/axon-hardfork-test
+    - name: Checkout axonweb3/system-contract-test
       uses: actions/checkout@v4
       with:
-        repository: axonweb3/axon-hardfork-test
-        ref: b1f768de8be10604cad882474c0dcfa19c0a93ea
-        path: axon-hardfork-test
+        repository: axonweb3/system-contract-test
+        ref: 69293ac366991cf5830ab8366a85d72449daeadc
+        path: system-contract-test
 
     - name: Choose network
-      working-directory: axon-hardfork-test
+      working-directory: system-contract-test
       run: |
         node_ids=(1 2 3 4)
         random_value=$(( (RANDOM % ${#node_ids[@]}) + 1 ))
@@ -93,28 +93,34 @@ jobs:
         grep "defaultNetwork" hardhat.config.ts
 
     - name: Run test cases before hardfork
-      working-directory: axon-hardfork-test
+      working-directory: system-contract-test
       run: |
         npm install
         npx hardhat test --grep "deploy a normal contract"
         npx hardhat test --grep "deploy a big contract larger than max_contract_limit"
         npx hardhat test --grep "check hardfork info before hardfork"
 
+    - name: Run test cases to verify proof
+      working-directory: system-contract-test
+      run: |
+        npx hardhat test --grep "transfer demo"
+        npx hardhat test test/verifyProof.ts --network proof
+
     - name: Hardfork
-      working-directory: axon-hardfork-test
+      working-directory: system-contract-test
       run: |
         bash hardfork.sh ../
 
     - name: Run test cases after hardfork
-      working-directory: axon-hardfork-test
+      working-directory: system-contract-test
       run: |
         npx hardhat test --grep "check hardfork info after hardfork"
         npx hardhat test --grep "update max_contract_limit"
         npx hardhat test --grep "deploy a big contract smaller than max_contract_limit"
 
     - name: Archive logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: multi-axon-nodes-logs
         path: |

diff --git a/.github/workflows/openzeppelin_test_11.yml b/.github/workflows/openzeppelin_test_11.yml
@@ -174,7 +174,7 @@ jobs:
 
       - name: Publish reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: openzeppelin-contracts/mochawesome-report/

diff --git a/.github/workflows/openzeppelin_test_16_19.yml b/.github/workflows/openzeppelin_test_16_19.yml
@@ -185,7 +185,7 @@ jobs:
           curl http://localhost:8000 -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"eth_blockNumber","params": [],"id":1}'
       - name: Publish reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: openzeppelin-contracts/mochawesome-report/

diff --git a/.github/workflows/openzeppelin_test_1_5_and_12_15.yml b/.github/workflows/openzeppelin_test_1_5_and_12_15.yml
@@ -215,7 +215,7 @@ jobs:
 
       - name: Publish reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: openzeppelin-contracts/mochawesome-report/

diff --git a/.github/workflows/openzeppelin_test_6_10.yml b/.github/workflows/openzeppelin_test_6_10.yml
@@ -191,7 +191,7 @@ jobs:
           curl http://localhost:8000 -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"eth_blockNumber","params": [],"id":1}'
       - name: Publish reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: openzeppelin-contracts/mochawesome-report/

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -106,7 +106,7 @@ jobs:
           popd
           mv ${{ github.workspace }}/releases/axon_${{ needs.version.outputs.tag }}_${{ matrix.job.REL_PKG}} ${{ github.workspace }}
       - name: upload-zip-file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: axon_${{ needs.version.outputs.tag }}_${{ matrix.job.REL_PKG }}
           path: axon_${{ needs.version.outputs.tag }}_${{ matrix.job.REL_PKG }}
@@ -126,7 +126,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Prepare - Download tar
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: axon_${{ needs.version.outputs.tag }}_${{ matrix.REL_PKG }}
       - name: Upload tar assets
@@ -138,22 +138,3 @@ jobs:
           asset_name: axon_${{ needs.version.outputs.tag }}_${{ matrix.REL_PKG }}
           asset_path: ${{ github.workspace }}/axon_${{ needs.version.outputs.tag }}_${{ matrix.REL_PKG }}
           asset_content_type: application/octet-stream
-
-  trigger-build-docker-image:
-    runs-on: ubuntu-22.04
-    needs:
-      - version
-    steps:
-      - uses: actions/checkout@v4
-      - name: Generate axon-bot token
-        id: generate_axon_bot_token
-        uses: wow-actions/use-app-token@v2
-        with:
-          app_id: ${{ secrets.AXON_BOT_APP_ID }}
-          private_key: ${{ secrets.AXON_BOT_PRIVATE_KEY }}
-      - name: Invoke build docker image with inputs
-        uses: aurelien-baudet/workflow-dispatch@v2
-        with:
-          workflow: Build docker image
-          token: ${{ secrets.GITHUB_TOKEN }}
-          inputs: '{ "dispatch": "${{ needs.version.outputs.tag }}" }'
diff --git a/.github/workflows/v3_core_test.yml b/.github/workflows/v3_core_test.yml
@@ -178,7 +178,7 @@ jobs:
 
       - name: Publish reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: v3-core/mochawesome-report/

diff --git a/.github/workflows/web3_compatible.yml b/.github/workflows/web3_compatible.yml
@@ -162,7 +162,7 @@ jobs:
 
       - name: Publish reports
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: axon-test/mochawesome-report/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * fix!: fix the implementation of Axon Tries ([\#1580](https://github.com/axonweb3/axon/pull/1580))
 * refactor!: call reserved system contract address is forbidden ([\#1597](https://github.com/axonweb3/axon/pull/1597))
 * refactor!: change many U256 type to U64 ([\#1591](https://github.com/axonweb3/axon/pull/1591))
+* fix(mempool)!: check gas limit range ([\#1634](https://github.com/axonweb3/axon/pull/1634))
 
 ### FEATURES
 
@@ -18,7 +19,6 @@
 * feat: add ckb mbt proof verify precompile contract ([\#1578](https://github.com/axonweb3/axon/pull/1578))
 * feat: support stop at specific height ([\#1581](https://github.com/axonweb3/axon/pull/1581))
 
-
 ### BUG FIXES
 
 * Fix value of gas in JSON RPC Transaction should be gas limit ([\#1530](https://github.com/axonweb3/axon/pull/1530))
@@ -45,6 +45,7 @@
 * refactor: rename Proof.block_hash serde to proposal_hash ([\#1618](https://github.com/axonweb3/axon/pull/1618))
 * refactor: forbid call eth_getStorageAt to system contract accounts ([\#1619](https://github.com/axonweb3/axon/pull/1619))
 * refactor: change estimate gas calculation logic ([\#1603](https://github.com/axonweb3/axon/pull/1603), [\#1626](https://github.com/axonweb3/axon/pull/1626))
+* refactor(cli): update keypair generate command ([\#1621](https://github.com/axonweb3/axon/pull/1621))
 
 ### CHORE
 * ci: adjust CI after migrating the test projects ([\#1513](https://github.com/axonweb3/axon/pull/1513))