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

Fix/error handle #1476

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Fix/error handle #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c159d5c
feat: version
mosshqq Dec 11, 2024
6b050b4
fix: network
mosshqq Dec 13, 2024
107d345
feat: version
mosshqq Dec 13, 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
8 changes: 8 additions & 0 deletions .yarn/versions/8a363064.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
releases:
"@fluent-wallet/db": patch
"@fluent-wallet/wallet_handle-unfinished-txs": patch
browser-extension: patch
helios-background: patch

declined:
- helios
3 changes: 1 addition & 2 deletions packages/db/src/main/cfxjs/db/queries.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2138,8 +2138,7 @@
[?txs :tx/txPayload ?tx-payload]
[?tx-payload :txPayload/nonce ?nonce]
[?address :address/value ?addrv]
[?tx-payload :txPayload/from ?addrv]
[?txs :tx/hash ?hash]]
[?tx-payload :txPayload/from ?addrv]]
[:tx/hash hash])]
(when txs
(mapv tx-id->data txs))))
Expand Down
10 changes: 8 additions & 2 deletions packages/rpcs/wallet_handleUnfinishedTxs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@ export const main = ({
txs.forEach(({tx, address, network}) => {
if (network.type === 'cfx') {
try {
wallet_handleUnfinishedCFXTx({network}, {tx, address: address.eid})
wallet_handleUnfinishedCFXTx(
{network, networkName: network.name},
{tx, address: address.eid},
)
} catch (err) {}
} else {
try {
wallet_handleUnfinishedETHTx({network}, {tx, address: address.eid})
wallet_handleUnfinishedETHTx(
{network, networkName: network.name},
{tx, address: address.eid},
)
} catch (err) {}
}
})
Expand Down
Loading