From 6331f96947b5484ff572747ade58c248794e76dd Mon Sep 17 00:00:00 2001 From: unclebill Date: Thu, 27 Jan 2022 12:57:44 +0800 Subject: [PATCH] fix(Maskwallet): timeout 5000 is too small for aurora small timeout leads a failure of getting response correctly result in getting empty response --- .../EthereumServices/providers/MaskWallet.ts | 2 +- .../src/extension/background-script/EthereumServices/send.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/extension/background-script/EthereumServices/providers/MaskWallet.ts b/packages/mask/src/extension/background-script/EthereumServices/providers/MaskWallet.ts index 883630db7141..aef313682768 100644 --- a/packages/mask/src/extension/background-script/EthereumServices/providers/MaskWallet.ts +++ b/packages/mask/src/extension/background-script/EthereumServices/providers/MaskWallet.ts @@ -13,7 +13,7 @@ export function createProvider(url: string) { const provider = providerPool.get(url) ?? new MaskWallet.providers.HttpProvider(url, { - timeout: 5000, // ms + timeout: 20000, // ms // @ts-ignore clientConfig: { keepalive: true, diff --git a/packages/mask/src/extension/background-script/EthereumServices/send.ts b/packages/mask/src/extension/background-script/EthereumServices/send.ts index 09b203ac2327..21df5a6e4357 100644 --- a/packages/mask/src/extension/background-script/EthereumServices/send.ts +++ b/packages/mask/src/extension/background-script/EthereumServices/send.ts @@ -133,7 +133,9 @@ async function handleNonce( // nonce too low // nonce too high // transaction too old - if (/\bnonce|transaction\b/im.test(message) && /\b(low|high|old)\b/im.test(message)) resetNonce(account) + const isGeneralErrorNonce = /\bnonce|transaction\b/im.test(message) && /\b(low|high|old)\b/im.test(message) + const isAuroraErrorNonce = message.includes('ERR_INCORRECT_NONCE') + if (isGeneralErrorNonce || isAuroraErrorNonce) resetNonce(account) else if (!error_) commitNonce(account) }