@subwallet/extension-base 1.2.24-0 → 1.2.24-2

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

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports._getAssetsPalletLockedBalance = _getAssetsPalletLockedBalance;
+exports._getAssetsPalletTransferable = _getAssetsPalletTransferable;
+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 _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;
+  }
+  return bnTransferable;
+}
+function _getAssetsPalletLockedBalance(accountInfo) {
+  let bnLocked = BigInt(0);
+  if (!accountInfo) {
+    return bnLocked;
+  }
+  if (!['Liquid'].includes(accountInfo.status)) {
+    // todo: check case accountInfo has isFrozen?
+    bnLocked = BigInt(accountInfo.balance);
+  }
+  return bnLocked;
+}

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

@@ -5,12 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports._getForeignAssetPalletLockedBalance = _getForeignAssetPalletLockedBalance;
 exports._getForeignAssetPalletTransferable = _getForeignAssetPalletTransferable;
+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 _getForeignAssetPalletTransferable(accountInfo) {
-  return accountInfo.status !== 'Liquid' ? BigInt(0) : BigInt(accountInfo.balance);
+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;
 }
 function _getForeignAssetPalletLockedBalance(accountInfo) {
-  return accountInfo.status === 'Liquid' ? BigInt(0) : BigInt(accountInfo.balance);
+  if (!accountInfo || accountInfo.status === 'Liquid') {
+    return BigInt(0);
+  }
+  return BigInt(accountInfo.balance);
 }

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

@@ -1,23 +1,21 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports._getActiveStakeInNominationPool = _getActiveStakeInNominationPool;
 exports._getTotalStakeInNominationPool = _getTotalStakeInNominationPool;
 exports._getUnbondingStakeInNominationPool = _getUnbondingStakeInNominationPool;
-var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 function _getActiveStakeInNominationPool(memberInfo) {
-  return new _bignumber.default(memberInfo.points.toString());
+  return BigInt(memberInfo.points);
 }
 function _getUnbondingStakeInNominationPool(memberInfo) {
-  const unbondingValues = Object.values(memberInfo.unbondingEras).map(unbonding => new _bignumber.default(unbonding));
-  return new _bignumber.default(Object.values(unbondingValues).reduce((a, b) => a.plus(b), new _bignumber.default(0)));
+  const unbondingValues = Object.values(memberInfo.unbondingEras).map(unbonding => BigInt(unbonding));
+  return unbondingValues.reduce((a, b) => a + b, BigInt(0));
 }
 function _getTotalStakeInNominationPool(memberInfo) {
-  return _getActiveStakeInNominationPool(memberInfo).plus(_getUnbondingStakeInNominationPool(memberInfo));
+  return _getActiveStakeInNominationPool(memberInfo) + _getUnbondingStakeInNominationPool(memberInfo);
 }

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports._getOrmlTokensPalletLockedBalance = _getOrmlTokensPalletLockedBalance;
+exports._getOrmlTokensPalletTransferable = _getOrmlTokensPalletTransferable;
+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 _getOrmlTokensPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
+  const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.OrmlTokensAccountData, extrinsicType);
+  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
+  const bnFrozen = BigInt(accountInfo.frozen);
+  const bnFree = BigInt(accountInfo.free);
+  return bnFree - (0, _utils.getMaxBigInt)(bnFrozen, bnAppliedExistentialDeposit);
+}
+function _getOrmlTokensPalletLockedBalance(accountInfo) {
+  const bnFrozen = BigInt(accountInfo.frozen);
+  const bnReserved = BigInt(accountInfo.reserved);
+  return bnReserved + bnFrozen;
+}

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

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,8 +8,8 @@ exports._getAppliedExistentialDepositWithExtrinsicType = _getAppliedExistentialD
 exports._getSystemPalletTotalBalance = _getSystemPalletTotalBalance;
 exports._getSystemPalletTransferable = _getSystemPalletTransferable;
 exports._isAccountActive = _isAccountActive;
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _bignumber = _interopRequireDefault(require("bignumber.js"));
+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
 
@@ -18,7 +17,7 @@ function isV1(accountInfo) {
   return accountInfo.data.miscFrozen !== undefined && accountInfo.data.feeFrozen !== undefined;
 }
 function _getSystemPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
-  const strictMode = !extrinsicType || ![_KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
+  const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.FrameSystemAccountInfo, extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
 
   if (isV1(accountInfo)) {
     return _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode);
@@ -41,7 +40,7 @@ function _getSystemPalletTotalBalance(accountInfo) {
   }
 }
 function _getAppliedExistentialDepositWithExtrinsicType(accountInfo, existentialDeposit, extrinsicType) {
-  const strictMode = !extrinsicType || ![_KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
+  const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.FrameSystemAccountInfo, extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
 
   return _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode);
 }
@@ -49,29 +48,30 @@ function _getAppliedExistentialDepositWithExtrinsicType(accountInfo, existential
 // ----------------------------------------------------------------------
 
 function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode) {
+  const bnExistentialDeposit = BigInt(existentialDeposit);
+
   // strict mode will always apply existential deposit to keep account alive
   if (strictMode) {
-    return existentialDeposit;
+    return bnExistentialDeposit;
   }
-  return _canAccountBeReaped(accountInfo) ? '0' : existentialDeposit; // account for ED here will go better with max transfer logic
+  return _canAccountBeReaped(accountInfo) ? BigInt(0) : bnExistentialDeposit; // account for ED here will go better with max transfer logic
 }
 
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {
-  const bnFree = new _bignumber.default(accountInfo.data.free);
-  const bnLocked = new _bignumber.default(accountInfo.data.frozen).minus(accountInfo.data.reserved); // locked can go below 0 but this shouldn't matter
-  const bnAppliedExistentialDeposit = new _bignumber.default(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
-  const bnTransferableBalance = bnFree.minus(_bignumber.default.max(bnLocked, bnAppliedExistentialDeposit));
-  return _bignumber.default.max(bnTransferableBalance, 0).toFixed();
+  const bnLocked = BigInt(accountInfo.data.frozen) - BigInt(accountInfo.data.reserved); // locked can go below 0 but this shouldn't matter
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode);
+  const bnTransferable = BigInt(accountInfo.data.free) - (0, _utils.getMaxBigInt)(bnLocked, bnAppliedExistentialDeposit);
+  return (0, _utils.getMaxBigInt)(bnTransferable, BigInt(0));
 }
 function _getSystemPalletTotalBalanceV2(accountInfo) {
-  return new _bignumber.default(accountInfo.data.free).plus(accountInfo.data.reserved).toFixed();
+  return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);
 }
 function _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode) {
-  const bnAppliedExistentialDeposit = new _bignumber.default(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
-  const bnAppliedFrozen = _bignumber.default.max(accountInfo.data.feeFrozen, accountInfo.data.miscFrozen);
-  const bnTransferableBalance = new _bignumber.default(accountInfo.data.free).minus(_bignumber.default.max(bnAppliedFrozen, bnAppliedExistentialDeposit));
-  return _bignumber.default.max(bnTransferableBalance, 0).toFixed();
+  const bnAppliedExistentialDeposit = BigInt(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
+  const bnAppliedFrozen = (0, _utils.getMaxBigInt)(BigInt(accountInfo.data.feeFrozen), BigInt(accountInfo.data.miscFrozen));
+  const bnTransferable = BigInt(accountInfo.data.free) - (0, _utils.getMaxBigInt)(bnAppliedFrozen, bnAppliedExistentialDeposit);
+  return (0, _utils.getMaxBigInt)(bnTransferable, BigInt(0));
 }
 function _getSystemPalletTotalBalanceV1(accountInfo) {
-  return new _bignumber.default(accountInfo.data.free).plus(accountInfo.data.reserved).toFixed();
+  return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);
 }

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports._getTokensPalletLocked = _getTokensPalletLocked;
+exports._getTokensPalletTotalBalance = _getTokensPalletTotalBalance;
+exports._getTokensPalletTransferable = _getTokensPalletTransferable;
+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 _getTokensPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
+  const strictMode = (0, _utils.getStrictMode)(_types.BalanceAccountType.OrmlTokensAccountData, extrinsicType);
+  const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
+  return BigInt(accountInfo.free) - (0, _utils.getMaxBigInt)(BigInt(accountInfo.frozen), bnAppliedExistentialDeposit);
+}
+function _getTokensPalletLocked(accountInfo) {
+  return BigInt(accountInfo.reserved) + BigInt(accountInfo.frozen);
+}
+function _getTokensPalletTotalBalance(accountInfo) {
+  return BigInt(accountInfo.free) + BigInt(accountInfo.reserved);
+}

package/cjs/core/substrate/types.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BalanceAccountType = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// https://crates.parity.io/frame_system/struct.AccountInfo.html
+// https://wiki.polkadot.network/docs/learn-account-balances
+
+// export type BalanceAccountType = 'FrameSystemAccountInfo' | 'OrmlTokensAccountData' | 'PalletAssetsAssetAccount' | 'PalletNominationPoolsPoolMember';
+const BalanceAccountType = {
+  FrameSystemAccountInfo: 'FrameSystemAccountInfo',
+  OrmlTokensAccountData: 'OrmlTokensAccountData',
+  PalletAssetsAssetAccount: 'PalletAssetsAssetAccount'
+};
+exports.BalanceAccountType = BalanceAccountType;

package/cjs/core/substrate/xcm-parser.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports._adaptX1Interior = _adaptX1Interior;
 exports._getXcmBeneficiary = _getXcmBeneficiary;
 exports._getXcmDestWeight = _getXcmDestWeight;
 exports._getXcmMultiAssets = _getXcmMultiAssets;
@@ -204,15 +205,28 @@ function _getRecipientLocation(destChainInfo, recipient, version) {
   };
 }
 function _getAssetIdentifier(tokenInfo, version) {
-  const assetIdentifier = (0, _utils._getXcmAssetMultilocation)(tokenInfo);
-  if (!assetIdentifier) {
+  const _assetIdentifier = (0, _utils._getXcmAssetMultilocation)(tokenInfo);
+  if (!_assetIdentifier) {
     throw new Error('Asset must have multilocation');
   }
+  const assetIdentifier = _adaptX1Interior(structuredClone(_assetIdentifier), version);
   return version >= 4 // from V4, Concrete is removed
   ? assetIdentifier : {
     Concrete: assetIdentifier
   };
 }
+function _adaptX1Interior(assetIdentifier, version) {
+  const interior = assetIdentifier.interior;
+  const isInteriorObj = typeof interior === 'object' && interior !== null;
+  const isX1 = isInteriorObj && 'X1' in interior;
+  const needModifyX1 = version <= 4 && Array.isArray(interior.X1);
+  if (isInteriorObj && isX1 && needModifyX1) {
+    // X1 is an object for version < 4. From V4, it's an array
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
+    interior.X1 = interior.X1[0];
+  }
+  return assetIdentifier;
+}
 function _getNetworkByVersion(version) {
   switch (version) {
     case 1:

package/cjs/core/utils.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports._getAppliedExistentialDeposit = _getAppliedExistentialDeposit;
+exports.getMaxBigInt = getMaxBigInt;
+exports.getStrictMode = getStrictMode;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _types = require("@subwallet/extension-base/core/substrate/types");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+function getStrictMode(type, extrinsicType) {
+  if (type === _types.BalanceAccountType.FrameSystemAccountInfo) {
+    return !extrinsicType || ![_KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
+  }
+  return false;
+}
+function _getAppliedExistentialDeposit(existentialDeposit, strictMode) {
+  return strictMode ? BigInt(existentialDeposit) : BigInt(0);
+}
+function getMaxBigInt(a, b) {
+  return a > b ? a : b;
+}

package/cjs/koni/background/handlers/Extension.js

@@ -2001,7 +2001,7 @@ class KoniExtension {
     if (destinationTokenInfo) {
       const [bnMockFee, {
         value
-      }] = await Promise.all([(0, _xcm.getXcmMockTxFee)(substrateApi, chainInfoMap, address, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
+      }] = await Promise.all([(0, _xcm.getXcmMockTxFee)(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
         extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
         address,
         networkKey: originTokenInfo.originChain,

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.24-0'
+  version: '1.2.24-2'
 };
 exports.packageInfo = packageInfo;

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

@@ -27,7 +27,7 @@ const subscribeEquilibriumTokenBalance = async _ref => {
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils2.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
   try {
-    const unsub = await substrateApi.query.system.account.multi(addresses, balances => {
+    const unsub = await substrateApi.api.query.system.account.multi(addresses, balances => {
       // Equilibrium customizes the SystemAccount pallet
       Object.values(tokenMap).forEach(tokenInfo => {
         const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
@@ -91,7 +91,7 @@ const subscribeEqBalanceAccountPallet = async _ref2 => {
   const unsubList = Object.values(tokenMap).map(async tokenInfo => {
     try {
       const assetId = (0, _utils._getTokenOnChainAssetId)(tokenInfo);
-      const unsub = await substrateApi.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
+      const unsub = await substrateApi.api.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
         const items = balances.map((balance, index) => {
           return {
             address: addresses[index],