Merge remote-tracking branch 'origin/main' into chore/remove-deposit-…

…tracker

* origin/main:
  Fix: Add missing Arbitrum block_height (#5126)
  chore: update PR template with testing and migration note (#5122)
  feat: Solana chain integration (#4849)

# Conflicts:
#	state-chain/pallets/cf-ingress-egress/src/lib.rs

.cargo/config.toml

@@ -2,7 +2,7 @@
 CF_ETH_CONTRACT_ABI_ROOT = { value = "contract-interfaces/eth-contract-abis", relative = true }
 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.3.1"
+CF_SOL_PROGRAM_IDL_TAG = "v0.6.0"
 CF_ARB_CONTRACT_ABI_ROOT = { value = "contract-interfaces/arb-contract-abis", relative = true }
 CF_TEST_CONFIG_ROOT = { value = "engine/config/testing", relative = true }
 

.github/pull_request_template.md

@@ -7,13 +7,14 @@ Closes: PRO-xxx
 Please conduct a thorough self-review before opening the PR.
 
 - [ ] I am confident that the code works.
+- [ ] I have written sufficient tests.
+- [ ] I have written and tested required migrations.
 - [ ] I have updated documentation where appropriate.
 
 ## Summary
 
 *Please include a succinct description of the purpose and content of the PR. What problem does it solve, and how? Link issues, discussions, other PRs, and anything else that will help the reviewer.*
 
-
 #### Non-Breaking changes
 
-If this PR includes non-breaking changes, select the `non-breaking` label. On merge, CI will automatically cherry-pick the commit to a PR against the release branch.
+If this PR includes non-breaking changes, select the `non-breaking` label. On merge, CI will automatically cherry-pick the commit to a PR against the release branch.

.github/workflows/_40_post_check.yml

@@ -18,7 +18,7 @@ on:
 
 env:
   FORCE_COLOR: 1
-  SOLANA_VERSION: v1.18.8
+  SOLANA_VERSION: v1.18.17
   NODE_COUNT: "${{ inputs.node-count }}-node"
 
 permissions:

.github/workflows/ci-development.yml

@@ -14,10 +14,10 @@ jobs:
     uses: ./.github/workflows/_01_pre_check.yml
     secrets: inherit
   force-version-bump:
-      uses: ./.github/workflows/_05_force_version_bump.yml
-      secrets: inherit
-      with:
-        network-to-check-against: "sisyphos"
+    uses: ./.github/workflows/_05_force_version_bump.yml
+    secrets: inherit
+    with:
+      network-to-check-against: "sisyphos"
   test:
     uses: ./.github/workflows/_10_test.yml
     secrets: inherit

.github/workflows/upgrade-test.yml

@@ -45,6 +45,9 @@ on:
         default: true
 env:
   FORCE_COLOR: 1
+  SOLANA_VERSION: v1.18.17
+  SOLANA_PROGRAMS_VERSION: v0.6.0
+  NODE_COUNT: "1-node"
 
 permissions:
   packages: read
@@ -208,6 +211,10 @@ jobs:
           MAIN_VERSION=$(./upgrade-to-bins/chainflip-node --version)
           echo $MAIN_VERSION
 
+      - name: Install solana ☀️
+        run: |
+          sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)"
+
       - name: Start a localnet from current release 🚀
         if: inputs.run-job
         env:
@@ -216,6 +223,7 @@ jobs:
         run: |
           git checkout ${{ steps.get-upgrade-from-commit.outputs.commit-sha }}
           set -x
+          export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
           mkdir -p /tmp/chainflip/bashful
           mkdir -p /tmp/chainflip/doc
           mkdir -p /tmp/chainflip/dopey
@@ -231,7 +239,11 @@ jobs:
           echo "/usr/lib after copy of .so files"
           ls -l /usr/lib
           touch ./localnet/.setup_complete
+          # TODO: This is a temporary fix to allow the localnet docker-compose.yml from an older commit to run the latest solana programs version. Remove after 1.6 is released.
+          sed -i 's|ghcr.io/chainflip-io/solana-localnet-ledger:v[0-9.]*|ghcr.io/chainflip-io/solana-localnet-ledger:${{ env.SOLANA_PROGRAMS_VERSION }}|g' localnet/docker-compose.yml
           ./localnet/manage.sh
+          # TODO: This is a temporary fix so the Solana programs are not being initialized with old bouncer code
+          sed -i 's/await solClient.getGenesisHash();/return;/g' bouncer/shared/initialize_new_chains.ts
 
       - name: Run bouncer on latest release 🙅‍♂️
         if: inputs.run-job
@@ -242,6 +254,8 @@ jobs:
           cd bouncer
           pnpm install --frozen-lockfile
           ./run.sh
+          # TODO: Temporary to discard the fixes above
+          git reset --hard
 
       # we need to be sure that when this fails, we catch the error, any panics etc. that occur
       # TODO: Run swaps simultaneously to the upgrade - we could do that inside the `upgrade_network` command itself.
@@ -269,6 +283,7 @@ jobs:
           git rev-parse HEAD
           cd bouncer
           pnpm install --frozen-lockfile
+          ./commands/setup_sol_vault.ts
           ./tests/all_concurrent_tests.ts
 
       - name: Print chainflip-engine logs 🚗
@@ -277,6 +292,13 @@ jobs:
         run: |
           cat /tmp/chainflip/*/chainflip-engine.*log
 
+      - name: Print solana logs ☀️
+        if: always()
+        continue-on-error: true
+        run: |
+          cat /tmp/solana/*.log
+          cat /tmp/solana/test-ledger/validator.log
+
       - name: Print new pre-upgrade chainflip-engine logs 🚗
         if: always()
         # In the case of a compatible upgrade, we don't expect any logs here