From ce1d892f1bcf39d7837c9fa4c559d786fde296c5 Mon Sep 17 00:00:00 2001 From: guanbinrui <52657989+guanbinrui@users.noreply.github.com> Date: Tue, 12 Jul 2022 20:08:24 +0800 Subject: [PATCH] Revert "fix: nonce confliction (#6771)" This reverts commit 1c971b6aa12de0df6e7d846ed55ef1598701a69c. --- .../TransactionFormatter/descriptors/ERC20.ts | 1 - .../TransactionFormatter/descriptors/ERC721.ts | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC20.ts b/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC20.ts index 6ce497bb421d..cd6a08c79c1d 100644 --- a/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC20.ts +++ b/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC20.ts @@ -14,7 +14,6 @@ export class ERC20Descriptor implements TransactionDescriptor { }) for (const method of context.methods) { const parameters = method.parameters - switch (method.name) { case 'approve': if (parameters?.spender === undefined || parameters?.value === undefined) break diff --git a/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC721.ts b/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC721.ts index 0048b51af5a8..bcbf4dea0356 100644 --- a/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC721.ts +++ b/packages/plugins/EVM/src/state/TransactionFormatter/descriptors/ERC721.ts @@ -1,6 +1,5 @@ import type { TransactionContext } from '@masknet/web3-shared-base' import type { ChainId, TransactionParameter } from '@masknet/web3-shared-evm' -import { Web3StateSettings } from '../../../settings' import type { TransactionDescriptor } from '../types' export class ERC721Descriptor implements TransactionDescriptor { @@ -11,20 +10,6 @@ export class ERC721Descriptor implements TransactionDescriptor { const parameters = method.parameters switch (method.name) { - case 'approve': - if (parameters?.to === undefined || parameters?.tokenId === undefined) break - - const connection = await Web3StateSettings.value.Connection?.getConnection?.({ - chainId: context.chainId, - }) - const contract = await connection?.getNonFungibleTokenContract(context.to) - - return { - chainId: context.chainId, - title: `Unlock ${contract?.symbol ?? 'token'} contract`, - description: `Unlock ${contract?.symbol ?? 'token'} contract`, - successfulDescription: `${contract?.symbol ?? 'token'} is unlocked successfully.`, - } case 'setApprovalForAll': if (parameters?.operator === undefined || parameters?.approved === undefined) break return {