@subwallet/extension-base 1.0.2-1b → 1.0.2-2

package/services/transaction-service/index.js

@@ -427,11 +427,11 @@ export default class TransactionService {
     }
     try {
       // Return one more history record if transaction send to account in the wallets
-      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && keyring.getPair(historyItem.to);
+      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && keyring.getAccount(historyItem.to);
       if (toAccount) {
         return [historyItem, {
           ...historyItem,
-          address: toAccount.address,
+          address: historyItem.to,
           direction: TransactionDirection.RECEIVED
         }];
       }
@@ -456,27 +456,18 @@ export default class TransactionService {
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
     const transaction = this.getTransaction(id);
-    if (transaction.extrinsicType === ExtrinsicType.SEND_NFT) {
-      const inputData = parseTransactionData(transaction.data);
-      try {
-        const sender = keyring.getPair(inputData.senderAddress);
-        sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
-          this.eventService.emit('transaction.transferNft', undefined);
-        }).catch(console.error);
-      } catch (e) {
-        console.error(e);
-      }
-      try {
-        const recipient = keyring.getPair(inputData.recipientAddress);
-        recipient && this.databaseService.addNft(recipient.address, {
-          ...inputData.nftItem,
-          owner: recipient.address
-        }).catch(console.error);
-      } catch (e) {
-        console.error(e);
-      }
-    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
-      this.eventService.emit('transaction.submitStaking', transaction.chain);
+    switch (transaction.extrinsicType) {
+      case ExtrinsicType.SEND_NFT:
+        {
+          const inputData = parseTransactionData(transaction.data);
+          const sender = keyring.getAccount(inputData.senderAddress);
+          const recipient = keyring.getAccount(inputData.recipientAddress);
+          sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).catch(console.error);
+          recipient && this.databaseService.addNft(recipient.address, {
+            ...inputData.nftItem,
+            owner: recipient.address
+          }).catch(console.error);
+        }
     }
   }
   onSuccess({

package/utils/index.d.ts

@@ -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,6 +3,7 @@
 
 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";
@@ -263,16 +264,21 @@ export const filterAndSortingAccountByAuthType = (accounts, accountAuthType, sor
 export function parseRawNumber(value) {
   return parseFloat(value.replaceAll(',', ''));
 }
-export function isSameAddress(address1, address2) {
-  if (isEthereumAddress(address1)) {
-    return address1.toLowerCase() === address2.toLowerCase();
+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) {
   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/cjs/koni/api/tokens/wasm/utils.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDefaultWeightV2 = getDefaultWeightV2;
-exports.getWasmContractGasLimit = getWasmContractGasLimit;
-var _util = require("@polkadot/util");
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-const MAX_CALL_WEIGHT = '5000000000000';
-const DEFAULT_REF_TIME = '1000000000000';
-const toContractAbiMessage = (contractPromise, message) => {
-  const value = contractPromise.abi.messages.find(m => m.method === message);
-  if (!value) {
-    const messages = contractPromise === null || contractPromise === void 0 ? void 0 : contractPromise.abi.messages.map(m => m.method).join(', ');
-    const error = `"${message}" not found in metadata.spec.messages: [${messages}]`;
-    console.error(error);
-    return {
-      ok: false,
-      error
-    };
-  }
-  return {
-    ok: true,
-    value
-  };
-};
-async function getWasmContractGasLimit(api, callerAddress, message, contract) {
-  let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
-  let args = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
-  try {
-    var _abiMessage$value;
-    const abiMessage = toContractAbiMessage(contract, message);
-    if (!abiMessage.ok) {
-      return getDefaultWeightV2(api, true);
-    }
-
-    // @ts-ignore
-    const {
-      gasLimit,
-      storageDepositLimit,
-      value
-    } = options;
-
-    // @ts-ignore
-    const {
-      gasRequired
-    } = await api.call.contractsApi.call(callerAddress, contract.address, value !== null && value !== void 0 ? value : new _util.BN(0), gasLimit !== null && gasLimit !== void 0 ? gasLimit : null, storageDepositLimit !== null && storageDepositLimit !== void 0 ? storageDepositLimit : null, abiMessage === null || abiMessage === void 0 ? void 0 : (_abiMessage$value = abiMessage.value) === null || _abiMessage$value === void 0 ? void 0 : _abiMessage$value.toU8a(args));
-    return gasRequired;
-  } catch {
-    return getDefaultWeightV2(api, true);
-  }
-}
-function getDefaultWeightV2(apiPromise, isFallback) {
-  const proofSize = isFallback ? 3407872 : MAX_CALL_WEIGHT; // TODO: handle error better
-  const refTime = isFallback ? 32490000000 : DEFAULT_REF_TIME;
-  return apiPromise.registry.createType('WeightV2', {
-    refTime,
-    proofSize
-  });
-}

package/koni/api/tokens/wasm/utils.d.ts

@@ -1,6 +0,0 @@
-import { ApiPromise } from '@polkadot/api';
-import { ContractPromise } from '@polkadot/api-contract';
-import { WeightV2 } from '@polkadot/types/interfaces';
-import { Codec } from '@polkadot/types/types';
-export declare function getWasmContractGasLimit(api: ApiPromise, callerAddress: string, message: string, contract: ContractPromise, options?: {}, args?: never[]): Promise<Codec>;
-export declare function getDefaultWeightV2(apiPromise: ApiPromise, isFallback?: boolean): WeightV2;

package/koni/api/tokens/wasm/utils.js

@@ -1,54 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-import { BN } from '@polkadot/util';
-const MAX_CALL_WEIGHT = '5000000000000';
-const DEFAULT_REF_TIME = '1000000000000';
-const toContractAbiMessage = (contractPromise, message) => {
-  const value = contractPromise.abi.messages.find(m => m.method === message);
-  if (!value) {
-    const messages = contractPromise === null || contractPromise === void 0 ? void 0 : contractPromise.abi.messages.map(m => m.method).join(', ');
-    const error = `"${message}" not found in metadata.spec.messages: [${messages}]`;
-    console.error(error);
-    return {
-      ok: false,
-      error
-    };
-  }
-  return {
-    ok: true,
-    value
-  };
-};
-export async function getWasmContractGasLimit(api, callerAddress, message, contract, options = {}, args = []) {
-  try {
-    var _abiMessage$value;
-    const abiMessage = toContractAbiMessage(contract, message);
-    if (!abiMessage.ok) {
-      return getDefaultWeightV2(api, true);
-    }
-
-    // @ts-ignore
-    const {
-      gasLimit,
-      storageDepositLimit,
-      value
-    } = options;
-
-    // @ts-ignore
-    const {
-      gasRequired
-    } = await api.call.contractsApi.call(callerAddress, contract.address, value !== null && value !== void 0 ? value : new BN(0), gasLimit !== null && gasLimit !== void 0 ? gasLimit : null, storageDepositLimit !== null && storageDepositLimit !== void 0 ? storageDepositLimit : null, abiMessage === null || abiMessage === void 0 ? void 0 : (_abiMessage$value = abiMessage.value) === null || _abiMessage$value === void 0 ? void 0 : _abiMessage$value.toU8a(args));
-    return gasRequired;
-  } catch {
-    return getDefaultWeightV2(api, true);
-  }
-}
-export function getDefaultWeightV2(apiPromise, isFallback) {
-  const proofSize = isFallback ? 3407872 : MAX_CALL_WEIGHT; // TODO: handle error better
-  const refTime = isFallback ? 32490000000 : DEFAULT_REF_TIME;
-  return apiPromise.registry.createType('WeightV2', {
-    refTime,
-    proofSize
-  });
-}