@subwallet/extension-base 1.0.13-1 → 1.1.1-dev.0

package/bundle-polkadot-extension-base.js

@@ -0,0 +1,20 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.polkadotExtensionBase = {}));
+})(this, (function (exports) { 'use strict';
+
+  const global = window;
+
+  const packageInfo = {
+    name: '@subwallet/extension-base',
+    path: (({ url: (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-base.js', document.baseURI).href)) }) && (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-base.js', document.baseURI).href))) ? new URL((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-base.js', document.baseURI).href))).pathname.substring(0, new URL((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-base.js', document.baseURI).href))).pathname.lastIndexOf('/') + 1) : 'auto',
+    type: 'esm',
+    version: '1.1.1'
+  };
+
+  exports.packageInfo = packageInfo;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));

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

@@ -10,8 +10,8 @@ exports.getAstarDappsInfo = getAstarDappsInfo;
 exports.getAstarNominatorMetadata = getAstarNominatorMetadata;
 exports.getAstarStakingMetadata = getAstarStakingMetadata;
 exports.getAstarUnbondingExtrinsic = getAstarUnbondingExtrinsic;
-exports.getAstarWithdrawable = getAstarWithdrawable;
 exports.getAstarWithdrawalExtrinsic = getAstarWithdrawalExtrinsic;
+exports.getCompoundWithdrawable = getCompoundWithdrawable;
 exports.subscribeAstarNominatorMetadata = subscribeAstarNominatorMetadata;
 exports.subscribeAstarStakingMetadata = subscribeAstarStakingMetadata;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -367,7 +367,7 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
   }
   return apiPromise.api.tx.utility.batch(transactions);
 }
-function getAstarWithdrawable(nominatorMetadata) {
+function getCompoundWithdrawable(nominatorMetadata) {
   const unstakingInfo = {
     chain: nominatorMetadata.chain,
     status: _KoniTypes.UnstakingStatus.CLAIMABLE,

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

@@ -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

@@ -247,8 +247,8 @@ 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);
+  if (_constants._STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain) || _constants._STAKING_CHAIN_GROUP.relay.includes(nominatorMetadata.chain)) {
+    return (0, _astar.getCompoundWithdrawable)(nominatorMetadata);
   }
   for (const unstaking of unstakings) {
     if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {

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;

package/cjs/koni/background/handlers/State.js

@@ -1564,7 +1564,8 @@ class KoniState {
     return await this.cron.reloadNft();
   }
   async reloadStaking() {
-    return await this.cron.reloadStaking();
+    await this.subscription.reloadStaking();
+    return true;
   }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {

package/cjs/koni/background/subscription.js

@@ -1,24 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KoniSubscription = void 0;
-var _constants = require("@subwallet/extension-base/constants");
 var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _staking = require("@subwallet/extension-base/koni/api/staking");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
-var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
-var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/services/event-service/types");
-var _axios = _interopRequireDefault(require("axios"));
+var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
-var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -250,86 +245,11 @@ class KoniSubscription {
     };
     await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), (0, _paraChain.getAmplitudeUnclaimedStakingReward)(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
-  async fetchingStakingFromApi() {
-    try {
-      const response = await _axios.default.get('https://staking-data.subwallet.app/api/staking/get');
-      if (response.status === 200) {
-        return response.data;
-      }
-    } catch (e) {
-      this.logger.error(e);
-    }
-    return {};
-  }
-  async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
-    const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      const chainState = chainStateMap[chainInfo.slug];
-      if (chainState !== null && chainState !== void 0 && chainState.active && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    if (Object.values(filteredChainInfoMap).length === 0) {
-      return;
-    }
-    const timeout = new Promise(resolve => {
-      const id = setTimeout(() => {
-        clearTimeout(id);
-        resolve(null);
-      }, 3000);
-    });
-
-    // Fetch data from helper API
-    const _dataFromApi = await Promise.race([this.fetchingStakingFromApi(), timeout]);
-    const dataFromApi = _dataFromApi;
-    await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-      // Use fetch API data if available
-      if (dataFromApi && dataFromApi[chainInfo.slug]) {
-        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug], {
-          expectedReturn: dataFromApi[chainInfo.slug].expectedReturn,
-          inflation: dataFromApi[chainInfo.slug].inflation,
-          nominatorCount: dataFromApi[chainInfo.slug].nominatorCount
-        });
-      } else {
-        const chainStakingMetadata = await (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata, {
-          expectedReturn: chainStakingMetadata.expectedReturn,
-          inflation: chainStakingMetadata.inflation,
-          nominatorCount: chainStakingMetadata.nominatorCount
-        });
-      }
-    }));
-  }
-  async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
-    const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      const chainState = chainStateMap[chainInfo.slug];
-      if (chainState !== null && chainState !== void 0 && chainState.active && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    let addresses = [currentAddress];
-    if (currentAddress === _constants.ALL_ACCOUNT_KEY) {
-      addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
-    }
-    await Promise.all(addresses.map(async address => {
-      const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(address);
-      await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-        if (isEvmAddress && !(0, _utils._isChainEvmCompatible)(chainInfo)) {
-          return;
-        }
-        if ((0, _utils._isSubstrateRelayChain)(chainInfo) && _constants2._STAKING_CHAIN_GROUP.nominationPool.includes(chainInfo.slug)) {
-          const poolMemberMetadata = await (0, _relayChain.getRelayChainPoolMemberMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
-          if (poolMemberMetadata) {
-            this.state.updateStakingNominatorMetadata(poolMemberMetadata);
-          }
-        }
-        const nominatorMetadata = await (0, _bonding.getNominatorMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
-        if (nominatorMetadata) {
-          this.state.updateStakingNominatorMetadata(nominatorMetadata);
-        }
-      }));
-    }));
+  async reloadStaking() {
+    var _this$state$keyringSe2;
+    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
+    this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
+    await (0, _utils2.waitTimeout)(1800);
   }
 }
 exports.KoniSubscription = KoniSubscription;

package/cjs/packageInfo.js

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

package/cjs/services/chain-service/helper/erc20_abi.json

@@ -0,0 +1,224 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "who",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [
+      {
+        "internalType": "uint8",
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]