Skip to content

Better error handling for wallet transactions + handling of missing signals #22179

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Better error handling for wallet transactions + handling of missing signals #22179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc17233
Swap and bridge improvements
alwx Jan 22, 2025
2a10df5
Post-review fixes
alwx Apr 10, 2025
397655f
Post-review fixes
alwx Apr 10, 2025
f0e5a6c
Fixes
alwx Apr 10, 2025
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
7 changes: 7 additions & 0 deletions src/status_im/common/signals/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,19 @@
"wallet.suggested.routes"
{:fx [[:dispatch [:wallet/handle-suggested-routes (transforms/js->clj event-js)]]]}

"wallet.router.sending-transactions-started"
{:fx [[:dispatch
[:wallet/sending-transactions-started-signal-received (transforms/js->clj event-js)]]]}

"wallet.router.sign-transactions"
{:fx [[:dispatch [:wallet/sign-transactions-signal-received (transforms/js->clj event-js)]]]}

"wallet.router.transactions-sent"
{:fx [[:dispatch [:wallet/transactions-sent-signal-received (transforms/js->clj event-js)]]]}

"wallet.transaction.status-changed"
{:fx [[:dispatch [:wallet/status-changed-signal-received (transforms/js->clj event-js)]]]}

"envelope.sent"
(messages.transport/update-envelopes-status
cofx
Expand Down
83 changes: 83 additions & 0 deletions src/status_im/contexts/wallet/common/utils.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,89 @@
(some positive-balance-in-any-chain? tokens))
operable-account))))

(defn send-details-map
"Generates a new map with all the sen details using the original
details we've received from `status-go`. The new one contains only
the keys we need."
[send-details]
(let [{:keys [sendType
fromAddress
toAddress
fromChain
toChain
fromAmount
toAmount
fromAsset
toAsset
username
publicKey
packId]} send-details]
{:uuid (:uuid send-details)
:send-type sendType
:address-from fromAddress
:address-to toAddress
:tx-to ""
:from-chain fromChain
:to-chain toChain
:from-amount fromAmount
:to-amount toAmount
:from-asset fromAsset
:to-asset toAsset
:username username
:public-key publicKey
:pack-id packId
:tx-hash ""
:approval-tx? false}))

(defn details-map
"Generates map with all the transaction details based on what we've
got from status-go as `send-details` and `sent-transaction`."
[send-details sent-transaction]
(let [send-details (send-details-map send-details)
{:keys [toAddress fromChain toChain amountIn
amountOut fromToken toToken
approvalTx]} sent-transaction
amount-in (money/from-hex amountIn)
amount-out (money/from-hex amountOut)
sent-transaction? (and sent-transaction (> (-> sent-transaction :hash count) 0))]
(if sent-transaction?
(cond-> send-details
:always (assoc :tx-to toAddress
:tx-hash (:hash sent-transaction)
:approval-tx? approvalTx)
(> fromChain 0) (assoc :from-chain fromChain)
(> toChain 0) (assoc :to-chain toChain)
(not= amount-in "0") (assoc :from-amount amount-in)
(not= amount-out "0") (assoc :to-amount amount-out)
(> (count fromToken) 0) (assoc :from-asset fromToken)
(> (count toToken) 0) (assoc :to-asset toToken))
send-details)))

(defn contact-name-by-address
[db address]
(or (get-in db [:wallet :accounts address :name])
(get-in db [:contacts/contacts address :primary-name])))

(defn tx-to-name
"Returns the transaction name that will be used for certain types of transactions."
[send-type]
(cond
(= send-type constants/send-type-bridge) constants/bridge-name-hop
(= send-type constants/send-type-swap) (:full-name constants/swap-provider-paraswap)
:else nil))

(defn transaction-approval-required?
"Indicates whether the transaction needs approval based on the information
from the database."
[transactions {:keys [swap-proposal approval-transaction-id]}]
(let [approval-transaction (when approval-transaction-id
(get transactions approval-transaction-id))
already-approved? (and approval-transaction
(= (:status approval-transaction)
:confirmed))]
(and (:approval-required swap-proposal)
(not already-approved?))))

(defn on-paste-address-or-ens
"Check if the clipboard has any valid address and extract the address without any chain info.
If it does not contain an valid address or it is ENS, return the clipboard text as it is"
Expand Down
81 changes: 66 additions & 15 deletions src/status_im/contexts/wallet/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,22 +777,74 @@

(rf/reg-event-fx
:wallet/transactions-sent-signal-received
(fn [{:keys [db]}
(fn [_
[{sent-transactions :sentTransactions
send-details :sendDetails}]]
{:fx [[:dispatch
[:wallet/show-transaction-notification
{:status :sent
:send-details send-details
:sent-transaction (first sent-transactions)}]]
[:dispatch
(if (:errorResponse send-details)
[:wallet/transaction-failure send-details]
[(if (= (:sendType send-details) constants/send-type-swap)
:wallet.swap/transaction-success
:wallet/transaction-success)
sent-transactions])]]}))

(rf/reg-event-fx
:wallet/sending-transactions-started-signal-received
(fn [_
[{sent-transactions :sentTransactions
send-details :sendDetails}]]
(let [swap? (-> db
(get-in db-path/swap)
seq)]
{:fx [[:dispatch
(if-let [error-response (:errorResponse send-details)]
[(if swap?
:wallet.swap/transaction-failure
:wallet/transaction-failure)
error-response]
[(if swap?
:wallet.swap/transaction-success
:wallet/transaction-success)
sent-transactions])]]})))
{:fx [[:dispatch
[:wallet/show-transaction-notification
{:status :sending
:send-details send-details
:sent-transaction (first sent-transactions)}]]]}))

(rf/reg-event-fx
:wallet/status-changed-signal-received
(fn [_
[{sent-transactions :sentTransactions
send-details :sendDetails}]]
{:fx [[:dispatch
[:wallet/show-transaction-notification
{:status :status-changed
:send-details send-details
:sent-transaction (first sent-transactions)}]]]}))

(rf/reg-event-fx
:wallet/show-transaction-notification
(fn [{:keys [db]} [{:keys [status send-details sent-transaction]}]]
(let [{:keys [error send-type]
:as details}
(as-> (utils/details-map send-details sent-transaction) $
(assoc $ :error (get-in send-details [:ErrorResponse :details]))
(assoc $ :account-from-name (utils/contact-name-by-address db (:address-from $)))
(assoc $ :account-to-name (utils/contact-name-by-address db (:address-to $)))
(assoc $
:tx-to-name
(or (utils/tx-to-name (:send-type $))
(utils/contact-name-by-address db (:tx-to $)))))]
(cond
;; handle errors and show notifications about errors
error
(do
(log/warn "Error when sending transaction" details)
{:fx [[:dispatch
[:toasts/upsert
{:id (keyword (str status "-failure"))
:type :negative
:text error}]]]})

;; handle swap notifications in a separate fx
(= send-type constants/send-type-swap)
{:fx [[:dispatch
[:wallet.swap/show-transaction-notification
{:status status
:send-details details}]]]}))))

(rf/reg-event-fx
:wallet/set-max-base-fee
Expand Down Expand Up @@ -884,4 +936,3 @@
(rf/reg-event-fx :wallet/mark-user-tx-settings-for-deletion
(fn [{db :db}]
{:db (assoc-in db [:wallet :ui :user-tx-settings :delete-on-routes-update?] true)}))

121 changes: 58 additions & 63 deletions src/status_im/contexts/wallet/send/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,49 +567,46 @@
token-decimal (when token (:decimals token))
token-id (utils/format-token-id token collectible)
to-token-id ""
gas-rates constants/gas-rate-medium
to-hex (fn [v]
(send-utils/amount-in-hex v (if token token-decimal 0)))
amount-in (to-hex amount)
amount-out (to-hex amount-out)
from-address wallet-address
network-chain-id (if collectible
(get-in collectible [:id :contract-id :chain-id])
(:chain-id network))
disabled-from-chain-ids (filter #(not= % network-chain-id) network-chain-ids)
disabled-to-chain-ids (filter #(not= %
(if (= tx-type :tx/bridge)
bridge-to-chain-id
network-chain-id))
network-chain-ids)
send-type (case tx-type
:tx/collectible-erc-721
constants/send-type-erc-721-transfer
:tx/collectible-erc-1155
constants/send-type-erc-1155-transfer
:tx/bridge constants/send-type-bridge
constants/send-type-transfer)
sender-network-values (when (= tx-type :tx/bridge)
(send-utils/loading-network-amounts
{:networks [network-chain-id]
:values {network-chain-id amount}
:receiver? false}))
receiver-network-values (when (= tx-type :tx/bridge)
(send-utils/loading-network-amounts
{:networks [bridge-to-chain-id]
:receiver? true}))
request-uuid (str (random-uuid))
params [{:uuid request-uuid
:sendType send-type
:addrFrom from-address
:addrTo to-address
:amountIn amount-in
:amountOut amount-out
:tokenID token-id
:toTokenID to-token-id
to-hex (fn [v] (send-utils/amount-in-hex v (if token token-decimal 0)))
amount-in (to-hex amount)
amount-out (to-hex amount-out)
from-address wallet-address
network-chain-id (if collectible
(get-in collectible [:id :contract-id :chain-id])
(:chain-id network))
disabled-from-chain-ids (filter #(not= % network-chain-id) network-chain-ids)
disabled-to-chain-ids (filter #(not= %
(if (= tx-type :tx/bridge)
bridge-to-chain-id
network-chain-id))
network-chain-ids)
send-type (case tx-type
:tx/collectible-erc-721 constants/send-type-erc-721-transfer
:tx/collectible-erc-1155 constants/send-type-erc-1155-transfer
:tx/bridge constants/send-type-bridge
constants/send-type-transfer)
sender-network-values (when (= tx-type :tx/bridge)
(send-utils/loading-network-amounts
{:networks [network-chain-id]
:values {network-chain-id amount}
:receiver? false}))
receiver-network-values (when (= tx-type :tx/bridge)
(send-utils/loading-network-amounts
{:networks [bridge-to-chain-id]
:receiver? true}))
request-uuid (str (random-uuid))
params [{:uuid request-uuid
:sendType send-type
:addrFrom from-address
:addrTo to-address
:amountIn amount-in
:amountOut amount-out
:tokenID token-id
:tokenIDIsOwnerToken false
:toTokenID to-token-id
:disabledFromChainIDs disabled-from-chain-ids
:disabledToChainIDs disabled-to-chain-ids
:gasFeeMode gas-rates
:gasFeeMode constants/gas-rate-medium
:fromLockedAmount {}
:username (:username args)
:publicKey (:publicKey args)
Expand Down Expand Up @@ -651,16 +648,16 @@
(rf/reg-event-fx
:wallet/handle-suggested-routes
(fn [{:keys [db]} [data]]
(let [{send :send swap? :swap} (-> db :wallet :ui)
skip-processing-routes? (:skip-processing-suggested-routes? send)
clean-user-tx-settings? (get-in db
[:wallet :ui :user-tx-settings
:delete-on-routes-update?])]
(when (or swap? (not skip-processing-routes?))
(let [{:keys [send swap]} (-> db :wallet :ui)
skip-processing-routes? (:skip-processing-suggested-routes? send)
clean-user-tx-settings? (get-in db
[:wallet :ui :user-tx-settings
:delete-on-routes-update?])]
(when (or swap (not skip-processing-routes?))
(let [{error-code :code
:as error} (:ErrorResponse data)
enough-assets? (not (and (:Best data) (= error-code "WR-002")))
failure? (and error enough-assets? (not swap?))
failure? (and error enough-assets? (not swap))
error-message (if (zero? error-code) "An error occurred" (:details error))]
(when failure?
(log/error "failed to get suggested routes (async)"
Expand All @@ -671,11 +668,11 @@
{:db (update-in db [:wallet :ui] dissoc :user-tx-settings)})
{:fx [[:dispatch
(cond
(and failure? swap?) [:wallet/swap-proposal-error error]
failure? [:wallet/suggested-routes-error error-message]
swap? [:wallet/swap-proposal-success (data-store/fix-routes data)]
:else [:wallet/suggested-routes-success (data-store/fix-routes data)
enough-assets?])]]}))))))
(and failure? swap) [:wallet/swap-proposal-error error]
failure? [:wallet/suggested-routes-error error-message]
swap [:wallet/swap-proposal-success (data-store/fix-routes data)]
:else [:wallet/suggested-routes-success (data-store/fix-routes data)
enough-assets?])]]}))))))

(rf/reg-event-fx
:wallet/transaction-success
Expand All @@ -701,16 +698,14 @@

(rf/reg-event-fx
:wallet/transaction-failure
(fn [_ [{:keys [details]}]]
{:fx [[:dispatch [:wallet/end-transaction-flow]]
[:dispatch-later
[{:ms 2000
:dispatch [:wallet/stop-and-clean-suggested-routes]}]]
[:dispatch
[:toasts/upsert
{:id :send-transaction-failure
:type :negative
:text (or details "An error occured")}]]]}))
(fn [_ [send-details]]
(if (= (:sendType send-details) constants/send-type-swap)
{:fx [[:dispatch [:wallet.swap/track-transaction-execution-failed (:errorResponse send-details)]]
[:dispatch [:wallet.swap/end-transaction-flow]]]}
{:fx [[:dispatch [:wallet/end-transaction-flow]]
[:dispatch-later
[{:ms 2000
:dispatch [:wallet/stop-and-clean-suggested-routes]}]]]})))

(rf/reg-event-fx :wallet/clean-just-completed-transaction
(fn [{:keys [db]}]
Expand Down
Loading