Merge branch 'main' into feature/dispatch-type

.cargo/config.toml

@@ -1,6 +1,6 @@
 [env]
 CF_ETH_CONTRACT_ABI_ROOT = { value = "contract-interfaces/eth-contract-abis", relative = true }
-CF_ETH_CONTRACT_ABI_TAG = "v1.0.0"
+CF_ETH_CONTRACT_ABI_TAG = "v1.1.2"
 CF_SOL_PROGRAM_IDL_ROOT = { value = "contract-interfaces/sol-program-idls", relative = true }
 CF_SOL_PROGRAM_IDL_TAG = "v0.1.1"
 CF_TEST_CONFIG_ROOT = { value = "engine/config/testing", relative = true }

.github/CODEOWNERS

@@ -1,19 +1,30 @@
 /bouncer/ @martin-chainflip
+
+/bouncer/shared/upgrade_network.ts @kylezs
+/bouncer/commands/upgrade_network.ts @kylezs
+.github/workflows/upgrade-test.yml @kylezs
+
 /state-chain/custom-rpc/ @chainflip-io/web
 /api/bin/chainflip-ingress-egress-tracker @chainflip-io/web
+
 /engine/config/CI/config/Settings.toml @chainflip-io/platform
 /localnet/ @chainflip-io/platform
-/engine/src/witness/ @kylezs @AlastairHolmes
-/engine/src/witness.rs @kylezs @AlastairHolmes
-/engine/multisig/ @msgmaxim
+
 /state-chain/pallets/cf-pools/ @AlastairHolmes
 /state-chain/amm/ @AlastairHolmes
+
 /state-chain/ @dandanlen
+
 /utilities/with_std/task_scope @AlastairHolmes
+
+/engine/multisig/ @msgmaxim
+/engine/src/p2p/ @msgmaxim
+/engine/src/p2p.rs @msgmaxim
+
 /engine/state_chain_observer/client/ @AlastairHolmes
+/engine/src/witness/ @kylezs @AlastairHolmes
+/engine/src/witness.rs @kylezs @AlastairHolmes
 /engine/src/eth/ @kylezs
 /engine/src/btc/ @kylezs
 /engine/src/dot/ @kylezs
-/engine/src/p2p/ @msgmaxim
-/engine/src/p2p.rs @msgmaxim
 /engine/src/retrier.rs @kylezs

.github/workflows/_40_post_check.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   FORCE_COLOR: 1
-  SOLANA_VERSION: v1.17.22
+  SOLANA_VERSION: v1.18.3
 
 permissions:
   packages: read
@@ -43,7 +43,7 @@ jobs:
           scope: "@chainflip-io"
           cache-dependency-path: "bouncer/pnpm-lock.yaml"
 
-      - name: Set NPM registry
+      - name: Set NPM registry 🔧
         run: |
           pnpm set @chainflip-io:registry=https://npm.pkg.github.com/
           pnpm set //npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}
@@ -66,9 +66,9 @@ jobs:
         working-directory: bouncer
         run: pnpm install
 
-      # - name: Install solana
-      #   run: |
-      #     sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)"
+      - name: Install solana ☀️
+        run: |
+          sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)"
 
       - name: Start a localnet 🚀
         env:
@@ -98,32 +98,37 @@ jobs:
           ./run.sh
 
       - name: Print chainflip-engine logs 🚗
-        if: failure()
+        if: always()
+        continue-on-error: true
         run: |
           cat /tmp/chainflip/*/chainflip-engine.log
 
       - name: Print chainflip-node logs 📡
-        if: failure()
+        if: always()
+        continue-on-error: true
         run: |
           cat /tmp/chainflip/*/chainflip-node.log
 
       - name: Print chainflip-broker-api logs 💼
-        if: failure()
+        if: always()
+        continue-on-error: true
         run: |
           cat /tmp/chainflip/chainflip-broker-api.log
 
       - name: Print chainflip-lp-api logs 🤑
-        if: failure()
+        if: always()
+        continue-on-error: true
         run: |
           cat /tmp/chainflip/chainflip-lp-api.log
 
       - name: Print localnet init debug logs 🕵️‍♂️
-        if: failure()
+        if: always()
+        continue-on-error: true
         run: |
           cat /tmp/chainflip/debug.log
 
       - name: Print solana logs ☀️
-        if: failure()
+        if: always()
         continue-on-error: true
         run: |
           cat /tmp/solana/solana.log
@@ -157,13 +162,14 @@ jobs:
           docker compose -f localnet/docker-compose.yml -p "chainflip-localnet" down --rmi all --volumes --remove-orphans
 
       - name: Notify on failed bouncer 📢
-        if: failure() && github.ref_name == 'main' || cancelled() && github.ref_name == 'main'
+        if: failure() && github.ref_name == 'main' || cancelled() && github.ref_name == 'main' || failure() && contains(github.ref_name, 'release/') || cancelled() && contains(github.ref_name, 'release/')
         env:
           DISCORD_USERNAME: "HEUTE LEIDER NICHT"
           DISCORD_WEBHOOK: ${{ secrets.CF_DISCORD_ALERTS_CRITICAL }}
         uses: Ilshidur/action-discord@0c4b27844ba47cb1c7bee539c8eead5284ce9fa9
         with:
           args: |
             ❗️❗️❗️❗️ Sorry **${{ github.actor }}**, the Bouncer has rejected you ❗️❗️❗️❗️
+            The Bouncer has rejected the build on branch `${{ github.ref_name }}`
             👾 Link to job: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
             #️⃣ Tagging: <@&939151218708709416>

.github/workflows/upgrade-test.yml

@@ -157,10 +157,6 @@ jobs:
           MAIN_VERSION=$(./upgrade-to-bins/chainflip-node --version)
           echo $MAIN_VERSION
 
-      - name: Install node dependencies
-        working-directory: bouncer
-        run: pnpm install
-
       - name: Start a localnet from current release
         env:
           BINARY_ROOT_PATH: ./latest-release-bins
@@ -177,11 +173,14 @@ jobs:
 
       - name: Run bouncer on latest release
         id: pre-upgrade-bouncer
+        # TEMP: It should be: # git checkout ${{ steps.get-upgrade-from-commit.outputs.commit-sha }}
+        # But we need the fix for the broker test for 1.2 here for now
         run: |
           git fetch --all
-          git checkout ${{ steps.get-upgrade-from-commit.outputs.commit-sha }}
+          git checkout release-1.2-broker-test-fix
           git rev-parse HEAD
           cd bouncer
+          pnpm install
           ./run.sh
 
       # we need to be sure that when this fails, we catch the error, any panics etc. that occur
@@ -193,6 +192,7 @@ jobs:
           git checkout ${{ github.sha }}
           git rev-parse HEAD
           cd bouncer
+          pnpm install
           ./commands/upgrade_network.ts prebuilt \
             --runtime ./../main-runtime/state_chain_runtime.compact.compressed.wasm \
             --bins ./../upgrade-to-bins \
@@ -205,6 +205,7 @@ jobs:
           git checkout ${{ env.UPGRADE_TO_COMMIT }}
           git rev-parse HEAD
           cd bouncer
+          pnpm install
           ./tests/all_concurrent_tests.ts
 
       - name: Print old chainflip-engine logs

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes included in each Chainflip release will be documented in this file.
 
+## [1.2.1] - 2024-03-04
+
+### Features
+
+- Price impact protection for swaps ([#4547](https://github.com/chainflip-io/chainflip-backend/pull/4547))
+
 ## [1.2.0] - 2024-02-02
 
 ### Features