Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/improve-sub-prew…
Browse files Browse the repository at this point in the history
…itness-swap

* origin/main: (24 commits)
  fix: restore correct restriction on redemption expiry (PRO-1072)
  Feat/migrate-to-polkadot-sdk-repo (#4361)
  chore: fix RUSTSEC-2024-0003 (#4426)
  Feat: decouple CFE from SC events (#4382)
  chore: add docker tag prefix to `chainflip-ingress-egress-tacker` 🏷️ (#4427)
  refactor/PRO-1101: rid of swapping minimum swap amount (#4419)
  refactor(ingress-egress-tracker): remove unnecessary fields (#4425)
  Improved the retry queue storage (#4420)
  fix: bump spec version command only bumps when necessary (#4422)
  refactor: use yargs for all try_runtime_command options (#4423)
  fix: await finalisation before starting broker (#4412)
  chore: debug logs to see get_raw_txs query (#4413)
  doc: correct env vars (#4416)
  fix: pool_orders rpc filters empty orders (PRO-1039) (#4377)
  Produce an event in case the swap yields a zero egress amount (#4410)
  fix: don't have conflicting redis port with localnet (#4415)
  Ability to specify output for the subcommands, other than `/dev/null` (#4411)
  chore: increase limit on max number of bitcoin payloads in a ceremony to theoretical maximum (#4396)
  refactor(ingress-egress-tracker): configurable expiry times [WEB-761] (#4406)
  fix: use existing script for upgrade job (#4403)
  ...

# Conflicts:
#	Cargo.lock
#	state-chain/primitives/Cargo.toml
  • Loading branch information
syan095 committed Jan 19, 2024
2 parents b11a797 + feedb30 commit b17ead9
Show file tree
Hide file tree
Showing 184 changed files with 4,545 additions and 3,381 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/_24_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ jobs:
type=raw,value=${{ inputs.network }}
type=ref,event=branch
type=ref,event=tag,prefix=${{ inputs.network }}-
type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},prefix=${{ inputs.network }}-,enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
type=ref,event=pr
type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},prefix=${{ inputs.network }}-,enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
type=ref,event=pr
type=raw,value=${{ github.sha }},prefix=iet-,enable=${{ matrix.target == 'chainflip-ingress-egress-tracker' && github.ref_name == 'main' }}
- name: Login to Github Container Registry 🔑
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/_40_post_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,5 @@ jobs:
with:
args: |
❗️❗️❗️❗️ Sorry **${{ github.actor }}**, the Bouncer has rejected you ❗️❗️❗️❗️
👾 Link to job: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
👾 Link to job: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
#️⃣ Tagging: <@&939151218708709416>
https://media.giphy.com/media/wHfwCBZzCMhmE/giphy.gif
11 changes: 8 additions & 3 deletions .github/workflows/upgrade-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ jobs:
name: chainflip-node-runtime-try-runtime-ubuntu-22.04
path: main-runtime

- name: Version of latest main
run: |
set -x
MAIN_VERSION=$(./main-bins/chainflip-node --version)
echo $MAIN_VERSION
- name: Install node dependencies
working-directory: bouncer
run: pnpm install
Expand Down Expand Up @@ -134,7 +140,7 @@ jobs:
id: post-upgrade-bouncer
working-directory: bouncer
run: |
./run-no-setup.sh
./tests/all_concurrent_tests.ts
- name: Print chainflip-engine logs
if: failure()
Expand Down Expand Up @@ -182,5 +188,4 @@ jobs:
with:
args: |
❗️❗️❗️❗️ Sorry **${{ github.actor }}**, The Upgrade Test has not passed ❗️❗️❗️❗️
👾 Link to job: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
#️⃣ Tagging: <@&939151218708709416>
👾 Link to job: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>
Loading

0 comments on commit b17ead9

Please sign in to comment.