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.

Sign up for GitHub

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

Merged
merged 48 commits into from
Dec 5, 2024
+925 −585
Merged

feat: cross chain swap STX #28460

Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b6036b5
chore: move bridge status mocks to own folder
infiniteflower Nov 12, 2024
9cedb91
fix: show segments for bridge txs always
infiniteflower Nov 12, 2024
edafc96
chore: add comment
infiniteflower Nov 12, 2024
53018e1
chore: ignore yalc files
infiniteflower Nov 13, 2024
e33258f
chore: refactor
infiniteflower Nov 13, 2024
fe52cb6
chore: bump packages so we can use tx controller 39
infiniteflower Nov 13, 2024
09dfc07
feat: hide stx status screen if it's a bridge tx and route immediatel…
infiniteflower Nov 13, 2024
07294ab
chore: use txMeta.id to identify txs if no txHash, add destChainId to…
infiniteflower Nov 13, 2024
23eb6eb
fix: error with i18n when no dest explorer ready
infiniteflower Nov 13, 2024
119373c
chore: add bridgeSteps to txMeta during bridge tx
infiniteflower Nov 13, 2024
6d137f0
chore: display steps even though we only have txMeta.id
infiniteflower Nov 13, 2024
b4a093d
chore: show pending and bridge amount for STX in tx details
infiniteflower Nov 14, 2024
71d997d
fix: bridge type missing dest network name
infiniteflower Nov 22, 2024
01353f7
fix: source explorer incorrectly using txMeta.id as hash
infiniteflower Nov 22, 2024
d7acd8d
chore: add stx mocks
infiniteflower Nov 22, 2024
4944e3a
fix: trying to dispatch something that isnt an action
infiniteflower Nov 26, 2024
fc1fdf4
chore: add way to call addTransaction background fn from ui
infiniteflower Nov 26, 2024
165b7c7
chore: make sure to restart polling for anything not complete or failed
infiniteflower Nov 26, 2024
d4a3fc2
chore: refactor BridgeStatusController to work with txMetaId rather t…
infiniteflower Nov 26, 2024
bf22030
chore: remove unnecessary fields being added to txMeta
infiniteflower Nov 26, 2024
bc1a913
chore: remove yalc package and use npm one
infiniteflower Nov 26, 2024
4503640
chore: move bridgeTitle fully into useTransactionDisplayData
infiniteflower Nov 26, 2024
13f9804
fix: lint error
infiniteflower Nov 26, 2024
cb1f4fc
chore: update comment
infiniteflower Nov 27, 2024
462da0d
fix: broken tests and lint errors
infiniteflower Nov 27, 2024
a1935a9
fix: show standard non-confirmed final statuses instead of bridge seg…
infiniteflower Nov 27, 2024
9fa31f6
fix: update snapshots
infiniteflower Nov 27, 2024
298e2ae
chore: remove statusRequest from txHistory
infiniteflower Nov 27, 2024
ad13ba6
fix: broken tests
infiniteflower Nov 27, 2024
bbadf02
fix: possible to have statusRequest with undefined srcTxHash
infiniteflower Nov 27, 2024
cfd6ed6
fix: broken tests
infiniteflower Nov 27, 2024
215dceb
fix: broken tests
infiniteflower Nov 27, 2024
fdb119f
chore: add comment
infiniteflower Nov 27, 2024
821f5f0
fix: broken syntax
infiniteflower Nov 27, 2024
d01d731
chore: add comments
infiniteflower Nov 27, 2024
ff66613
chore: remove unneeded comment
infiniteflower Nov 27, 2024
e9a3119
chore: add comment
infiniteflower Nov 27, 2024
c33aeb4
chore: remove unneeded type assertion
infiniteflower Nov 27, 2024
379be4d
chore: don't throw an error if srcTxHash missing, simplify #getSrcTxH…
infiniteflower Nov 27, 2024
03e3f69
fix: broken yarn lock
infiniteflower Nov 27, 2024
7703879
chore: one more fix for yarn lock
infiniteflower Nov 27, 2024
6c994d6
chore: improve typing for active quote to have better pricing data
infiniteflower Nov 28, 2024
fb1792e
chore: add sentAmount to historyItem.pricingData
infiniteflower Nov 29, 2024
12b61db
fix: use correct sent amount
infiniteflower Nov 29, 2024
86e1202
fix: broken tests
infiniteflower Dec 2, 2024
42c5559
chore: bump yarn
infiniteflower Dec 2, 2024
03c74fd
chore: add check for showing status page in onApproveOrReject
infiniteflower Dec 4, 2024
c577043
chore: skip STX if bridge approval
infiniteflower Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.yalc
yalc.lock

npm-debug.log
yarn-error.log
node_modules
Expand Down
2 changes: 1 addition & 1 deletion app/_locales/en/messages.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions app/scripts/controllers/bridge-status/__snapshots__/bridge-status-controller.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

exports[`BridgeStatusController constructor rehydrates the tx history state 1`] = `
{
"0xsrcTxHash1": {
"bridgeTxMetaId1": {
"account": "0xaccount1",
"estimatedProcessingTimeInSeconds": 15,
"initialDestAssetBalance": undefined,
"pricingData": undefined,
"pricingData": {
"amountSent": "1.234",
},
"quote": {
"bridgeId": "lifi",
"bridges": [
Expand Down Expand Up @@ -102,17 +104,20 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
"status": "PENDING",
},
"targetContractAddress": "0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC",
"txMetaId": "bridgeTxMetaId1",
},
}
`;

exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx history state 1`] = `
{
"0xsrcTxHash1": {
"bridgeTxMetaId1": {
"account": "0xaccount1",
"estimatedProcessingTimeInSeconds": 15,
"initialDestAssetBalance": undefined,
"pricingData": undefined,
"pricingData": {
"amountSent": "1.234",
},
"quote": {
"bridgeId": "lifi",
"bridges": [
Expand Down Expand Up @@ -208,6 +213,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
"status": "PENDING",
},
"targetContractAddress": "0x23981fC34e69eeDFE2BD9a0a9fCb0719Fe09DbFC",
"txMetaId": "bridgeTxMetaId1",
},
}
`;
Loading
Loading