@subwallet/extension-base 1.3.72-0 → 1.3.73-0

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

@@ -3397,8 +3397,6 @@ class KoniExtension {
       return await this.#koniState.reloadStaking();
     } else if (data === 'balance') {
       return await this.#koniState.reloadBalance();
-    } else if (data === 'crowdloan') {
-      return await this.#koniState.reloadCrowdloan();
     }
     return Promise.resolve(false);
   }

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

@@ -1824,10 +1824,6 @@ class KoniState {
     await this.balanceService.reloadBalance();
     return true;
   }
-  async reloadCrowdloan() {
-    await this.subscription.reloadCrowdloan();
-    return true;
-  }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
       this.settingService.getPassPhishingList(value => {

package/cjs/koni/background/subscription.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.KoniSubscription = void 0;
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _nft = require("@subwallet/extension-base/koni/api/nft");
-var _types = require("@subwallet/extension-base/services/event-service/types");
 var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -47,26 +46,7 @@ class KoniSubscription {
     }
   }
   async start() {
-    var _this$state$keyringSe;
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
-    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
-    if (currentAddress) {
-      this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
-    }
-    this.eventHandler = (events, eventTypes) => {
-      var _serviceInfo$currentA;
-      const serviceInfo = this.state.getServiceInfo();
-      const needReload = eventTypes.some(eventType => _types.COMMON_RELOAD_EVENTS.includes(eventType));
-      if (!needReload) {
-        return;
-      }
-      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.proxyId;
-      if (!address) {
-        return;
-      }
-      this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
-    };
-    this.state.eventService.onLazy(this.eventHandler.bind(this));
   }
   async stop() {
     if (this.eventHandler) {
@@ -117,8 +97,8 @@ class KoniSubscription {
     }).catch(this.logger.log);
   }
   async reloadCrowdloan() {
-    var _this$state$keyringSe2;
-    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.proxyId;
+    var _this$state$keyringSe;
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await (0, _utils.waitTimeout)(1800);
   }

package/cjs/packageInfo.js

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

package/cjs/services/earning-service/handlers/native-staking/para-chain.js

@@ -19,6 +19,17 @@ var _basePara = _interopRequireDefault(require("./base-para"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+async function queryDelegationScheduledRequestsFallback(api, delegator, collator) {
+  const query = api.query.parachainStaking.delegationScheduledRequests;
+  const key = await query.keys();
+  if (key[0].args.length === 1) {
+    return await query(collator);
+  } else if (key[0].args.length === 2) {
+    return await query(collator, delegator);
+  } else {
+    throw new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'More args than 2 and 1');
+  }
+}
 function calculateMantaNominatorReturn(decimal, commission, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, bnCollatorTotalStaked, isCountCommission) {
   const MIN_DELEGATION = new _bignumber.default(_constants2.MANTA_MIN_DELEGATION);
   const factor = new _bignumber.default(10).pow(decimal);
@@ -148,7 +159,10 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (0, _utils2.parseIdentity)(substrateIdentityApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([queryDelegationScheduledRequestsFallback(substrateApi.api, address,
+      // delegator
+      delegation.owner // collator
+      ), (0, _utils2.parseIdentity)(substrateIdentityApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
       const currentBlock = _currentBlock.toPrimitive();
       const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
@@ -160,7 +174,8 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
       // parse unstaking info
       if (delegationScheduledRequests) {
         for (const scheduledRequest of delegationScheduledRequests) {
-          if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
+          const requestDelegator = scheduledRequest.delegator ? scheduledRequest.delegator : address;
+          if ((0, _utils3.reformatAddress)(requestDelegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
             // add network prefix
             const isClaimable = scheduledRequest.whenExecutable - parseInt(currentRound) <= 0;
             const remainingEra = scheduledRequest.whenExecutable - parseInt(currentRound);

package/koni/background/handlers/Extension.js

@@ -3320,8 +3320,6 @@ export default class KoniExtension {
       return await this.#koniState.reloadStaking();
     } else if (data === 'balance') {
       return await this.#koniState.reloadBalance();
-    } else if (data === 'crowdloan') {
-      return await this.#koniState.reloadCrowdloan();
     }
     return Promise.resolve(false);
   }

package/koni/background/handlers/State.d.ts

@@ -267,7 +267,6 @@ export default class KoniState {
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
     reloadBalance(): Promise<boolean>;
-    reloadCrowdloan(): Promise<boolean>;
     approvePassPhishingPage(_url: string): Promise<boolean>;
     saveEnvConfig<T extends keyof EnvConfig>(key: T, value: EnvConfig[T]): void;
     initEnvConfig(envConfig: EnvConfig): void;

package/koni/background/handlers/State.js

@@ -1792,10 +1792,6 @@ export default class KoniState {
     await this.balanceService.reloadBalance();
     return true;
   }
-  async reloadCrowdloan() {
-    await this.subscription.reloadCrowdloan();
-    return true;
-  }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
       this.settingService.getPassPhishingList(value => {

package/koni/background/subscription.js

@@ -3,7 +3,6 @@
 
 import { subscribeCrowdloan } from '@subwallet/extension-base/koni/api/dotsama/crowdloan';
 import { NftHandler } from '@subwallet/extension-base/koni/api/nft';
-import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { logger as createLogger } from '@polkadot/util';
 const nftHandler = new NftHandler();
@@ -41,26 +40,7 @@ export class KoniSubscription {
     }
   }
   async start() {
-    var _this$state$keyringSe;
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
-    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
-    if (currentAddress) {
-      this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
-    }
-    this.eventHandler = (events, eventTypes) => {
-      var _serviceInfo$currentA;
-      const serviceInfo = this.state.getServiceInfo();
-      const needReload = eventTypes.some(eventType => COMMON_RELOAD_EVENTS.includes(eventType));
-      if (!needReload) {
-        return;
-      }
-      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.proxyId;
-      if (!address) {
-        return;
-      }
-      this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
-    };
-    this.state.eventService.onLazy(this.eventHandler.bind(this));
   }
   async stop() {
     if (this.eventHandler) {
@@ -106,8 +86,8 @@ export class KoniSubscription {
     nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).catch(this.logger.log);
   }
   async reloadCrowdloan() {
-    var _this$state$keyringSe2;
-    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.proxyId;
+    var _this$state$keyringSe;
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await waitTimeout(1800);
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.72-0",
+  "version": "1.3.73-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2972,12 +2972,12 @@
     "@snowbridge/registry": "^0.2.0",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet-monorepos/subwallet-services-sdk": "0.1.14",
+    "@subwallet-monorepos/subwallet-services-sdk": "0.1.16",
     "@subwallet/chain-list": "0.2.123",
-    "@subwallet/extension-base": "^1.3.72-0",
-    "@subwallet/extension-chains": "^1.3.72-0",
-    "@subwallet/extension-dapp": "^1.3.72-0",
-    "@subwallet/extension-inject": "^1.3.72-0",
+    "@subwallet/extension-base": "^1.3.73-0",
+    "@subwallet/extension-chains": "^1.3.73-0",
+    "@subwallet/extension-dapp": "^1.3.73-0",
+    "@subwallet/extension-inject": "^1.3.73-0",
     "@subwallet/keyring": "^0.1.14",
     "@subwallet/ui-keyring": "^0.1.14",
     "@ton/core": "^0.56.3",

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

package/services/earning-service/handlers/native-staking/para-chain.js

@@ -12,6 +12,17 @@ import { balanceFormatter, formatNumber, parseRawNumber, reformatAddress } from
 import BigN from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 import BaseParaNativeStakingPoolHandler from "./base-para.js";
+async function queryDelegationScheduledRequestsFallback(api, delegator, collator) {
+  const query = api.query.parachainStaking.delegationScheduledRequests;
+  const key = await query.keys();
+  if (key[0].args.length === 1) {
+    return await query(collator);
+  } else if (key[0].args.length === 2) {
+    return await query(collator, delegator);
+  } else {
+    throw new TransactionError(BasicTxErrorType.INVALID_PARAMS, 'More args than 2 and 1');
+  }
+}
 function calculateMantaNominatorReturn(decimal, commission, totalActiveCollators, bnAnnualInflation, blocksPreviousRound, bnCollatorExpectedBlocksPerRound, bnCollatorTotalStaked, isCountCommission) {
   const MIN_DELEGATION = new BigN(MANTA_MIN_DELEGATION);
   const factor = new BigN(10).pow(decimal);
@@ -141,7 +152,10 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     const roundInfo = _roundInfo.toPrimitive();
     const currentRound = roundInfo.current;
     await Promise.all(delegatorState.delegations.map(async delegation => {
-      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), parseIdentity(substrateIdentityApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
+      const [_delegationScheduledRequests, [identity], _collatorInfo, _currentBlock, _currentTimestamp] = await Promise.all([queryDelegationScheduledRequestsFallback(substrateApi.api, address,
+      // delegator
+      delegation.owner // collator
+      ), parseIdentity(substrateIdentityApi, delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner), substrateApi.api.query.system.number(), substrateApi.api.query.timestamp.now()]);
       const currentBlock = _currentBlock.toPrimitive();
       const currentTimestamp = _currentTimestamp.toPrimitive();
       const collatorInfo = _collatorInfo.toPrimitive();
@@ -153,7 +167,8 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
       // parse unstaking info
       if (delegationScheduledRequests) {
         for (const scheduledRequest of delegationScheduledRequests) {
-          if (reformatAddress(scheduledRequest.delegator, 0) === reformatAddress(address, 0)) {
+          const requestDelegator = scheduledRequest.delegator ? scheduledRequest.delegator : address;
+          if (reformatAddress(requestDelegator, 0) === reformatAddress(address, 0)) {
             // add network prefix
             const isClaimable = scheduledRequest.whenExecutable - parseInt(currentRound) <= 0;
             const remainingEra = scheduledRequest.whenExecutable - parseInt(currentRound);

package/types/yield/info/pallet.d.ts

@@ -54,7 +54,7 @@ export declare enum PalletParachainStakingRequestType {
     BOND_LESS = "bondLess"
 }
 export interface PalletParachainStakingDelegationRequestsScheduledRequest {
-    delegator: string;
+    delegator?: string;
     whenExecutable: number;
     action: Record<PalletParachainStakingRequestType, number>;
 }