Skip to content

fix(transation): cancelled detection #6149

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

Merged
guanbinrui merged 1 commit into from
Apr 25, 2022
Merged

fix(transation): cancelled detection #6149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 8 deletions packages/mask/src/plugins/Wallet/services/transaction/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { sha3, toHex } from 'web3-utils'
import type { JsonRpcPayload } from 'web3-core-helpers'
import type { Transaction, TransactionConfig, TransactionReceipt } from 'web3-core'
import {
isSameAddress,
TransactionState,
TransactionStateType,
TransactionStatusType,
Expand Down Expand Up @@ -59,7 +58,6 @@ export function getReceiptStatus(receipt: TransactionReceipt | null) {
const status = receipt.status as unknown as string
if (receipt.status === false || ['0', '0x', '0x0'].includes(status)) return TransactionStatusType.FAILED
if (receipt.status === true || ['1', '0x1'].includes(status)) {
if (isSameAddress(receipt.from, receipt.to)) return TransactionStatusType.CANCELLED
return TransactionStatusType.SUCCEED
}
return TransactionStatusType.NOT_DEPEND
Expand Down Expand Up @@ -87,12 +85,6 @@ export function getTransactionState(receipt: TransactionReceipt): TransactionSta
receipt,
error: new Error('Invalid transaction status.'),
}
case TransactionStatusType.CANCELLED:
return {
type: TransactionStateType.FAILED,
receipt,
error: new Error('CANCELLED'),
}
default:
unreachable(status)
}
Expand Down