@subwallet/extension-base 1.1.22-0 → 1.1.23-0

package/background/KoniTypes.d.ts

@@ -450,7 +450,7 @@ export interface NFTTransactionAdditionalInfo {
 }
 export declare type TransactionAdditionalInfo<T extends ExtrinsicType> = T extends ExtrinsicType.TRANSFER_XCM ? XCMTransactionAdditionalInfo : T extends ExtrinsicType.SEND_NFT ? NFTTransactionAdditionalInfo : undefined;
 export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType.TRANSFER_BALANCE> {
-    origin?: 'app' | 'migration' | 'subsquid';
+    origin?: 'app' | 'migration' | 'subsquid' | 'subscan';
     callhash?: string;
     signature?: string;
     chain: string;
@@ -1603,6 +1603,14 @@ export declare type CampaignData = CampaignBanner | CampaignNotification;
 export interface RequestCampaignBannerComplete {
     slug: string;
 }
+export interface RequestSubscribeHistory {
+    address: string;
+    chain: string;
+}
+export interface ResponseSubscribeHistory {
+    id: string;
+    items: TransactionHistoryItem[];
+}
 export interface KoniRequestSignatures {
     'pri(staking.submitTuringCancelCompound)': [RequestTuringCancelStakeCompound, SWTransactionResponse];
     'pri(staking.submitTuringCompound)': [RequestTuringStakeCompound, SWTransactionResponse];
@@ -1716,6 +1724,7 @@ export interface KoniRequestSignatures {
     'pri(settings.saveShowZeroBalance)': [RequestChangeShowZeroBalance, boolean];
     'pri(settings.saveShowBalance)': [RequestChangeShowBalance, boolean];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
+    'pri(transaction.history.subscribe)': [RequestSubscribeHistory, ResponseSubscribeHistory, TransactionHistoryItem[]];
     'pri(transfer.checkReferenceCount)': [RequestTransferCheckReferenceCount, boolean];
     'pri(transfer.checkSupporting)': [RequestTransferCheckSupporting, SupportTransferResponse];
     'pri(transfer.getExistentialDeposit)': [RequestTransferExistentialDeposit, string];

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

@@ -79,6 +79,8 @@ async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI
       unsubLocalToken = await subscribeEqBalanceAccountPallet(addresses, chain, networkAPI.api, callBack, true);
     } else if (_constants2._BALANCE_CHAIN_GROUP.equilibrium_parachain.includes(chain)) {
       unsubLocalToken = await subscribeEquilibriumTokenBalance(addresses, chain, networkAPI.api, callBack, true);
+    } else if (_constants2._BALANCE_CHAIN_GROUP.centrifuge.includes(chain)) {
+      unsubLocalToken = await subscribeOrmlTokensPallet(addresses, chain, networkAPI.api, callBack);
     }
     if ((0, _utils2._isChainEvmCompatible)(chainInfo)) {
       unsubEvmContractToken = subscribeERC20Interval(addresses, chain, evmApiMap, callBack);
@@ -293,6 +295,53 @@ async function subscribeEqBalanceAccountPallet(addresses, chain, api, callBack,
     });
   };
 }
+
+// eslint-disable-next-line @typescript-eslint/require-await
+async function subscribeOrmlTokensPallet(addresses, chain, api, callBack) {
+  const tokenTypes = [_types._AssetType.LOCAL];
+  const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);
+  const unsubList = Object.values(tokenMap).map(async tokenInfo => {
+    try {
+      const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
+
+      // Get Token Balance
+      // @ts-ignore
+      const unsub = await api.query.ormlTokens.accounts.multi(addresses.map(address => [address, onChainInfo]), balances => {
+        const tokenBalance = {
+          reserved: (0, _utils3.sumBN)(balances.map(b => b.reserved || new _util.BN(0))),
+          frozen: (0, _utils3.sumBN)(balances.map(b => b.frozen || new _util.BN(0))),
+          free: (0, _utils3.sumBN)(balances.map(b => b.free || new _util.BN(0))) // free is actually total balance
+        };
+
+        // free balance = total balance - frozen misc
+        // locked balance = reserved + frozen misc
+        const freeBalance = tokenBalance.free.sub(tokenBalance.frozen);
+        const lockedBalance = tokenBalance.frozen.add(tokenBalance.reserved);
+        callBack({
+          tokenSlug: tokenInfo.slug,
+          state: _KoniTypes.APIItemState.READY,
+          free: freeBalance.toString(),
+          locked: lockedBalance.toString(),
+          substrateInfo: {
+            reserved: tokenBalance.reserved.toString(),
+            miscFrozen: tokenBalance.frozen.toString()
+          }
+        });
+      });
+      return unsub;
+    } catch (err) {
+      console.warn(err);
+      return undefined;
+    }
+  });
+  return () => {
+    unsubList.forEach(subProm => {
+      subProm.then(unsub => {
+        unsub && unsub();
+      }).catch(console.error);
+    });
+  };
+}
 async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, includeNativeToken) {
   const tokenTypes = includeNativeToken ? [_types._AssetType.NATIVE, _types._AssetType.LOCAL] : [_types._AssetType.LOCAL];
   const tokenMap = _handlers.state.getAssetByChainAndAsset(chain, tokenTypes);

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

@@ -24,7 +24,20 @@ const STATUS_MAP = {
   [_types._FundStatus.FAILED]: _KoniTypes.CrowdloanParaState.FAILED,
   [_types._FundStatus.WON]: _KoniTypes.CrowdloanParaState.COMPLETED
 };
+function getChainInfoMap(chainInfoList) {
+  const result = {};
+  chainInfoList.forEach(ci => {
+    if (ci.slug) {
+      result[ci.slug] = ci;
+    }
+  });
+  return result;
+}
 const getOnlineFundList = (0, _fetchStaticData.fetchStaticData)('crowdloan-funds');
+const getOnlineChainInfoMap = (async () => {
+  const chainInfoList = await (0, _fetchStaticData.fetchStaticData)('chains');
+  return getChainInfoMap(chainInfoList);
+})();
 function getRPCCrowdloan(parentAPI, fundInfo, hexAddresses, callback) {
   const {
     auctionIndex,
@@ -130,16 +143,29 @@ const subscribeAcalaContributeInterval = (polkadotAddresses, fundInfo, callback)
 //     return stateMap;
 //   }, {} as Record<string, CrowdloanParaState>);
 // }
+exports.subscribeAcalaContributeInterval = subscribeAcalaContributeInterval;
+function isNeedToUpdateLatestFundInfoMap(latestMap, chainSlug, fundInfo) {
+  if (!latestMap[chainSlug]) {
+    return true;
+  }
+  if (!fundInfo.auctionIndex && fundInfo.status === _types._FundStatus.IN_AUCTION) {
+    return true;
+  }
+  if (fundInfo.auctionIndex > latestMap[chainSlug].auctionIndex) {
+    return true;
+  }
+  return false;
+}
 
 // Get All crowdloan
-exports.subscribeAcalaContributeInterval = subscribeAcalaContributeInterval;
-async function subscribeCrowdloan(addresses, substrateApiMap, callback, chainInfoMap) {
+async function subscribeCrowdloan(addresses, substrateApiMap, callback) {
   const unsubMap = {};
   const latestMap = {};
   const rawFundList = await getOnlineFundList;
+  const chainInfoMap = await getOnlineChainInfoMap;
   rawFundList.forEach(fundInfo => {
     const chainSlug = fundInfo.chain;
-    if (!latestMap[chainSlug] || fundInfo.auctionIndex > latestMap[chainSlug].auctionIndex) {
+    if (isNeedToUpdateLatestFundInfoMap(latestMap, chainSlug, fundInfo)) {
       latestMap[chainSlug] = fundInfo;
     }
   });

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

@@ -105,8 +105,11 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
     //   result.supportTransfer = true;
     //   result.supportTransferAll = true;
   } else if (_constants._TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
-    result.supportTransfer = false;
-    result.supportTransferAll = false;
+    result.supportTransfer = true;
+    result.supportTransferAll = true;
+  } else if (_constants._TRANSFER_CHAIN_GROUP.centrifuge.includes(networkKey)) {
+    result.supportTransfer = true;
+    result.supportTransferAll = true;
   }
   return result;
 }
@@ -190,7 +193,11 @@ const createTransferExtrinsic = async _ref => {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);
     } else if (value) {
-      transfer = api.tx.balances.transferKeepAlive(to, new _util.BN(value));
+      if (api.tx.balances.transferKeepAlive) {
+        transfer = api.tx.balances.transferKeepAlive(to, new _util.BN(value));
+      } else {
+        transfer = api.tx.balances.transfer(to, new _util.BN(value));
+      }
     }
   }
   return [transfer, transferAmount || value];

package/cjs/koni/api/staking/bonding/astar.js

@@ -79,6 +79,9 @@ async function getAstarStakingMetadata(chain, substrateApi) {
     unstakingPeriod
   };
 }
+const convertAddress = address => {
+  return (0, _utilCrypto.isEthereumAddress)(address) ? address.toLowerCase() : address;
+};
 async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi, ledger) {
   const nominationList = [];
   const unstakingList = [];
@@ -97,14 +100,15 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
   if (_stakerInfo.length > 0) {
     const dAppInfoMap = {};
     allDapps.forEach(dappInfo => {
-      dAppInfoMap[dappInfo.address.toLowerCase()] = dappInfo;
+      dAppInfoMap[convertAddress(dappInfo.address)] = dappInfo;
     });
     for (const item of _stakerInfo) {
       const data = item[0].toHuman();
       const stakedDapp = data[1];
       const stakeData = item[1].toPrimitive();
       const stakeList = stakeData.stakes;
-      const dappAddress = stakedDapp.Evm ? stakedDapp.Evm.toLowerCase() : stakedDapp.Wasm;
+      const _dappAddress = stakedDapp.Evm ? stakedDapp.Evm.toLowerCase() : stakedDapp.Wasm;
+      const dappAddress = convertAddress(_dappAddress);
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
@@ -114,7 +118,7 @@ async function subscribeAstarNominatorMetadata(chainInfo, address, substrateApi,
         nominationList.push({
           status: dappStakingStatus,
           chain: chainInfo.slug,
-          validatorAddress: (0, _utilCrypto.isEthereumAddress)(dappAddress) ? dappAddress.toLowerCase() : dappAddress,
+          validatorAddress: dappAddress,
           activeStake: currentStake,
           validatorMinStake: '0',
           validatorIdentity: dappInfo === null || dappInfo === void 0 ? void 0 : dappInfo.name,
@@ -192,7 +196,7 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
       const stakedDapp = data[1];
       const stakeData = item[1].toPrimitive();
       const stakeList = stakeData.stakes;
-      const dappAddress = (0, _utilCrypto.isEthereumAddress)(stakedDapp.Evm) ? stakedDapp.Evm.toLowerCase() : stakedDapp.Evm;
+      const dappAddress = convertAddress(stakedDapp.Evm);
       const currentStake = stakeList.slice(-1)[0].staked.toString() || '0';
       const bnCurrentStake = new _util.BN(currentStake);
       if (bnCurrentStake.gt(_util.BN_ZERO)) {
@@ -285,7 +289,7 @@ async function getAstarDappsInfo(networkKey, substrateApi) {
     allDappsInfo.push({
       commission: 0,
       expectedReturn: 0,
-      address: (0, _utilCrypto.isEthereumAddress)(dappAddress) ? dappAddress.toLowerCase() : dappAddress,
+      address: convertAddress(dappAddress),
       totalStake: totalStake,
       ownStake: '0',
       otherStake: totalStake.toString(),

package/cjs/koni/api/xcm/index.js

@@ -8,6 +8,7 @@ var _polkadotXcm = require("@subwallet/extension-base/koni/api/xcm/polkadotXcm")
 var _xcmPallet = require("@subwallet/extension-base/koni/api/xcm/xcmPallet");
 var _xTokens = require("@subwallet/extension-base/koni/api/xcm/xTokens");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -26,7 +27,11 @@ const createXcmExtrinsic = async _ref => {
   const api = chainApi.api;
   let extrinsic;
   if (_constants._XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain)) {
-    extrinsic = (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    if (['astar', 'shiden'].includes(originChainInfo.slug) && !(0, _utils._isNativeToken)(originTokenInfo)) {
+      extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    } else {
+      extrinsic = (0, _polkadotXcm.getExtrinsicByPolkadotXcmPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
+    }
   } else if (_constants._XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
     extrinsic = (0, _xcmPallet.getExtrinsicByXcmPalletPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   } else {

package/cjs/koni/api/xcm/polkadotXcm.js

@@ -16,9 +16,7 @@ function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destination
   const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, version);
   let assetLocation = (0, _utils.getTokenLocation)(tokenInfo, value, version);
   let method = 'limitedReserveTransferAssets';
-  if (['astar', 'shiden'].includes(originChainInfo.slug) && !(0, _utils2._isNativeToken)(tokenInfo)) {
-    method = 'limitedReserveWithdrawAssets';
-  } else if (['statemint', 'statemine'].includes(originChainInfo.slug) && (0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
+  if (['statemint', 'statemine'].includes(originChainInfo.slug) && (0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
     assetLocation = {
       [version]: [{
         id: {

package/cjs/koni/api/xcm/xTokens.js

@@ -25,6 +25,6 @@ function getCurrencyId(tokenInfo) {
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala', 'parallel', 'astar', 'shiden'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }