@subwallet/extension-base 1.1.32-0 → 1.1.33-0

package/services/transaction-service/index.js

@@ -283,6 +283,12 @@ export default class TransactionService {
         errors: [...data.errors, new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]
       });
     });
+    emitter.on('timeout', data => {
+      this.onTimeOut({
+        ...data,
+        errors: [...data.errors, new TransactionError(BasicTxErrorType.TIMEOUT)]
+      });
+    });
 
     // Todo: handle any event with transaction.eventsHandler
 
@@ -645,6 +651,44 @@ export default class TransactionService {
     }
     this.eventService.emit('transaction.failed', transaction);
   }
+  onTimeOut({
+    blockHash,
+    blockNumber,
+    errors,
+    extrinsicHash,
+    id
+  }) {
+    const transaction = this.getTransaction(id);
+    const nextStatus = ExtrinsicStatus.TIMEOUT;
+    if (transaction) {
+      this.updateTransaction(id, {
+        status: nextStatus,
+        errors,
+        extrinsicHash
+      });
+      this.historyService.updateHistoryByExtrinsicHash(transaction.extrinsicHash, {
+        extrinsicHash: extrinsicHash || transaction.extrinsicHash,
+        status: nextStatus,
+        blockNumber: blockNumber || 0,
+        blockHash: blockHash || ''
+      }).catch(console.error);
+      const info = isHex(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : getBaseTransactionInfo(transaction, this.chainService.getChainInfoMap());
+      this.notificationService.notify({
+        type: NotificationType.ERROR,
+        title: t('Transaction timed out'),
+        message: t('Transaction {{info}} timed out', {
+          replace: {
+            info
+          }
+        }),
+        action: {
+          url: this.getTransactionLink(id)
+        },
+        notifyViaBrowser: true
+      });
+    }
+    this.eventService.emit('transaction.timeout', transaction);
+  }
   generateHashPayload(chain, transaction) {
     var _transaction$nonce;
     const chainInfo = this.chainService.getChainInfoByKey(chain);
@@ -943,7 +987,7 @@ export default class TransactionService {
       const transaction = this.getTransaction(eventData.id);
       if (transaction.status !== ExtrinsicStatus.SUCCESS && transaction.status !== ExtrinsicStatus.FAIL) {
         eventData.errors.push(new TransactionError(BasicTxErrorType.TIMEOUT, t('Transaction timeout')));
-        emitter.emit('error', eventData);
+        emitter.emit('timeout', eventData);
         clearTimeout(timeout);
       }
     }, TRANSACTION_TIMEOUT);

package/services/transaction-service/types.d.ts

@@ -49,5 +49,6 @@ export interface TransactionEventMap {
     extrinsicHash: (response: TransactionEventResponse) => void;
     error: (response: TransactionEventResponse) => void;
     success: (response: TransactionEventResponse) => void;
+    timeout: (response: TransactionEventResponse) => void;
 }
 export {};

package/utils/fetchEvmChainInfo.d.ts

@@ -0,0 +1,17 @@
+export interface OnlineEvmChainInfo {
+    chain: string;
+    name: string;
+    chainId: number;
+    nativeCurrency: {
+        name: string;
+        symbol: string;
+        decimals: number;
+    };
+    rpc: string[];
+    explorers: {
+        name: string;
+        url: string;
+        standard: string;
+    }[];
+}
+export declare function getEVMChainInfo(chainId: number): Promise<OnlineEvmChainInfo>;

package/utils/fetchEvmChainInfo.js

@@ -0,0 +1,14 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const onlineMap = {};
+export async function getEVMChainInfo(chainId) {
+  if (Object.keys(onlineMap).length === 0) {
+    const rs = await fetch('https://chainid.network/chains.json');
+    const data = await rs.json();
+    data.forEach(item => {
+      onlineMap[item.chainId] = item;
+    });
+  }
+  return onlineMap[chainId];
+}

package/utils/index.d.ts

@@ -46,3 +46,5 @@ export * from './environment';
 export * from './lazy';
 export * from './registry';
 export * from './translate';
+export * from './fetchStaticData';
+export * from './fetchEvmChainInfo';

package/utils/index.js

@@ -299,4 +299,6 @@ export * from "./array.js";
 export * from "./environment.js";
 export * from "./lazy.js";
 export * from "./registry.js";
-export * from "./translate.js";
+export * from "./translate.js";
+export * from "./fetchStaticData.js";
+export * from "./fetchEvmChainInfo.js";