@subwallet/extension-base 1.2.24-1 → 1.2.25-0

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

@@ -15,7 +15,7 @@ function _getOrmlTokensPalletTransferable(accountInfo, existentialDeposit, extri
   const bnAppliedExistentialDeposit = (0, _utils._getAppliedExistentialDeposit)(existentialDeposit, strictMode);
   const bnFrozen = BigInt(accountInfo.frozen);
   const bnFree = BigInt(accountInfo.free);
-  return bnFree - (0, _utils.getMaxBigint)(bnFrozen, bnAppliedExistentialDeposit);
+  return bnFree - (0, _utils.getMaxBigInt)(bnFrozen, bnAppliedExistentialDeposit);
 }
 function _getOrmlTokensPalletLockedBalance(accountInfo) {
   const bnFrozen = BigInt(accountInfo.frozen);

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

@@ -60,15 +60,17 @@ function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMo
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {
   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);
-  return BigInt(accountInfo.data.free) - (0, _utils.getMaxBigint)(bnLocked, bnAppliedExistentialDeposit);
+  const bnTransferable = BigInt(accountInfo.data.free) - (0, _utils.getMaxBigInt)(bnLocked, bnAppliedExistentialDeposit);
+  return (0, _utils.getMaxBigInt)(bnTransferable, BigInt(0));
 }
 function _getSystemPalletTotalBalanceV2(accountInfo) {
   return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);
 }
 function _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode) {
   const bnAppliedExistentialDeposit = BigInt(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
-  const bnAppliedFrozen = (0, _utils.getMaxBigint)(BigInt(accountInfo.data.feeFrozen), BigInt(accountInfo.data.miscFrozen));
-  return BigInt(accountInfo.data.free) - (0, _utils.getMaxBigint)(bnAppliedFrozen, bnAppliedExistentialDeposit);
+  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 BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);

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

@@ -14,7 +14,7 @@ var _utils = require("@subwallet/extension-base/core/utils");
 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);
+  return BigInt(accountInfo.free) - (0, _utils.getMaxBigInt)(BigInt(accountInfo.frozen), bnAppliedExistentialDeposit);
 }
 function _getTokensPalletLocked(accountInfo) {
   return BigInt(accountInfo.reserved) + BigInt(accountInfo.frozen);

package/cjs/core/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports._getAppliedExistentialDeposit = _getAppliedExistentialDeposit;
-exports.getMaxBigint = getMaxBigint;
+exports.getMaxBigInt = getMaxBigInt;
 exports.getStrictMode = getStrictMode;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _types = require("@subwallet/extension-base/core/substrate/types");
@@ -12,20 +12,14 @@ var _types = require("@subwallet/extension-base/core/substrate/types");
 // SPDX-License-Identifier: Apache-2.0
 
 function getStrictMode(type, extrinsicType) {
-  if (!extrinsicType) {
-    return true;
-  }
   if (type === _types.BalanceAccountType.FrameSystemAccountInfo) {
-    return ![_KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
-  }
-  if (type === _types.BalanceAccountType.OrmlTokensAccountData || type === _types.BalanceAccountType.PalletAssetsAssetAccount) {
-    return ![_KoniTypes.ExtrinsicType.TRANSFER_TOKEN, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
+    return !extrinsicType || ![_KoniTypes.ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
   }
-  return true;
+  return false;
 }
 function _getAppliedExistentialDeposit(existentialDeposit, strictMode) {
   return strictMode ? BigInt(existentialDeposit) : BigInt(0);
 }
-function getMaxBigint(a, b) {
+function getMaxBigInt(a, b) {
   return a > b ? a : b;
 }

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-1'
+  version: '1.2.25-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -17,7 +17,7 @@ var _base = _interopRequireDefault(require("./base"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const STATS_URL = 'https://api.bifrost.app/api/site';
+const STATS_URL = 'https://dapi.bifrost.io/api/site';
 const BIFROST_GRAPHQL_ENDPOINT = 'https://bifrost-subsql.liebi.com/v1/graphql';
 const BIFROST_EXCHANGE_RATE_REQUEST = 'query MyQuery{slp_polkadot_ratio(limit:1 where:{key:{_eq:"0"}} order_by:{timestamp:desc_nulls_first}){ratio key timestamp total_issuance token_pool}}';
 class BifrostLiquidStakingPoolHandler extends _base.default {

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -143,7 +143,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const addressFormatted = (0, _utils4.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo));
     const activeStake = ledger.active.toString();
     const totalStake = ledger.total.toString();
-    const unstakingBalance = (ledger.total - ledger.active).toString();
+    const unstakingBalance = new _bignumber.default(ledger.total).minus(ledger.active).toString();
     const unstakingList = [];
     const nominationList = (await this.handleNominationsList(substrateApi, chain, nominations, currentEra, addressFormatted, maxNominatorRewardedPerValidator)) || [];
     let stakingStatus = _types.EarningStatus.NOT_EARNING;

package/core/substrate/ormlTokens-pallet.js

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
-import { _getAppliedExistentialDeposit, getMaxBigint, getStrictMode } from '@subwallet/extension-base/core/utils';
+import { _getAppliedExistentialDeposit, getMaxBigInt, getStrictMode } from '@subwallet/extension-base/core/utils';
 export function _getOrmlTokensPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = getStrictMode(BalanceAccountType.OrmlTokensAccountData, extrinsicType);
   const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
   const bnFrozen = BigInt(accountInfo.frozen);
   const bnFree = BigInt(accountInfo.free);
-  return bnFree - getMaxBigint(bnFrozen, bnAppliedExistentialDeposit);
+  return bnFree - getMaxBigInt(bnFrozen, bnAppliedExistentialDeposit);
 }
 export function _getOrmlTokensPalletLockedBalance(accountInfo) {
   const bnFrozen = BigInt(accountInfo.frozen);

package/core/substrate/system-pallet.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
-import { getMaxBigint, getStrictMode } from '@subwallet/extension-base/core/utils';
+import { getMaxBigInt, getStrictMode } from '@subwallet/extension-base/core/utils';
 function isV1(accountInfo) {
   return accountInfo.data.miscFrozen !== undefined && accountInfo.data.feeFrozen !== undefined;
 }
@@ -50,15 +50,17 @@ function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMo
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {
   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);
-  return BigInt(accountInfo.data.free) - getMaxBigint(bnLocked, bnAppliedExistentialDeposit);
+  const bnTransferable = BigInt(accountInfo.data.free) - getMaxBigInt(bnLocked, bnAppliedExistentialDeposit);
+  return getMaxBigInt(bnTransferable, BigInt(0));
 }
 function _getSystemPalletTotalBalanceV2(accountInfo) {
   return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);
 }
 function _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode) {
   const bnAppliedExistentialDeposit = BigInt(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
-  const bnAppliedFrozen = getMaxBigint(BigInt(accountInfo.data.feeFrozen), BigInt(accountInfo.data.miscFrozen));
-  return BigInt(accountInfo.data.free) - getMaxBigint(bnAppliedFrozen, bnAppliedExistentialDeposit);
+  const bnAppliedFrozen = getMaxBigInt(BigInt(accountInfo.data.feeFrozen), BigInt(accountInfo.data.miscFrozen));
+  const bnTransferable = BigInt(accountInfo.data.free) - getMaxBigInt(bnAppliedFrozen, bnAppliedExistentialDeposit);
+  return getMaxBigInt(bnTransferable, BigInt(0));
 }
 function _getSystemPalletTotalBalanceV1(accountInfo) {
   return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);

package/core/substrate/tokens-pallet.js

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
-import { _getAppliedExistentialDeposit, getMaxBigint, getStrictMode } from '@subwallet/extension-base/core/utils';
+import { _getAppliedExistentialDeposit, getMaxBigInt, getStrictMode } from '@subwallet/extension-base/core/utils';
 export function _getTokensPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
   const strictMode = getStrictMode(BalanceAccountType.OrmlTokensAccountData, extrinsicType);
   const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
-  return BigInt(accountInfo.free) - getMaxBigint(BigInt(accountInfo.frozen), bnAppliedExistentialDeposit);
+  return BigInt(accountInfo.free) - getMaxBigInt(BigInt(accountInfo.frozen), bnAppliedExistentialDeposit);
 }
 export function _getTokensPalletLocked(accountInfo) {
   return BigInt(accountInfo.reserved) + BigInt(accountInfo.frozen);

package/core/utils.d.ts

@@ -1,4 +1,4 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 export declare function getStrictMode(type: string, extrinsicType?: ExtrinsicType): boolean;
 export declare function _getAppliedExistentialDeposit(existentialDeposit: string, strictMode?: boolean): bigint;
-export declare function getMaxBigint(a: bigint, b: bigint): bigint;
+export declare function getMaxBigInt(a: bigint, b: bigint): bigint;

package/core/utils.js

@@ -4,20 +4,14 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
 export function getStrictMode(type, extrinsicType) {
-  if (!extrinsicType) {
-    return true;
-  }
   if (type === BalanceAccountType.FrameSystemAccountInfo) {
-    return ![ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
-  }
-  if (type === BalanceAccountType.OrmlTokensAccountData || type === BalanceAccountType.PalletAssetsAssetAccount) {
-    return ![ExtrinsicType.TRANSFER_TOKEN, ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
+    return !extrinsicType || ![ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType);
   }
-  return true;
+  return false;
 }
 export function _getAppliedExistentialDeposit(existentialDeposit, strictMode) {
   return strictMode ? BigInt(existentialDeposit) : BigInt(0);
 }
-export function getMaxBigint(a, b) {
+export function getMaxBigInt(a, b) {
   return a > b ? a : b;
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.24-1",
+  "version": "1.2.25-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2060,10 +2060,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.81",
-    "@subwallet/extension-base": "^1.2.24-1",
-    "@subwallet/extension-chains": "^1.2.24-1",
-    "@subwallet/extension-dapp": "^1.2.24-1",
-    "@subwallet/extension-inject": "^1.2.24-1",
+    "@subwallet/extension-base": "^1.2.25-0",
+    "@subwallet/extension-chains": "^1.2.25-0",
+    "@subwallet/extension-dapp": "^1.2.25-0",
+    "@subwallet/extension-inject": "^1.2.25-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.24-1'
+  version: '1.2.25-0'
 };

package/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -10,7 +10,7 @@ import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigNumber from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseLiquidStakingPoolHandler from "./base.js";
-const STATS_URL = 'https://api.bifrost.app/api/site';
+const STATS_URL = 'https://dapi.bifrost.io/api/site';
 const BIFROST_GRAPHQL_ENDPOINT = 'https://bifrost-subsql.liebi.com/v1/graphql';
 const BIFROST_EXCHANGE_RATE_REQUEST = 'query MyQuery{slp_polkadot_ratio(limit:1 where:{key:{_eq:"0"}} order_by:{timestamp:desc_nulls_first}){ratio key timestamp total_issuance token_pool}}';
 export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPoolHandler {

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -136,7 +136,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     const addressFormatted = reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo));
     const activeStake = ledger.active.toString();
     const totalStake = ledger.total.toString();
-    const unstakingBalance = (ledger.total - ledger.active).toString();
+    const unstakingBalance = new BigN(ledger.total).minus(ledger.active).toString();
     const unstakingList = [];
     const nominationList = (await this.handleNominationsList(substrateApi, chain, nominations, currentEra, addressFormatted, maxNominatorRewardedPerValidator)) || [];
     let stakingStatus = EarningStatus.NOT_EARNING;