From c159d5ce936b6fbc1f1e39a0a811430d38a6b9dc Mon Sep 17 00:00:00 2001 From: mosi Date: Wed, 11 Dec 2024 11:07:30 +0800 Subject: [PATCH 1/3] feat: version --- .yarn/versions/8a363064.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .yarn/versions/8a363064.yml diff --git a/.yarn/versions/8a363064.yml b/.yarn/versions/8a363064.yml new file mode 100644 index 00000000..98d1e4f2 --- /dev/null +++ b/.yarn/versions/8a363064.yml @@ -0,0 +1,8 @@ +releases: + "@fluent-wallet/wallet_handle-unfinished-cfx-tx": patch + "@fluent-wallet/wallet_handle-unfinished-eth-tx": patch + browser-extension: patch + helios-background: patch + +declined: + - helios From 6b050b417e7fcf6a71fc5ccd1dc07ea9212d839b Mon Sep 17 00:00:00 2001 From: mosi Date: Fri, 13 Dec 2024 15:44:04 +0800 Subject: [PATCH 2/3] fix: network --- packages/db/src/main/cfxjs/db/queries.cljs | 3 +-- packages/rpcs/wallet_handleUnfinishedTxs/index.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/db/src/main/cfxjs/db/queries.cljs b/packages/db/src/main/cfxjs/db/queries.cljs index 91a5949e..2e3095a1 100644 --- a/packages/db/src/main/cfxjs/db/queries.cljs +++ b/packages/db/src/main/cfxjs/db/queries.cljs @@ -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)))) diff --git a/packages/rpcs/wallet_handleUnfinishedTxs/index.js b/packages/rpcs/wallet_handleUnfinishedTxs/index.js index 29c95ea7..2ebc791c 100644 --- a/packages/rpcs/wallet_handleUnfinishedTxs/index.js +++ b/packages/rpcs/wallet_handleUnfinishedTxs/index.js @@ -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) {} } }) From 107d345e736687ea5cd7f6449b9cd0bf7c1154b5 Mon Sep 17 00:00:00 2001 From: mosi Date: Fri, 13 Dec 2024 15:51:01 +0800 Subject: [PATCH 3/3] feat: version --- .yarn/versions/8a363064.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yarn/versions/8a363064.yml b/.yarn/versions/8a363064.yml index 98d1e4f2..d013249a 100644 --- a/.yarn/versions/8a363064.yml +++ b/.yarn/versions/8a363064.yml @@ -1,6 +1,6 @@ releases: - "@fluent-wallet/wallet_handle-unfinished-cfx-tx": patch - "@fluent-wallet/wallet_handle-unfinished-eth-tx": patch + "@fluent-wallet/db": patch + "@fluent-wallet/wallet_handle-unfinished-txs": patch browser-extension: patch helios-background: patch