Merge remote-tracking branch 'origin/main' into feat/solana-program-s…

…waps-close-accounts

* origin/main: (44 commits)
  fix: expire all previous epochs (#5279)
  feat: add/update contract swaps parameters (#5343)
  chore: add address to solana logging (#5353)
  fix: ignore dust underflows in order fills rpc (#5352)
  chore: consistent naming prewitnessed (#5351)
  feat: engine-runner verifies gpg signature of old dylib when downloaded (#5339)
  feat: tainted transaction reporting (#5310)
  bug: change_utxo not always present (#5340)
  feat: structured error return types for rpcs (#5346)
  chore: unify dependencies to root cargo.toml (#5333)
  feat: Submit a slot number alongside nonce (#5297)
  chore: use node version from `.nvmrc` 📌 (#5336)
  chore: add engine account_info logging (#5347)
  chore: replace manual scale encoding for ts-scale (#5335)
  chore: more consistent params in Broker API (#5342)
  feat: broker can encode btc smart contract call (#5329)
  chore: localnet recreate script can use defaults (#5338)
  feat: witnessing btc smart contract swaps (#5331)
  feat: Solana CCM fallback (#5316)
  fix: scale types for pending ceremonies (#5286)
  ...

# Conflicts:
#	Cargo.lock
#	state-chain/chains/src/sol/api.rs
#	state-chain/pallets/cf-broadcast/src/migrations.rs
#	state-chain/pallets/cf-environment/Cargo.toml

.github/workflows/_01_pre_check.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Configure NodeJS 🛠️
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
         with:
-          node-version: 20
+          node-version-file: ./bouncer/.nvmrc
           cache: "pnpm"
           registry-url: "https://npm.pkg.github.com"
           cache-dependency-path: "bouncer/pnpm-lock.yaml"

.github/workflows/_03_release_checks.yml

@@ -27,10 +27,9 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Install Rust 🦀
-        uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f
+        uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
         with:
           toolchain: stable
-          override: true
 
       - name: Extract version from Cargo.toml 🌽
         id: cargo

.github/workflows/_05_force_version_bump.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Configure NodeJS 🛠️
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
         with:
-          node-version: 20
+          node-version-file: ./bouncer/.nvmrc
           cache: "pnpm"
           cache-dependency-path: "bouncer/pnpm-lock.yaml"
 

.github/workflows/_11_coverage.yml

@@ -46,7 +46,7 @@ jobs:
         run: cargo llvm-cov --lib --features ${{ inputs.test_features}} --workspace --codecov --output-path lcov.info
 
       - name: Upload coverage to Codecov 📊
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238
         with:
           token: ${{ secrets.CF_BACKEND_CODECOV_TOKEN }} # not required for public repos
           files: lcov.info

.github/workflows/_20_build.yml

@@ -5,6 +5,10 @@ on:
         default: release
         description: Profile to build
         type: string
+      is-mainnet:
+        default: false
+        description: Whether to build for mainnet (currently just for verifying dylibs)
+        type: boolean
       upload-name:
         default: chainflip-backend-bin
         description: Name of the folder to upload the binaries to
@@ -17,6 +21,7 @@ on:
 env:
   FORCE_COLOR: 1
   COMMIT_HASH: ${{ github.sha }}
+  CF_MAINNET_GPG_KEY_ID: "4E506212E4EF4E0D3E37E568596FBDCACBBCDD37"
 
 jobs:
   compile:
@@ -35,10 +40,31 @@ jobs:
       - name: Configure Git 🛠️
         run: git config --global --add safe.directory "${GITHUB_WORKSPACE}"
 
+      - name: Import GPG key from Ubuntu key server 🔑
+        if: inputs.is-mainnet
+        run: |
+          gpg --keyserver keyserver.ubuntu.com --recv-keys $CF_MAINNET_GPG_KEY_ID
+          gpg --list-keys
+
+      - name: Verify GPG key import ✅
+        if: inputs.is-mainnet
+        run: |
+          gpg --list-keys | grep -q "$CF_MAINNET_GPG_KEY_ID"
+          if [ $? -eq 0 ]; then
+            echo "GPG key successfully imported"
+          else
+            echo "Failed to import GPG key"
+            exit 1
+          fi
+
       - name: Build chainflip binaries 🏗️
         run: |
+          if [ "${{ inputs.is-mainnet }}" = "true" ]; then
+            export IS_MAINNET=true
+          fi
           cargo cf-build-${{ inputs.profile }} --locked
 
+
       - name: ls directory
         run: |
           ls -la ./target/${{ inputs.binary-subdir }}

.github/workflows/_40_post_check.yml

@@ -3,7 +3,7 @@ name: Post build checks
 on:
   workflow_call:
     inputs:
-      full_bouncer:
+      full-bouncer:
         type: boolean
         default: false
       timeout-minutes:
@@ -57,7 +57,7 @@ jobs:
       - name: Configure NodeJS 🛠️
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
         with:
-          node-version: 20
+          node-version-file: ./bouncer/.nvmrc
           cache: "pnpm"
           cache-dependency-path: "bouncer/pnpm-lock.yaml"
 
@@ -122,15 +122,15 @@ jobs:
         run: python3 ./ci/scripts/get_ngrok_urls.py
 
       - name: Run HeuteLeiderNicht.voll.exe 🙅‍♂️
-        if: inputs.full_bouncer
+        if: inputs.full-bouncer
         working-directory: bouncer
         run: |
           ./full_bouncer.sh
           # TODO: Temporary to test the new pallet. Improve in PRO-1599
           ./commands/run_test.ts ./tests/delta_based_ingress.ts ./../ ./../localnet/init
 
       - name: Run HeuteLeiderNicht.einfach.exe 🦺
-        if: ${{ ! inputs.full_bouncer }}
+        if: ${{ ! inputs.full-bouncer }}
         working-directory: bouncer
         run: |
           ./run.sh

.github/workflows/ci-development.yml

@@ -69,7 +69,7 @@ jobs:
     uses: ./.github/workflows/_40_post_check.yml
     secrets: inherit
     with:
-      full_bouncer: false
+      full-bouncer: false
       ngrok: true
   test-benchmarks:
     needs: [build-benchmarks]

.github/workflows/ci-main-merge-queue.yml

@@ -45,7 +45,7 @@ jobs:
     uses: ./.github/workflows/_40_post_check.yml
     secrets: inherit
     with:
-      full_bouncer: true
+      full-bouncer: true
 
   upgrade-check:
     needs: [build-try-runtime]

.github/workflows/release-berghain.yml

@@ -20,6 +20,7 @@ jobs:
     with:
       profile: "production"
       binary-subdir: "production"
+      is-mainnet: true
   build-m2:
     uses: ./.github/workflows/_21_build_m2.yml
     secrets: inherit

.github/workflows/release-sisyphos.yml

@@ -78,7 +78,7 @@ jobs:
     uses: ./.github/workflows/_40_post_check.yml
     secrets: inherit
     with:
-      full_bouncer: true
+      full-bouncer: true
   test-benchmarks:
     needs: [build-benchmarks]
     uses: ./.github/workflows/_41_test_benchmarks.yml

.github/workflows/upgrade-test.yml

@@ -60,7 +60,7 @@ jobs:
         if: inputs.run-job
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
         with:
-          node-version: 20
+          node-version-file: ./bouncer/.nvmrc
           cache: "pnpm"
           cache-dependency-path: "bouncer/pnpm-lock.yaml"
 
@@ -77,7 +77,7 @@ jobs:
 
       - name: Download try-runtime binary 📥
         if: inputs.run-job
-        uses: jaxxstorm/action-install-gh-release@v1.10.0
+        uses: jaxxstorm/action-install-gh-release@25d5e2dd555cd74f1fab9ac1e6ea117acde2c0c4
         with:
           repo: paritytech/try-runtime-cli
           tag: v0.7.0
@@ -145,6 +145,7 @@ jobs:
           echo $MAIN_VERSION
 
       - name: Install solana ☀️
+        if: inputs.run-job
         run: |
           sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)"
 

.rustfmt.toml

@@ -21,4 +21,5 @@ match_arm_blocks = false
 match_block_trailing_comma = true
 trailing_comma = "Vertical"
 trailing_semicolon = false
-use_field_init_shorthand = true
+use_field_init_shorthand = true
+indent_style = "Block"

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes included in each Chainflip release will be documented in this file.
 
+## [1.6.7] - 2024-09-25
+
+### Fixes
+
+- Add missing broker fees migration.
+- Close expired Solana channels.
+
 ## [1.6.6] - 2024-09-24
 
 ### Fixes