@subwallet/extension-base 1.2.26-0 → 1.2.27-0

package/cjs/core/substrate/assets-pallet.js

@@ -3,33 +3,49 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._getAssetsPalletLockedBalance = _getAssetsPalletLockedBalance;
+exports._getAssetsPalletLocked = _getAssetsPalletLocked;
+exports._getAssetsPalletLockedWithStatus = _getAssetsPalletLockedWithStatus;
+exports._getAssetsPalletLockedWithoutStatus = _getAssetsPalletLockedWithoutStatus;
 exports._getAssetsPalletTransferable = _getAssetsPalletTransferable;
+exports._getAssetsPalletTransferableWithStatus = _getAssetsPalletTransferableWithStatus;
+exports._getAssetsPalletTransferableWithoutStatus = _getAssetsPalletTransferableWithoutStatus;
 var _types = require("@subwallet/extension-base/core/substrate/types");
 var _utils = require("@subwallet/extension-base/core/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+function isWithStatus(accountInfo) {
+  return accountInfo.status !== undefined && accountInfo.isFrozen === undefined;
+}
 function _getAssetsPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
-  let bnTransferable = BigInt(0);
-  if (!accountInfo) {
-    return BigInt(0);
-  }
-  if (['Liquid'].includes(accountInfo.status)) {
-    bnTransferable = BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  if (isWithStatus(accountInfo)) {
+    return _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode);
+  } else {
+    return _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode);
   }
-  return bnTransferable;
 }
-function _getAssetsPalletLockedBalance(accountInfo) {
-  let bnLocked = BigInt(0);
-  if (!accountInfo) {
-    return bnLocked;
+function _getAssetsPalletLocked(accountInfo) {
+  if (isWithStatus(accountInfo)) {
+    return _getAssetsPalletLockedWithStatus(accountInfo);
+  } else {
+    return _getAssetsPalletLockedWithoutStatus(accountInfo);
   }
-  if (!['Liquid'].includes(accountInfo.status)) {
-    // todo: check case accountInfo has isFrozen?
-    bnLocked = BigInt(accountInfo.balance);
-  }
-  return bnLocked;
+}
+
+// ----------------------------------------------------------------------
+
+function _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+function _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
+  return !accountInfo.isFrozen ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+function _getAssetsPalletLockedWithStatus(accountInfo) {
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
+}
+function _getAssetsPalletLockedWithoutStatus(accountInfo) {
+  return accountInfo.isFrozen ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/cjs/core/substrate/foreign-asset-pallet.js

@@ -12,15 +12,8 @@ var _utils = require("@subwallet/extension-base/core/utils");
 
 function _getForeignAssetPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  if (!accountInfo || accountInfo.status !== 'Liquid') {
-    return BigInt(0);
-  }
-  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
-  return BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode) : BigInt(0);
 }
 function _getForeignAssetPalletLockedBalance(accountInfo) {
-  if (!accountInfo || accountInfo.status === 'Liquid') {
-    return BigInt(0);
-  }
-  return BigInt(accountInfo.balance);
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.2.26-0'
+  version: '1.2.27-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -191,6 +191,16 @@ const subscribeForeignAssetBalance = async _ref2 => {
           const balances = rs[foreignAssetsAccountKey];
           const items = balances.map((_balance, index) => {
             const balanceInfo = _balance;
+            if (!balanceInfo) {
+              // no balance info response
+              return {
+                address: addresses[index],
+                tokenSlug: tokenInfo.slug,
+                free: '0',
+                locked: '0',
+                state: _KoniTypes.APIItemState.READY
+              };
+            }
             const transferableBalance = (0, _foreignAssetPallet._getForeignAssetPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
             const totalLockedFromTransfer = (0, _foreignAssetPallet._getForeignAssetPalletLockedBalance)(balanceInfo);
             return {
@@ -365,8 +375,18 @@ const subscribeAssetsAccountPallet = async _ref6 => {
         const balances = rs[assetsAccountKey];
         const items = balances.map((_balance, index) => {
           const balanceInfo = _balance;
+          if (!balanceInfo) {
+            // no balance info response
+            return {
+              address: addresses[index],
+              tokenSlug: tokenInfo.slug,
+              free: '0',
+              locked: '0',
+              state: _KoniTypes.APIItemState.READY
+            };
+          }
           const transferableBalance = (0, _assetsPallet._getAssetsPalletTransferable)(balanceInfo, (0, _utils2._getAssetExistentialDeposit)(tokenInfo), extrinsicType);
-          const totalLockedFromTransfer = (0, _assetsPallet._getAssetsPalletLockedBalance)(balanceInfo);
+          const totalLockedFromTransfer = (0, _assetsPallet._getAssetsPalletLocked)(balanceInfo);
           return {
             address: addresses[index],
             tokenSlug: tokenInfo.slug,

package/core/substrate/assets-pallet.d.ts

@@ -1,4 +1,8 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { PalletAssetsAssetAccount } from '@subwallet/extension-base/core/substrate/types';
-export declare function _getAssetsPalletTransferable(accountInfo: PalletAssetsAssetAccount | undefined, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
-export declare function _getAssetsPalletLockedBalance(accountInfo: PalletAssetsAssetAccount | undefined): bigint;
+import { PalletAssetsAssetAccount, PalletAssetsAssetAccountWithoutStatus, PalletAssetsAssetAccountWithStatus } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getAssetsPalletTransferable(accountInfo: PalletAssetsAssetAccount, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getAssetsPalletLocked(accountInfo: PalletAssetsAssetAccount): bigint;
+export declare function _getAssetsPalletTransferableWithStatus(accountInfo: PalletAssetsAssetAccountWithStatus, existentialDeposit: string, strictMode?: boolean): bigint;
+export declare function _getAssetsPalletTransferableWithoutStatus(accountInfo: PalletAssetsAssetAccountWithoutStatus, existentialDeposit: string, strictMode?: boolean): bigint;
+export declare function _getAssetsPalletLockedWithStatus(accountInfo: PalletAssetsAssetAccountWithStatus): bigint;
+export declare function _getAssetsPalletLockedWithoutStatus(accountInfo: PalletAssetsAssetAccountWithoutStatus): bigint;

package/core/substrate/assets-pallet.js

@@ -3,26 +3,38 @@
 
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
 import { _getAppliedExistentialDeposit, getStrictMode } from '@subwallet/extension-base/core/utils';
+function isWithStatus(accountInfo) {
+  return accountInfo.status !== undefined && accountInfo.isFrozen === undefined;
+}
 export function _getAssetsPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = getStrictMode(BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
-  let bnTransferable = BigInt(0);
-  if (!accountInfo) {
-    return BigInt(0);
-  }
-  if (['Liquid'].includes(accountInfo.status)) {
-    bnTransferable = BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  if (isWithStatus(accountInfo)) {
+    return _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode);
+  } else {
+    return _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode);
   }
-  return bnTransferable;
 }
-export function _getAssetsPalletLockedBalance(accountInfo) {
-  let bnLocked = BigInt(0);
-  if (!accountInfo) {
-    return bnLocked;
+export function _getAssetsPalletLocked(accountInfo) {
+  if (isWithStatus(accountInfo)) {
+    return _getAssetsPalletLockedWithStatus(accountInfo);
+  } else {
+    return _getAssetsPalletLockedWithoutStatus(accountInfo);
   }
-  if (!['Liquid'].includes(accountInfo.status)) {
-    // todo: check case accountInfo has isFrozen?
-    bnLocked = BigInt(accountInfo.balance);
-  }
-  return bnLocked;
+}
+
+// ----------------------------------------------------------------------
+
+export function _getAssetsPalletTransferableWithStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+export function _getAssetsPalletTransferableWithoutStatus(accountInfo, existentialDeposit, strictMode) {
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  return !accountInfo.isFrozen ? BigInt(accountInfo.balance) - bnAppliedExistentialDeposit : BigInt(0);
+}
+export function _getAssetsPalletLockedWithStatus(accountInfo) {
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
+}
+export function _getAssetsPalletLockedWithoutStatus(accountInfo) {
+  return accountInfo.isFrozen ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/core/substrate/foreign-asset-pallet.d.ts

@@ -1,4 +1,4 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { PalletAssetsAssetAccount } from '@subwallet/extension-base/core/substrate/types';
-export declare function _getForeignAssetPalletTransferable(accountInfo: PalletAssetsAssetAccount | undefined, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
-export declare function _getForeignAssetPalletLockedBalance(accountInfo: PalletAssetsAssetAccount | undefined): bigint;
+import { PalletAssetsAssetAccountWithStatus } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getForeignAssetPalletTransferable(accountInfo: PalletAssetsAssetAccountWithStatus, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getForeignAssetPalletLockedBalance(accountInfo: PalletAssetsAssetAccountWithStatus): bigint;

package/core/substrate/foreign-asset-pallet.js

@@ -5,15 +5,8 @@ import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/typ
 import { _getAppliedExistentialDeposit, getStrictMode } from '@subwallet/extension-base/core/utils';
 export function _getForeignAssetPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = getStrictMode(BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
-  if (!accountInfo || accountInfo.status !== 'Liquid') {
-    return BigInt(0);
-  }
-  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
-  return BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  return accountInfo.status === 'Liquid' ? BigInt(accountInfo.balance) - _getAppliedExistentialDeposit(existentialDeposit, strictMode) : BigInt(0);
 }
 export function _getForeignAssetPalletLockedBalance(accountInfo) {
-  if (!accountInfo || accountInfo.status === 'Liquid') {
-    return BigInt(0);
-  }
-  return BigInt(accountInfo.balance);
+  return accountInfo.status !== 'Liquid' ? BigInt(accountInfo.balance) : BigInt(0);
 }

package/core/substrate/types.d.ts

@@ -24,12 +24,16 @@ export declare type OrmlTokensAccountData = {
     reserved: number;
     frozen: number;
 };
-export declare type PalletAssetsAssetAccount = {
+export declare type PalletAssetsAssetAccountWithStatus = {
     balance: number | string;
     status: 'Frozen' | 'Liquid' | 'Blocked';
     reason: Record<string, unknown>;
     extra: unknown;
 };
+export declare type PalletAssetsAssetAccountWithoutStatus = Omit<PalletAssetsAssetAccountWithStatus, 'status'> & {
+    isFrozen: boolean;
+};
+export declare type PalletAssetsAssetAccount = PalletAssetsAssetAccountWithStatus | PalletAssetsAssetAccountWithoutStatus;
 export declare type PalletNominationPoolsPoolMember = {
     poolId: number;
     points: number;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.26-0",
+  "version": "1.2.27-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2069,11 +2069,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.82",
-    "@subwallet/extension-base": "^1.2.26-0",
-    "@subwallet/extension-chains": "^1.2.26-0",
-    "@subwallet/extension-dapp": "^1.2.26-0",
-    "@subwallet/extension-inject": "^1.2.26-0",
+    "@subwallet/chain-list": "0.2.83",
+    "@subwallet/extension-base": "^1.2.27-0",
+    "@subwallet/extension-chains": "^1.2.27-0",
+    "@subwallet/extension-dapp": "^1.2.27-0",
+    "@subwallet/extension-inject": "^1.2.27-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.2.26-0'
+  version: '1.2.27-0'
 };

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -4,7 +4,7 @@
 import { _AssetType } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
-import { _getAssetsPalletLockedBalance, _getAssetsPalletTransferable } from '@subwallet/extension-base/core/substrate/assets-pallet';
+import { _getAssetsPalletLocked, _getAssetsPalletTransferable } from '@subwallet/extension-base/core/substrate/assets-pallet';
 import { _getForeignAssetPalletLockedBalance, _getForeignAssetPalletTransferable } from '@subwallet/extension-base/core/substrate/foreign-asset-pallet';
 import { _getTotalStakeInNominationPool } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
 import { _getOrmlTokensPalletLockedBalance, _getOrmlTokensPalletTransferable } from '@subwallet/extension-base/core/substrate/ormlTokens-pallet';
@@ -181,6 +181,16 @@ const subscribeForeignAssetBalance = async ({
           const balances = rs[foreignAssetsAccountKey];
           const items = balances.map((_balance, index) => {
             const balanceInfo = _balance;
+            if (!balanceInfo) {
+              // no balance info response
+              return {
+                address: addresses[index],
+                tokenSlug: tokenInfo.slug,
+                free: '0',
+                locked: '0',
+                state: APIItemState.READY
+              };
+            }
             const transferableBalance = _getForeignAssetPalletTransferable(balanceInfo, _getAssetExistentialDeposit(tokenInfo), extrinsicType);
             const totalLockedFromTransfer = _getForeignAssetPalletLockedBalance(balanceInfo);
             return {
@@ -351,8 +361,18 @@ const subscribeAssetsAccountPallet = async ({
         const balances = rs[assetsAccountKey];
         const items = balances.map((_balance, index) => {
           const balanceInfo = _balance;
+          if (!balanceInfo) {
+            // no balance info response
+            return {
+              address: addresses[index],
+              tokenSlug: tokenInfo.slug,
+              free: '0',
+              locked: '0',
+              state: APIItemState.READY
+            };
+          }
           const transferableBalance = _getAssetsPalletTransferable(balanceInfo, _getAssetExistentialDeposit(tokenInfo), extrinsicType);
-          const totalLockedFromTransfer = _getAssetsPalletLockedBalance(balanceInfo);
+          const totalLockedFromTransfer = _getAssetsPalletLocked(balanceInfo);
           return {
             address: addresses[index],
             tokenSlug: tokenInfo.slug,