@subwallet/extension-base 1.1.2-0 → 1.1.3-0

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

@@ -238,14 +238,14 @@ async function subscribeRelayChainNominatorMetadata(chainInfo, address, substrat
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
-    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
-    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
+    const remainingEra = unlockingChunk.era - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -337,14 +337,14 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
-    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
-    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
+    const remainingEra = unlockingChunk.era - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -395,14 +395,14 @@ async function subscribeRelayChainPoolMemberMetadata(chainInfo, address, substra
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(_ref => {
     let [unlockingEra, amount] = _ref;
-    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
-    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
+    const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new _util.BN(poolMemberInfo.points.toString());
@@ -473,14 +473,14 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(_ref2 => {
     let [unlockingEra, amount] = _ref2;
-    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
-    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
+    const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
     const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new _util.BN(poolMemberInfo.points.toString());
@@ -615,17 +615,27 @@ async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators,
   const binaryAmount = new _util.BN(amount);
   let bondTx;
   let nominateTx;
+  const _params = chainApi.api.tx.staking.bond.toJSON();
+  const paramsCount = _params.args.length;
   const validatorParamList = targetValidators.map(validator => {
     return validator.address;
   });
   if (!nominatorMetadata) {
-    bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   }
   if (!nominatorMetadata.isBondedBefore) {
     // first time
-    bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   } else {

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

@@ -218,13 +218,7 @@ function getStakingAvailableActionsByNominator(nominatorMetadata, unclaimedRewar
   }
   if (nominatorMetadata.unstakings.length > 0) {
     result.push(StakingAction.CANCEL_UNSTAKE);
-    let hasClaimable = false;
-    for (const unstaking of nominatorMetadata.unstakings) {
-      if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
-        hasClaimable = true;
-        break;
-      }
-    }
+    const hasClaimable = nominatorMetadata.unstakings.some(unstaking => unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE);
     if (hasClaimable) {
       result.push(StakingAction.WITHDRAW);
     }

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'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/cjs/koni/background/cron.js

@@ -72,7 +72,6 @@ class KoniCron {
       const serviceInfo = this.state.getServiceInfo();
       const commonReload = eventTypes.some(eventType => commonReloadEvents.includes(eventType));
       const chainUpdated = eventTypes.includes('chain.updateState');
-      const stakingSubmitted = eventTypes.includes('transaction.submitStaking');
       const reloadMantaPay = eventTypes.includes('mantaPay.submitTransaction') || eventTypes.includes('mantaPay.enable');
       const updatedChains = [];
       if (chainUpdated) {
@@ -83,7 +82,7 @@ class KoniCron {
           }
         });
       }
-      if (!commonReload && !chainUpdated && !stakingSubmitted && !reloadMantaPay) {
+      if (!commonReload && !chainUpdated && !reloadMantaPay) {
         return;
       }
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
@@ -92,7 +91,6 @@ class KoniCron {
       }
       const chainInfoMap = serviceInfo.chainInfoMap;
       const needUpdateNft = this.needUpdateNft(chainInfoMap, updatedChains);
-      const needUpdateStaking = this.needUpdateStaking(chainInfoMap, updatedChains);
 
       // MantaPay
       reloadMantaPay && this.removeCron('syncMantaPay');
@@ -101,19 +99,10 @@ class KoniCron {
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
 
-      // Staking
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.resetStakingReward();
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshPoolingStakingReward');
-      needUpdateStaking && this.removeCron('updateChainStakingMetadata');
-
       // Chains
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron job if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-        needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
       } else {
         this.setStakingRewardReady();
@@ -128,7 +117,6 @@ class KoniCron {
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-      this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();
@@ -166,9 +154,6 @@ class KoniCron {
   resetNft = newAddress => {
     this.state.resetNft(newAddress);
   };
-  resetStakingReward = () => {
-    this.state.resetStakingReward();
-  };
   refreshStakingReward = address => {
     return () => {
       this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
@@ -185,16 +170,6 @@ class KoniCron {
   checkNetworkAvailable = serviceInfo => {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };
-  updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
-    return () => {
-      this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
-    };
-  };
-  updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
-    return () => {
-      this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
-    };
-  };
   async reloadNft() {
     const address = this.state.keyringService.currentAccount.address;
     const serviceInfo = this.state.getServiceInfo();
@@ -206,11 +181,7 @@ class KoniCron {
   }
   async reloadStaking() {
     const address = this.state.keyringService.currentAccount.address;
-    this.resetStakingReward();
-    this.removeCron('refreshStakingReward');
-    this.removeCron('refreshPoolingStakingReward');
-    this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
-    this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+    console.log('reload staking', address);
     await (0, _utils2.waitTimeout)(1800);
     return true;
   }
@@ -223,11 +194,5 @@ class KoniCron {
     }
     return false;
   }
-  needUpdateStaking(chainInfoMap, updatedChains) {
-    if (updatedChains && updatedChains.length > 0) {
-      return updatedChains.some(updatedChain => (0, _utils._isChainSupportSubstrateStaking)(chainInfoMap[updatedChain]));
-    }
-    return false;
-  }
 }
 exports.KoniCron = KoniCron;