@subwallet/extension-base 1.0.2-2 → 1.0.3-0

package/services/transaction-service/utils.js

@@ -9,15 +9,17 @@ export function parseTransactionData(data) {
   return data;
 }
 export function getTransactionLink(chainInfo, extrinsicHash) {
-  const explorerLink = _getBlockExplorerFromChain(chainInfo);
-  if (_isPureEvmChain(chainInfo)) {
-    if (explorerLink) {
-      return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}tx/${extrinsicHash}`;
-    }
-  } else {
+  if (extrinsicHash.startsWith('0x')) {
     const explorerLink = _getBlockExplorerFromChain(chainInfo);
-    if (explorerLink) {
-      return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${extrinsicHash}`;
+    if (_isPureEvmChain(chainInfo)) {
+      if (explorerLink) {
+        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}tx/${extrinsicHash}`;
+      }
+    } else {
+      const explorerLink = _getBlockExplorerFromChain(chainInfo);
+      if (explorerLink) {
+        return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${extrinsicHash}`;
+      }
     }
   }
   return undefined;

package/utils/address.d.ts

@@ -1,2 +1,5 @@
+import { AddressJson } from '@subwallet/extension-base/background/types';
+import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 export declare const simpleAddress: (address: string) => string;
 export declare function quickFormatAddressToCompare(address?: string): string | undefined;
+export declare const convertSubjectInfoToAddresses: (subjectInfo: SubjectInfo) => AddressJson[];

package/utils/address.js

@@ -14,4 +14,11 @@ export function quickFormatAddressToCompare(address) {
     return address;
   }
   return reformatAddress(address, 42).toLowerCase();
-}
+}
+export const convertSubjectInfoToAddresses = subjectInfo => {
+  return Object.values(subjectInfo).map(info => ({
+    address: info.json.address,
+    type: info.type,
+    ...info.json.meta
+  }));
+};

package/utils/index.d.ts

@@ -8,7 +8,7 @@ export declare const isDef: (x: any) => boolean;
 export declare const nonEmptyArr: (x: any) => boolean;
 export declare const isEmptyArray: (x: any) => boolean;
 export declare function isAccountAll(address?: string): boolean;
-export declare function reformatAddress(address: string, networkPrefix: number, isEthereum?: boolean): string;
+export declare function reformatAddress(address: string, networkPrefix?: number, isEthereum?: boolean): string;
 export declare function filterAddressByNetworkKey(addresses: string[], networkKey: string, isEthereum?: boolean): string[];
 export declare function categoryAddresses(addresses: string[]): string[][];
 export declare function categoryNetworks(networks: NetworkJson[]): string[][];
@@ -34,6 +34,6 @@ export declare function mergeNetworkProviders(customNetwork: NetworkJson, predef
 };
 export declare const filterAndSortingAccountByAuthType: (accounts: AccountJson[], accountAuthType: AccountAuthType, sorting?: boolean) => AccountJson[];
 export declare function parseRawNumber(value: string): number;
-export declare function parseNumberToDisplay(amount: BN, decimals: number | undefined): string;
 export declare function isSameAddress(address1: string, address2: string): boolean;
 export declare function getDomainFromUrl(url: string): string;
+export declare function waitTimeout(ms: number): Promise<void>;

package/utils/index.js

@@ -3,7 +3,6 @@
 
 import { CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import BigNumber from 'bignumber.js';
 import { BN, hexToU8a, isHex } from '@polkadot/util';
 import { decodeAddress, encodeAddress, ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export { canDerive } from "./canDerive.js";
@@ -14,7 +13,7 @@ export const isEmptyArray = x => !Array.isArray(x) || Array.isArray(x) && x.leng
 export function isAccountAll(address) {
   return address === ALL_ACCOUNT_KEY;
 }
-export function reformatAddress(address, networkPrefix, isEthereum = false) {
+export function reformatAddress(address, networkPrefix = 42, isEthereum = false) {
   try {
     if (isEthereumAddress(address)) {
       return address;
@@ -264,21 +263,16 @@ export const filterAndSortingAccountByAuthType = (accounts, accountAuthType, sor
 export function parseRawNumber(value) {
   return parseFloat(value.replaceAll(',', ''));
 }
-export function parseNumberToDisplay(amount, decimals) {
-  if (!decimals) {
-    return '0';
-  }
-  const parsedAmount = parseRawNumber(amount.toString());
-  const bigN = new BigNumber(parsedAmount / 10 ** decimals);
-  const roundedString = bigN.toFixed(9);
-  const formattedString = parseFloat(roundedString); // remove excess zeros at the end
-
-  return formattedString.toString();
-}
 export function isSameAddress(address1, address2) {
+  if (isEthereumAddress(address1)) {
+    return address1.toLowerCase() === address2.toLowerCase();
+  }
   return reformatAddress(address1, 0) === reformatAddress(address2, 0); // TODO: maybe there's a better way
 }
 
 export function getDomainFromUrl(url) {
   return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];
+}
+export async function waitTimeout(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
 }

package/utils/promise.d.ts

@@ -0,0 +1,6 @@
+export declare function createPromiseHandler<T>(): {
+    resolve: (value: T) => void;
+    reject: (reason?: unknown) => void;
+    promise: Promise<T>;
+};
+export declare type PromiseHandler<T> = ReturnType<typeof createPromiseHandler<T>>;

package/utils/promise.js

@@ -0,0 +1,20 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export function createPromiseHandler() {
+  let _resolve = () => {
+    console.warn('This promise handler is not implemented');
+  };
+  let _reject = () => {
+    console.warn('This promise handler is not implemented');
+  };
+  const promise = new Promise((resolve, reject) => {
+    _resolve = resolve;
+    _reject = reject;
+  });
+  return {
+    resolve: _resolve,
+    reject: _reject,
+    promise
+  };
+}