@subwallet/extension-base 1.1.64-0 → 1.1.65-0

package/cjs/koni/api/dotsama/transfer.js

@@ -114,6 +114,7 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
   return result;
 }
 const createTransferExtrinsic = async _ref => {
+  var _tokenInfo$metadata;
   let {
     from,
     networkKey,
@@ -124,6 +125,10 @@ const createTransferExtrinsic = async _ref => {
     value
   } = _ref;
   const api = substrateApi.api;
+  const isDisableTransfer = (_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.isDisableTransfer;
+  if (isDisableTransfer) {
+    return [null, value];
+  }
 
   // @ts-ignore
   let transfer = null;

package/cjs/packageInfo.js

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

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,6 +13,7 @@ var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils3 = require("@subwallet/extension-base/utils");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
 var _evm = require("../evm");
@@ -233,6 +235,15 @@ const subscribeBridgedBalance = async _ref4 => {
     });
   };
 };
+function extractOkResponse(response) {
+  if ('ok' in response) {
+    return response.ok;
+  }
+  if ('Ok' in response) {
+    return response.Ok;
+  }
+  return undefined;
+}
 const subscribePSP22Balance = _ref5 => {
   let {
     addresses,
@@ -254,15 +265,17 @@ const subscribePSP22Balance = _ref5 => {
         const contract = psp22ContractMap[tokenInfo.slug];
         const balances = await Promise.all(addresses.map(async address => {
           try {
-            var _balanceOf$output, _ref7;
+            var _balanceOf$output;
             const _balanceOf = await contract.query['psp22::balanceOf'](address, {
               gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi)
             }, address);
             const balanceObj = _balanceOf === null || _balanceOf === void 0 ? void 0 : (_balanceOf$output = _balanceOf.output) === null || _balanceOf$output === void 0 ? void 0 : _balanceOf$output.toPrimitive();
+            const freeResponse = extractOkResponse(balanceObj);
+            const free = freeResponse ? new _bignumber.default(freeResponse).toString() : '0';
             return {
               address: address,
               tokenSlug: tokenInfo.slug,
-              free: _balanceOf.output ? (_ref7 = balanceObj.ok) !== null && _ref7 !== void 0 ? _ref7 : balanceObj.Ok : '0',
+              free,
               locked: '0',
               state: _KoniTypes.APIItemState.READY
             };
@@ -290,7 +303,7 @@ const subscribePSP22Balance = _ref5 => {
     clearInterval(interval);
   };
 };
-const subscribeTokensAccountsPallet = async _ref8 => {
+const subscribeTokensAccountsPallet = async _ref7 => {
   let {
     addresses,
     assetMap,
@@ -298,7 +311,7 @@ const subscribeTokensAccountsPallet = async _ref8 => {
     chainInfo,
     includeNativeToken,
     substrateApi
-  } = _ref8;
+  } = _ref7;
   const chain = chainInfo.slug;
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);
@@ -344,7 +357,7 @@ const subscribeTokensAccountsPallet = async _ref8 => {
     });
   };
 };
-const subscribeAssetsAccountPallet = async _ref9 => {
+const subscribeAssetsAccountPallet = async _ref8 => {
   let {
     addresses,
     assetMap,
@@ -352,7 +365,7 @@ const subscribeAssetsAccountPallet = async _ref9 => {
     chainInfo,
     includeNativeToken,
     substrateApi
-  } = _ref9;
+  } = _ref8;
   const chain = chainInfo.slug;
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, [_types._AssetType.LOCAL]);
   Object.values(tokenMap).forEach(token => {
@@ -409,14 +422,14 @@ const subscribeAssetsAccountPallet = async _ref9 => {
 };
 
 // eslint-disable-next-line @typescript-eslint/require-await
-const subscribeOrmlTokensPallet = async _ref10 => {
+const subscribeOrmlTokensPallet = async _ref9 => {
   let {
     addresses,
     assetMap,
     callback,
     chainInfo,
     substrateApi
-  } = _ref10;
+  } = _ref9;
   const chain = chainInfo.slug;
   const tokenTypes = [_types._AssetType.LOCAL];
   const tokenMap = (0, _utils3.filterAssetsByChainAndType)(assetMap, chain, tokenTypes);

package/koni/api/dotsama/transfer.js

@@ -114,7 +114,12 @@ export const createTransferExtrinsic = async ({
   transferAll,
   value
 }) => {
+  var _tokenInfo$metadata;
   const api = substrateApi.api;
+  const isDisableTransfer = (_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.isDisableTransfer;
+  if (isDisableTransfer) {
+    return [null, value];
+  }
 
   // @ts-ignore
   let transfer = null;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.64-0",
+  "version": "1.1.65-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1869,11 +1869,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.60",
-    "@subwallet/extension-base": "^1.1.64-0",
-    "@subwallet/extension-chains": "^1.1.64-0",
-    "@subwallet/extension-dapp": "^1.1.64-0",
-    "@subwallet/extension-inject": "^1.1.64-0",
+    "@subwallet/chain-list": "0.2.61",
+    "@subwallet/extension-base": "^1.1.65-0",
+    "@subwallet/extension-chains": "^1.1.65-0",
+    "@subwallet/extension-dapp": "^1.1.65-0",
+    "@subwallet/extension-inject": "^1.1.65-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",

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.1.64-0'
+  version: '1.1.65-0'
 };

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

@@ -9,6 +9,7 @@ import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wa
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { combineLatest, Observable } from 'rxjs';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { subscribeERC20Interval } from "../evm.js";
@@ -222,6 +223,15 @@ const subscribeBridgedBalance = async ({
     });
   };
 };
+function extractOkResponse(response) {
+  if ('ok' in response) {
+    return response.ok;
+  }
+  if ('Ok' in response) {
+    return response.Ok;
+  }
+  return undefined;
+}
 const subscribePSP22Balance = ({
   addresses,
   assetMap,
@@ -241,15 +251,17 @@ const subscribePSP22Balance = ({
         const contract = psp22ContractMap[tokenInfo.slug];
         const balances = await Promise.all(addresses.map(async address => {
           try {
-            var _balanceOf$output, _ref;
+            var _balanceOf$output;
             const _balanceOf = await contract.query['psp22::balanceOf'](address, {
               gasLimit: getDefaultWeightV2(substrateApi)
             }, address);
             const balanceObj = _balanceOf === null || _balanceOf === void 0 ? void 0 : (_balanceOf$output = _balanceOf.output) === null || _balanceOf$output === void 0 ? void 0 : _balanceOf$output.toPrimitive();
+            const freeResponse = extractOkResponse(balanceObj);
+            const free = freeResponse ? new BigN(freeResponse).toString() : '0';
             return {
               address: address,
               tokenSlug: tokenInfo.slug,
-              free: _balanceOf.output ? (_ref = balanceObj.ok) !== null && _ref !== void 0 ? _ref : balanceObj.Ok : '0',
+              free,
               locked: '0',
               state: APIItemState.READY
             };