Merge pull request #378 from synapseweb3/bump-forcerelay-ckb-sdk

chore: bump forcerelay-ckb-sdk and refactor the environments of st-transfer-test CI
synapseweb3 · Nov 9, 2023 · 6ce989b · 6ce989b
2 parents 7cad2e1 + 76d60c0
commit 6ce989b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ibc-packet-trigger.yaml b/.github/workflows/ibc-packet-trigger.yaml
@@ -15,16 +15,16 @@ jobs:
     timeout-minutes: 30
     env:
         # for forcerelay-ckb-sdk
-        FORCERELAY_CKB_SDK_COMMIT: 1a1c5c1debc6d7e10f3093479f87727abf35e01b
-        AXON_RECEIVER: "f39fd6e51aad88f6f4ce6ab8827279cfffb92266"
+        FORCERELAY_CKB_SDK_COMMIT: ${{ vars.FORCERELAY_CKB_SDK_COMMIT || "main" }}
+        AXON_RECEIVER: ${{ vars.AXON_RECEIVER || "f39fd6e51aad88f6f4ce6ab8827279cfffb92266" }}
         SUDT_AMOUNT: 1000
         SDK_WORKSPACE: ${{ github.workspace }}/forcerelay-ckb-sdk
         SDK_CONFIG: ${{ github.workspace }}/e2e/schedule/sdk.config.toml
         # for ibc-solidity-contract
         AXON_HTTP_RPC_URL: https://rpc-alphanet-axon.ckbapp.dev
-        IBC_SOLIDITY_CONTRACT_COMMIT: e0d1f4bf20c40aad721bff5838d8a3fa80c94585
+        IBC_SOLIDITY_CONTRACT_COMMIT: ${{ vars.IBC_SOLIDITY_CONTRACT_COMMIT || "e0d1f4bf20c40aad721bff5838d8a3fa80c94585" }} 
         CONTRACT_WORKSPACE: ${{ github.workspace }}/ibc-solidity-contract
-        TRANSFER_CONTRACT_ADDRESS: "0x9E545E3C0baAB3E08CdfD552C960A1050f373042"
+        TRANSFER_CONTRACT_ADDRESS: ${{ vars.TRANSFER_CONTRACT_ADDRESS || "0x9E545E3C0baAB3E08CdfD552C960A1050f373042" }}
         CHANNEL: channel-8
         DENOM: f2a14f50a56b9aab8e960cb1b2c7f1152d7523e6cacb45b1ab2a94acb83e0233
         AMOUNT: 990
@@ -38,7 +38,9 @@ jobs:
           script: return Date.now()
           result-encoding: string
 
-      - uses: actions/checkout@v4
+      - name: Checkout Forcerelay
+        uses: actions/checkout@v4
+
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -49,14 +51,14 @@ jobs:
         with:
           node-version: 18.x
 
-      - name: Prepare IBC solidity contracts
+      - name: Git checkout IBC solidity contracts synapseweb3/ibc-solidity-contract@${{ env.IBC_SOLIDITY_CONTRACT_COMMIT }}
         run: git clone --recursive https://github.com/synapseweb3/ibc-solidity-contract.git $CONTRACT_WORKSPACE && cd $CONTRACT_WORKSPACE && git checkout $IBC_SOLIDITY_CONTRACT_COMMIT
 
       - name: Build and compile IBC solidity contracts
         working-directory: ${{ env.CONTRACT_WORKSPACE }}
         run: yarn install && yarn compile
 
-      - name: Download forcerelay-ckb-sdk
+      - name: Git checkout forcerelay-ckb-sdk@${{ env.FORCERELAY_CKB_SDK_COMMIT }}
         run: git clone --recursive https://github.com/synapseweb3/forcerelay-ckb-sdk.git $SDK_WORKSPACE && cd $SDK_WORKSPACE && git checkout $FORCERELAY_CKB_SDK_COMMIT
 
       - name: Install forcerelay-ckb-sdk example (sudt-transfer)

diff --git a/e2e/schedule/sdk.config.toml b/e2e/schedule/sdk.config.toml
@@ -5,7 +5,7 @@ confirmations = 3
 
 ckb_rpc_url = "https://testnet.ckbapp.dev/"
 
-[user_lock_script]
+[module_lock_script]
 code_hash = "0x12b7f23d284e3221fe0730ca5753c28f9302c7368d83101637684c424b242a95"
 hash_type = "type"
 args = "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"