@subwallet/extension-base 1.0.4-0 → 1.0.5-1

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

@@ -10,6 +10,7 @@ exports.getAstarDappsInfo = getAstarDappsInfo;
 exports.getAstarNominatorMetadata = getAstarNominatorMetadata;
 exports.getAstarStakingMetadata = getAstarStakingMetadata;
 exports.getAstarUnbondingExtrinsic = getAstarUnbondingExtrinsic;
+exports.getAstarWithdrawable = getAstarWithdrawable;
 exports.getAstarWithdrawalExtrinsic = getAstarWithdrawalExtrinsic;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
@@ -109,20 +110,28 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
 
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
-    const nearestUnstaking = unlockingChunks[0]; // only handle 1 unstaking request at a time, might need to change
-
-    const isClaimable = nearestUnstaking.unlockEra - parseInt(currentEra) <= 0;
-    const remainingEra = nearestUnstaking.unlockEra - (parseInt(currentEra) + 1);
-    const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
-    unstakingList.push({
-      chain,
-      status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstaking.amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
-    });
+    for (const unlockingChunk of unlockingChunks) {
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
+      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
+      unstakingList.push({
+        chain,
+        status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
+        claimable: unlockingChunk.amount.toString(),
+        waitingTime: waitingTime > 0 ? waitingTime : 0
+      });
+    }
   }
   if (nominationList.length === 0 && unstakingList.length === 0) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.NOMINATED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {
@@ -252,6 +261,21 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
       transactions.push(tx);
     }
   }
-  console.log('no of astar claim reward tx: ', transactions.length);
   return apiPromise.api.tx.utility.batch(transactions);
+}
+function getAstarWithdrawable(nominatorMetadata) {
+  const unstakingInfo = {
+    chain: nominatorMetadata.chain,
+    status: _KoniTypes.UnstakingStatus.CLAIMABLE,
+    claimable: '0',
+    waitingTime: 0
+  };
+  let bnWithdrawable = _util.BN_ZERO;
+  for (const unstaking of nominatorMetadata.unstakings) {
+    if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
+      bnWithdrawable = bnWithdrawable.add(new _util.BN(unstaking.claimable));
+    }
+  }
+  unstakingInfo.claimable = bnWithdrawable.toString();
+  return unstakingInfo;
 }

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

@@ -58,7 +58,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new _util.BN(selectedCollator.minBond || '0');
   const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === _KoniTypes.StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -146,7 +146,15 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   const _delegatorState = await chainApi.api.query.parachainStaking.delegatorState(address);
   const delegatorState = _delegatorState.toPrimitive();
   if (!delegatorState) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.NOMINATED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let bnTotalActiveStake = _util.BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {

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

@@ -55,7 +55,7 @@ function validatePoolBondingCondition(chainInfo, amount, selectedPool, address,
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new _util.BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (!bnCurrentActiveStake.gt(_util.BN_ZERO)) {
+    if (nominatorMetadata.unstakings.length > 0) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
     }
   }
@@ -68,7 +68,7 @@ function validateRelayBondingCondition(chainInfo, amount, selectedValidators, ad
   const errors = [];
   let bnTotalStake = new _util.BN(amount);
   const bnMinStake = new _util.BN(chainStakingMetadata.minStake);
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === _KoniTypes.StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -166,7 +166,15 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   const currentEra = _currentEra.toString();
   const bonded = _bonded.toHuman();
   if (!ledger) {
-    return;
+    return {
+      chain,
+      type: _KoniTypes.StakingType.NOMINATED,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      address: address,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const activeStake = ledger.active.toString();
   const nominationList = [];
@@ -246,7 +254,16 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
   const currentEra = _currentEra.toString();
   if (!poolMemberInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.POOLED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      // can only join 1 pool at a time
+      unstakings: []
+    };
   }
   let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);

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

@@ -25,6 +25,7 @@ exports.parseIdentity = parseIdentity;
 exports.parsePoolStashAddress = parsePoolStashAddress;
 exports.transformPoolName = transformPoolName;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _astar = require("@subwallet/extension-base/koni/api/staking/bonding/astar");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
@@ -238,6 +239,9 @@ function isActionFromValidator(stakingType, chain) {
 function getWithdrawalInfo(nominatorMetadata) {
   const unstakings = nominatorMetadata.unstakings;
   let result;
+  if (_constants._STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain)) {
+    return (0, _astar.getAstarWithdrawable)(nominatorMetadata);
+  }
   for (const unstaking of unstakings) {
     if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
       result = unstaking; // only get the first withdrawal

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

@@ -164,7 +164,6 @@ async function getNominationPoolReward(addresses, chainInfoMap, substrateApiMap)
       }));
     }));
   } catch (e) {
-    console.error('Error fetching unclaimed reward for nomination pool', e);
     return rewardList;
   }
   return rewardList;

package/cjs/koni/api/staking/subsquidStaking.js

@@ -83,7 +83,6 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
     }));
     return result;
   } catch (e) {
-    console.error(`error getting ${chain} staking reward from subsquid`, e);
     return [];
   }
 };
@@ -101,7 +100,6 @@ const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
       rewardList = rewardList.concat(rewardItems);
     }));
   } catch (e) {
-    console.error('Error fetching staking reward from SubSquid', e);
     return rewardList;
   }
   return rewardList;

package/cjs/koni/api/tokens/wasm/index.js

@@ -31,7 +31,6 @@ async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
-    console.error('Error getting WASM NFT transfer extrinsic', e);
     return null;
   }
 }

package/cjs/koni/api/tokens/wasm/utils.js

@@ -16,7 +16,6 @@ const toContractAbiMessage = (contractPromise, message) => {
   if (!value) {
     const messages = contractPromise === null || contractPromise === void 0 ? void 0 : contractPromise.abi.messages.map(m => m.method).join(', ');
     const error = `"${message}" not found in metadata.spec.messages: [${messages}]`;
-    console.error(error);
     return {
       ok: false,
       error

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

@@ -32,7 +32,6 @@ const createXcmExtrinsic = async _ref => {
   } else {
     extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  console.log('XCM extrinsic: ', extrinsic.toHex());
   return extrinsic;
 };
 exports.createXcmExtrinsic = createXcmExtrinsic;

package/cjs/koni/background/cron.js

@@ -104,7 +104,6 @@ class KoniCron {
       if (!commonReload && !chainUpdated && !stakingSubmitted) {
         return;
       }
-      this.logger.log('ServiceInfo updated, Cron restarting...', eventTypes);
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
       if (!address) {
         return;
@@ -144,7 +143,6 @@ class KoniCron {
     if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
       return;
     }
-    this.logger.log('Starting cron jobs');
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
@@ -173,48 +171,12 @@ class KoniCron {
       this.serviceSubscription.unsubscribe();
       this.serviceSubscription = undefined;
     }
-    this.logger.log('Stopping cron jobs');
     this.removeAllCrons();
     this.status = 'stopped';
   };
   updateApiMapStatus = () => {
     this.state.chainService.updateApiMapStatus().catch(console.error);
-    // const apiMap = this.state.getApiMap();
-    // const networkMap = this.state.getChainStateMap();
-    //
-    // for (const [key, substrateApi] of Object.entries(apiMap.substrate)) {
-    //   let status: _ChainConnectionStatus = _ChainConnectionStatus.CONNECTING;
-    //
-    //   if (substrateApi.isApiConnected) {
-    //     status = _ChainConnectionStatus.CONNECTED;
-    //   }
-    //
-    //   if (!networkMap[key].connectionStatus) {
-    //     this.state.updateChainConnectionStatus(key, status);
-    //   } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== status) {
-    //     this.state.updateChainConnectionStatus(key, status);
-    //   }
-    // }
-    //
-    // for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-    //   evmApi.api.eth.net.isListening()
-    //     .then(() => {
-    //       if (!networkMap[key].connectionStatus) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTED) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-    //       }
-    //     })
-    //     .catch(() => {
-    //       if (!networkMap[key].connectionStatus) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTING) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-    //       }
-    //     });
-    // }
   };
-
   recoverApiMap = () => {
     var _this$subscriptions;
     const apiMap = this.state.getApiMap();
@@ -235,7 +197,6 @@ class KoniCron {
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {
-      console.debug('Refresh NFT state');
       this.subscriptions.subscribeNft(address, apiMap.substrate, apiMap.evm, smartContractNfts, chainInfoMap);
     };
   };
@@ -247,13 +208,11 @@ class KoniCron {
   };
   refreshStakingReward = address => {
     return () => {
-      console.debug('Refresh staking reward state');
       this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
     };
   };
   refreshStakingRewardFastInterval = address => {
     return () => {
-      console.debug('Refresh staking reward data with fast interval');
       this.subscriptions.subscribeStakingRewardFastInterval(address).catch(this.logger.error);
     };
   };
@@ -265,20 +224,17 @@ class KoniCron {
   };
   updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching chain staking metadata');
       this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
     };
   };
   updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching nominator data for', address);
       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();
-    console.debug('Hard refresh NFT for', address);
     this.resetNft(address);
     this.removeCron('refreshNft');
     this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
@@ -287,7 +243,6 @@ class KoniCron {
   }
   async reloadStaking() {
     const address = this.state.keyringService.currentAccount.address;
-    console.debug('Hard refresh staking meta for', address);
     this.resetStakingReward();
     this.removeCron('refreshStakingReward');
     this.removeCron('refreshPoolingStakingReward');