merge develop

Author: chenyukang

.github/workflows/e2e.yml

@@ -33,6 +33,21 @@ jobs:
             test_env: "test"
             release: "0.116.1"
             extra_bru_args: "--env-var HASH_ALGORITHM=sha256"
+
+          ######################################
+          # Funding Tx Verification Test Cases
+          - workflow: "funding-tx-verification"
+            test_env: "test"
+            release: "0.116.1"
+            extra_bru_args: "--env-var FUNDING_TX_VERIFICATION_CASE=remove_change"
+          - workflow: "funding-tx-verification"
+            test_env: "test"
+            release: "0.116.1"
+            extra_bru_args: "--env-var FUNDING_TX_VERIFICATION_CASE=modify_change"
+          - workflow: "funding-tx-verification"
+            test_env: "test"
+            release: "0.116.1"
+            extra_bru_args: "--env-var FUNDING_TX_VERIFICATION_CASE=fund_from_peer"
     name: e2e test for ${{ matrix.workflow }} --env ${{ matrix.test_env }} ${{ matrix.extra_bru_args }}
     runs-on: ubuntu-latest
     steps:
@@ -58,18 +73,16 @@ jobs:
         id: e2eTests
         run: |
           set -euo pipefail
-          if [ ${{ matrix.workflow }} = "cross-chain-hub" ]; then
-            ./tests/deploy/lnd-init/setup-lnd.sh
-          fi
+          # Save matrix values to generate unique ID for upload-artifact
+          echo '${{ toJSON(matrix) }}' > matrix.json
 
           # Prebuild the program so that we can run the following script faster
           cargo build --locked
           cd ./tests/deploy/udt-init && cargo build --locked && cd -
-          if [ ${{ matrix.workflow }} = "router-pay" ]; then
-            export START_BOOTNODE=y
-          fi
           export ON_GITHUB_ACTION=y
-          ./tests/nodes/start.sh &
+          # Pass it to tests/funding-tx-builder as args
+          export EXTRA_BRU_ARGS="${{ matrix.extra_bru_args }}"
+          ./tests/nodes/start.sh "e2e/${{ matrix.workflow }}" &
 
           # Wait for the nodes to start, the initialization takes some time
           # check all the ports are open
@@ -125,8 +138,9 @@ jobs:
           # -n means we will exit when any of the background processes exits.
           # https://www.gnu.org/software/bash/manual/bash.html#index-wait
           wait -n
+
       - uses: actions/upload-artifact@v4
         if: failure() && steps.e2eTests.outcome == 'failure'
         with:
-          name: e2e-test-${{ matrix.workflow }}-logs
+          name: e2e-test-${{ matrix.workflow }}-${{ hashFiles('matrix.json') }}-logs
           path: tests/nodes/*.log

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "fiber-bin"
-version = "0.6.0-rc2"
+version = "0.6.0-rc3"
 edition = "2021"
 
 [[bin]]

crates/fiber-bin/Cargo.toml

@@ -2,7 +2,7 @@
 build = "src/build.rs"
 edition = "2021"
 name = "fnn"
-version = "0.6.0-rc2"
+version = "0.6.0-rc3"
 
 [lib]
 crate-type = ["cdylib", "rlib"]