Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mergefix origin/release #8362

Merged
merged 4 commits into from
Dec 13, 2024
Merged

fix: mergefix origin/release #8362

merged 4 commits into from
Dec 13, 2024

Conversation

gomesalexandre
Copy link
Contributor

@gomesalexandre gomesalexandre commented Dec 13, 2024

Description

Cherry-picks and mergefixes changes introduced by #8348 (present in [release](#8337 only, but not develop) on top of #8350 and #8309 (present in develop only), so we can run the release script.

This also fixes one regression in 895e0c0, introduced by #8309 i.e present in develop but not in release re: failing approvals for some swappers

image

Issue (if applicable)

closes N/A

Risk

High Risk PRs Require 2 approvals

What protocols, transaction types, wallets or contract interactions might be affected by this PR?

Low to none, ensure mergefix looks sane

Testing

  • Sanity test you can still execute Li.Fi bridges
  • Sanity test you can still execute Li.Fi same-chain swaps

Engineering

  • ^

Operations

  • 🏁 My feature is behind a flag and doesn't require operations testing (yet)
  • ^

Screenshots (if applicable)

  • Li.Fi approvals and swap e2e

https://jam.dev/c/4603d1a2-b00d-4a58-810c-7c5d2c18595b

  • Li.Fi approvals and bridge e2e

https://jam.dev/c/911d5019-e0d3-433c-ab7f-91c75b52fc73

  • ZRX approvals and swap e2e

https://jam.dev/c/f29c2929-b05e-4033-a096-f970e4ebbd32

  • CoW approvals and swap e2e

https://jam.dev/c/cab5446a-c9e1-4fd6-a526-977e74095e5a

  • Arb Bridge withdraw approvals and bridge e2e (no approval needed for ARB bridge withdraws as this feature is part of the protocol)

https://jam.dev/c/63f6bbea-3846-4f0c-acc1-a484c9faa4c4

  • Arb Bridge deposit approvals and bridge e2e

https://jam.dev/c/3e5780d5-e0ef-4cde-bbab-ece8d4285134

  • Chainflip swap approvals and bridge e2e (no approval needed as Chainflip swaps are sends, contract calls)

https://jam.dev/c/8c82a6bf-59e0-43d6-aa24-1833bc3497bb

@gomesalexandre gomesalexandre changed the title fix: lifi bridges final trade quote (#8348) fix: mergefix origin/release Dec 13, 2024
@gomesalexandre gomesalexandre marked this pull request as ready for review December 13, 2024 06:30
@gomesalexandre gomesalexandre requested a review from a team as a code owner December 13, 2024 06:30
Copy link
Collaborator

@NeOMakinG NeOMakinG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://jam.dev/c/cc964c86-984c-4b34-a820-78c671b2dc0a

Get this in so we can handle the release

Li.Fi bridges are taking a long time or failing at fetching the TX status, not related to those changes thought

@NeOMakinG NeOMakinG enabled auto-merge (squash) December 13, 2024 11:51
@NeOMakinG NeOMakinG merged commit 8795292 into develop Dec 13, 2024
3 checks passed
@NeOMakinG NeOMakinG deleted the feat_release_mergefix branch December 13, 2024 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants