Backport #1634 #1621 to 0.3.x-dev

.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/yq@v4.40.4
+      uses: mikefarah/yq@v4.40.5
       with:
         cmd: yq -i '.services.axon.image = "${{ env.AXON_IMAGE }}"' 'devtools/chain/docker-compose.yml'
 

.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,20 +93,26 @@ 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"

.github/workflows/release.yml

@@ -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 }}" }'

Cargo.toml

@@ -41,7 +41,6 @@ members = [
     "core/storage",
     "devtools/abi-generator",
     "devtools/axon-tools",
-    "devtools/keypair",
     "protocol",
 ]
 

core/cli/Cargo.toml

@@ -5,14 +5,17 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0"
 clap = { version = "4.4", features = ["cargo", "string", "derive"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tempfile = "3.6"
+tentacle-secio = "0.6"
 thiserror = "1.0"
 
 common-config-parser = { path = "../../common/config-parser" }
+common-crypto ={ path = "../../common/crypto" }
 common-logger = { path = "../../common/logger" }
 common-version = { path = "../../common/version" }
 core-run = { path = "../../core/run" }