-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
feat: cross chain swap STX #28460
Open
infiniteflower
wants to merge
44
commits into
cross-chain-swaps-status-ui
Choose a base branch
from
mb1571-cross-chain-swap-stx
base: cross-chain-swaps-status-ui
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: cross chain swap STX #28460
infiniteflower
wants to merge
44
commits into
cross-chain-swaps-status-ui
from
mb1571-cross-chain-swap-stx
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
7 tasks
infiniteflower
force-pushed
the
mb893-cross-chain-swap-tx-status-2
branch
from
November 14, 2024 16:03
3d57b48
to
c1adb80
Compare
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
from
November 14, 2024 16:07
4359f25
to
44ac2e3
Compare
infiniteflower
changed the title
Mb1571 cross chain swap stx
feat: Mb1571 cross chain swap STX
Nov 14, 2024
infiniteflower
changed the title
feat: Mb1571 cross chain swap STX
feat: cross chain swap STX
Nov 14, 2024
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
3 times, most recently
from
November 14, 2024 21:22
c082ed0
to
0825eeb
Compare
infiniteflower
force-pushed
the
mb893-cross-chain-swap-tx-status-2
branch
from
November 20, 2024 02:19
e43b87a
to
4ad79f2
Compare
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
from
November 20, 2024 02:29
0825eeb
to
e296149
Compare
infiniteflower
force-pushed
the
mb893-cross-chain-swap-tx-status-2
branch
from
November 20, 2024 02:47
4ad79f2
to
05c5197
Compare
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
2 times, most recently
from
November 21, 2024 01:56
67de92a
to
0e21993
Compare
7 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 21, 2024
## **Description** This PR implements the following: 1. Submit bridge transaction for normal transactions 3. Submit bridge transaction for native gas tokens that don't require approval 4. Submit bridge transaction for ERC20s that require approval Does not fully: 1. Submit bridge transaction for smart transactions - You can submit an STX, but the status screens don't make the most sense right now. - Improved STX support be handled by #28460 and MetaMask/core#4918 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27262?quickstart=1) ## **Related issues** - Targeting: #27522 ## **Manual testing steps** 1. Go to Bridge 2. Fill in source/dest token and amounts 3. Get a quote 4. Execute Bridge ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> https://github.com/user-attachments/assets/b73f917d-e3e4-468b-b0fa-29f41f559488 ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
infiniteflower
force-pushed
the
mb893-cross-chain-swap-tx-status-2
branch
from
November 21, 2024 19:45
088a7b4
to
076a868
Compare
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
4 times, most recently
from
November 22, 2024 22:00
cc7daf3
to
86a80a0
Compare
4 tasks
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
from
November 26, 2024 20:17
09c70ae
to
686cf28
Compare
infiniteflower
changed the base branch from
mb893-cross-chain-swap-tx-status-2
to
cross-chain-swaps-status-ui
November 26, 2024 20:17
Builds ready [098d118]
Page Load Metrics (1915 ± 151 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Builds ready [5b2b7fb]
Page Load Metrics (1707 ± 59 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
This was referenced Nov 27, 2024
…ments and bridge tx details
…ash, move state update outside of it
infiniteflower
force-pushed
the
mb1571-cross-chain-swap-stx
branch
from
November 27, 2024 22:19
d6f123a
to
1d50d37
Compare
Builds ready [1d50d37]
Page Load Metrics (2099 ± 218 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Builds ready [391eef3]
Page Load Metrics (1943 ± 61 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR improves support for Smart Transactions (STX). It will not show the STX status page if the tx is a Bridge tx. Instead users will be immediately sent to the Activity list. If the user opens the Bridge tx detaills, they should be able to see the proper info.
The main change is that in
BridgeStatusController
thetxHistory
is now keyed bytxMeta.id
rather thantxMeta.hash
. This is because for an STX we might not have the hash immediately, but we still want to look things up.We also add a way to call
addTransaction
from the UI side. Previously we usedaddTransactionAndWaitForPublish
. However for STX, this will cause the app to wait until atxHash
is available before returning atxMeta
, which means we can't even use thetxMeta.id
to key aBridgeHistoryItem
. If we useaddTransaction
this will allow us to receive atxMeta
object back immediately and usetxMeta.id
.Related issues
Depends on MetaMask/core#4918
Manual testing steps
Screenshots/Recordings
Before
After
Screen.Recording.2024-11-25.at.11.05.55.AM.mov
Pre-merge author checklist
Pre-merge reviewer checklist