@subwallet/extension-base 1.2.23-0 → 1.2.24-1

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_MKT_CAMPAIGN_INTERVAL, CRON_REFRESH_NFT_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -54,10 +54,12 @@ export class KoniCron {
     await Promise.all([this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAccountInfo = this.state.keyringService.currentAccount;
     const commonReloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'asset.updateState'];
+    const mktCampaignReloadEvents = ['account.add', 'account.remove'];
     this.eventHandler = (events, eventTypes) => {
       var _serviceInfo$currentA;
       const serviceInfo = this.state.getServiceInfo();
       const commonReload = eventTypes.some(eventType => commonReloadEvents.includes(eventType));
+      const mktCampaignNeedReload = eventTypes.some(eventType => mktCampaignReloadEvents.includes(eventType));
       const chainUpdated = eventTypes.includes('chain.updateState');
       const reloadMantaPay = eventTypes.includes('mantaPay.submitTransaction') || eventTypes.includes('mantaPay.enable');
       const updatedChains = [];
@@ -87,6 +89,10 @@ export class KoniCron {
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
       commonReload && this.removeCron('refreshPoolingStakingReward');
+      if (mktCampaignNeedReload) {
+        this.removeCron('fetchMktCampaignData');
+        this.addCron('fetchMktCampaignData', this.fetchMktCampaignData, CRON_REFRESH_MKT_CAMPAIGN_INTERVAL);
+      }
       if (chainUpdated) {
         this.stopPoolInfo();
         this.removeCron('fetchPoolInfo');
@@ -102,6 +108,7 @@ export class KoniCron {
     };
     this.state.eventService.onLazy(this.eventHandler);
     this.addCron('fetchPoolInfo', this.fetchPoolInfo, CRON_REFRESH_CHAIN_STAKING_METADATA);
+    this.addCron('fetchMktCampaignData', this.fetchMktCampaignData, CRON_REFRESH_MKT_CAMPAIGN_INTERVAL);
     if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
       return;
     }
@@ -140,6 +147,9 @@ export class KoniCron {
   fetchPoolInfo = () => {
     this.state.earningService.runSubscribePoolsInfo().catch(console.error);
   };
+  fetchMktCampaignData = () => {
+    this.state.mktCampaignService.fetchMktCampaignData();
+  };
   stopPoolInfo = () => {
     this.state.earningService.runUnsubscribePoolsInfo();
   };

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

@@ -245,6 +245,9 @@ export default class KoniExtension {
     private completeCampaignBanner;
     private subscribeCampaignPopupVisibility;
     private toggleCampaignPopup;
+    private subscribeAppPopupData;
+    private subscribeAppBannerData;
+    private subscribeAppConfirmationData;
     private subscribeBuyTokens;
     private subscribeBuyServices;
     private subscribeSwapPairs;

package/koni/background/handlers/Extension.js

@@ -1938,7 +1938,7 @@ export default class KoniExtension {
     if (destinationTokenInfo) {
       const [bnMockFee, {
         value
-      }] = await Promise.all([getXcmMockTxFee(substrateApi, chainInfoMap, address, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
+      }] = await Promise.all([getXcmMockTxFee(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
         extrinsicType: ExtrinsicType.TRANSFER_XCM,
         address,
         networkKey: originTokenInfo.originChain,
@@ -2123,14 +2123,15 @@ export default class KoniExtension {
     genesisHash,
     hardwareType,
     isAllowed,
-    name
+    name,
+    originGenesisHash
   }) {
     const key = keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
       genesisHash,
       name,
-      originGenesisHash: genesisHash
+      originGenesisHash
     });
     const result = key.pair;
     const _address = result.address;
@@ -2164,7 +2165,8 @@ export default class KoniExtension {
         hardwareType,
         isEthereum,
         isGeneric,
-        name
+        name,
+        originGenesisHash
       } = account;
       let result;
       const baseMeta = {
@@ -2173,7 +2175,7 @@ export default class KoniExtension {
         accountIndex,
         addressOffset,
         genesisHash,
-        originGenesisHash: genesisHash,
+        originGenesisHash,
         isGeneric
       };
       if (isEthereum) {
@@ -3975,6 +3977,54 @@ export default class KoniExtension {
     this.#koniState.campaignService.toggleCampaignPopup(value);
     return null;
   }
+  subscribeAppPopupData(id, port) {
+    const cb = createSubscription(id, port);
+    let ready = false;
+    const callback = rs => {
+      if (ready) {
+        cb(rs);
+      }
+    };
+    const subscription = this.#koniState.mktCampaignService.subscribePopupsData(callback);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    ready = true;
+    return this.#koniState.mktCampaignService.getAppPopupsData();
+  }
+  subscribeAppBannerData(id, port) {
+    const cb = createSubscription(id, port);
+    let ready = false;
+    const callback = rs => {
+      if (ready) {
+        cb(rs);
+      }
+    };
+    const subscription = this.#koniState.mktCampaignService.subscribeBannersData(callback);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    ready = true;
+    return this.#koniState.mktCampaignService.getAppBannersData();
+  }
+  subscribeAppConfirmationData(id, port) {
+    const cb = createSubscription(id, port);
+    let ready = false;
+    const callback = rs => {
+      if (ready) {
+        cb(rs);
+      }
+    };
+    const subscription = this.#koniState.mktCampaignService.subscribeConfirmationsData(callback);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    ready = true;
+    return this.#koniState.mktCampaignService.getAppConfirmationsData();
+  }
 
   /* Campaign */
 
@@ -4601,6 +4651,12 @@ export default class KoniExtension {
         return this.subscribeCampaignPopupVisibility(id, port);
       case 'pri(campaign.popup.toggle)':
         return this.toggleCampaignPopup(request);
+      case 'pri(campaign.popups.subscribe)':
+        return this.subscribeAppPopupData(id, port);
+      case 'pri(campaign.banners.subscribe)':
+        return this.subscribeAppBannerData(id, port);
+      case 'pri(campaign.confirmations.subscribe)':
+        return this.subscribeAppConfirmationData(id, port);
 
       /* Campaign */
 

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

@@ -14,6 +14,7 @@ import { HistoryService } from '@subwallet/extension-base/services/history-servi
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import MigrationService from '@subwallet/extension-base/services/migration-service';
 import MintCampaignService from '@subwallet/extension-base/services/mint-campaign-service';
+import MktCampaignService from '@subwallet/extension-base/services/mkt-campaign-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
@@ -69,6 +70,7 @@ export default class KoniState {
     readonly walletConnectService: WalletConnectService;
     readonly mintCampaignService: MintCampaignService;
     readonly campaignService: CampaignService;
+    readonly mktCampaignService: MktCampaignService;
     readonly buyService: BuyService;
     readonly earningService: EarningService;
     readonly feeService: FeeService;
@@ -192,8 +194,8 @@ export default class KoniState {
     disableChain(chainSlug: string): Promise<boolean>;
     enableChain(chainSlug: string, enableTokens?: boolean): Promise<boolean>;
     resetDefaultChains(): boolean;
-    getSubstrateApiMap(): Record<string, import("../../../services/chain-service/handler/SubstrateApi").SubstrateApi>;
-    getSubstrateApi(networkKey: string): import("../../../services/chain-service/handler/SubstrateApi").SubstrateApi;
+    getSubstrateApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi>;
+    getSubstrateApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi;
     getEvmApiMap(): Record<string, import("../../../services/chain-service/handler/EvmApi").EvmApi>;
     getEvmApi(networkKey: string): import("../../../services/chain-service/handler/EvmApi").EvmApi;
     getApiMap(): ApiMap;

package/koni/background/handlers/State.js

@@ -21,6 +21,7 @@ import { HistoryService } from '@subwallet/extension-base/services/history-servi
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import MigrationService from '@subwallet/extension-base/services/migration-service';
 import MintCampaignService from '@subwallet/extension-base/services/mint-campaign-service';
+import MktCampaignService from '@subwallet/extension-base/services/mkt-campaign-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
@@ -103,6 +104,7 @@ export default class KoniState {
     this.walletConnectService = new WalletConnectService(this, this.requestService);
     this.migrationService = new MigrationService(this, this.eventService);
     this.campaignService = new CampaignService(this);
+    this.mktCampaignService = new MktCampaignService(this);
     this.buyService = new BuyService(this);
     this.transactionService = new TransactionService(this);
     this.earningService = new EarningService(this);
@@ -227,6 +229,7 @@ export default class KoniState {
     this.afterChainServiceInit();
     await this.migrationService.run();
     this.campaignService.init();
+    this.mktCampaignService.init();
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
     await this.earningService.init();

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.23-0",
+  "version": "1.2.24-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -144,6 +144,11 @@
       "require": "./cjs/core/logic-validation/transfer.js",
       "default": "./core/logic-validation/transfer.js"
     },
+    "./core/substrate/assets-pallet": {
+      "types": "./core/substrate/assets-pallet.d.ts",
+      "require": "./cjs/core/substrate/assets-pallet.js",
+      "default": "./core/substrate/assets-pallet.js"
+    },
     "./core/substrate/foreign-asset-pallet": {
       "types": "./core/substrate/foreign-asset-pallet.d.ts",
       "require": "./cjs/core/substrate/foreign-asset-pallet.js",
@@ -154,16 +159,36 @@
       "require": "./cjs/core/substrate/nominationpools-pallet.js",
       "default": "./core/substrate/nominationpools-pallet.js"
     },
+    "./core/substrate/ormlTokens-pallet": {
+      "types": "./core/substrate/ormlTokens-pallet.d.ts",
+      "require": "./cjs/core/substrate/ormlTokens-pallet.js",
+      "default": "./core/substrate/ormlTokens-pallet.js"
+    },
     "./core/substrate/system-pallet": {
       "types": "./core/substrate/system-pallet.d.ts",
       "require": "./cjs/core/substrate/system-pallet.js",
       "default": "./core/substrate/system-pallet.js"
     },
+    "./core/substrate/tokens-pallet": {
+      "types": "./core/substrate/tokens-pallet.d.ts",
+      "require": "./cjs/core/substrate/tokens-pallet.js",
+      "default": "./core/substrate/tokens-pallet.js"
+    },
+    "./core/substrate/types": {
+      "types": "./core/substrate/types.d.ts",
+      "require": "./cjs/core/substrate/types.js",
+      "default": "./core/substrate/types.js"
+    },
     "./core/substrate/xcm-parser": {
       "types": "./core/substrate/xcm-parser.d.ts",
       "require": "./cjs/core/substrate/xcm-parser.js",
       "default": "./core/substrate/xcm-parser.js"
     },
+    "./core/utils": {
+      "types": "./core/utils.d.ts",
+      "require": "./cjs/core/utils.js",
+      "default": "./core/utils.js"
+    },
     "./defaults": {
       "types": "./defaults.d.ts",
       "require": "./cjs/defaults.js",
@@ -1186,6 +1211,16 @@
       "require": "./cjs/services/mint-campaign-service/constants.js",
       "default": "./services/mint-campaign-service/constants.js"
     },
+    "./services/mkt-campaign-service": {
+      "types": "./services/mkt-campaign-service/index.d.ts",
+      "require": "./cjs/services/mkt-campaign-service/index.js",
+      "default": "./services/mkt-campaign-service/index.js"
+    },
+    "./services/mkt-campaign-service/types": {
+      "types": "./services/mkt-campaign-service/types.d.ts",
+      "require": "./cjs/services/mkt-campaign-service/types.js",
+      "default": "./services/mkt-campaign-service/types.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -2024,11 +2059,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.80",
-    "@subwallet/extension-base": "^1.2.23-0",
-    "@subwallet/extension-chains": "^1.2.23-0",
-    "@subwallet/extension-dapp": "^1.2.23-0",
-    "@subwallet/extension-inject": "^1.2.23-0",
+    "@subwallet/chain-list": "0.2.81",
+    "@subwallet/extension-base": "^1.2.24-1",
+    "@subwallet/extension-chains": "^1.2.24-1",
+    "@subwallet/extension-dapp": "^1.2.24-1",
+    "@subwallet/extension-inject": "^1.2.24-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

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.2.23-0'
+  version: '1.2.24-1'
 };

package/services/balance-service/helpers/subscribe/substrate/equilibrium.js

@@ -19,7 +19,7 @@ export const subscribeEquilibriumTokenBalance = async ({
   const tokenTypes = includeNativeToken ? [_AssetType.NATIVE, _AssetType.LOCAL] : [_AssetType.LOCAL];
   const tokenMap = filterAssetsByChainAndType(assetMap, chain, tokenTypes);
   try {
-    const unsub = await substrateApi.query.system.account.multi(addresses, balances => {
+    const unsub = await substrateApi.api.query.system.account.multi(addresses, balances => {
       // Equilibrium customizes the SystemAccount pallet
       Object.values(tokenMap).forEach(tokenInfo => {
         const assetId = _getTokenOnChainAssetId(tokenInfo);
@@ -81,7 +81,7 @@ export const subscribeEqBalanceAccountPallet = async ({
   const unsubList = Object.values(tokenMap).map(async tokenInfo => {
     try {
       const assetId = _getTokenOnChainAssetId(tokenInfo);
-      const unsub = await substrateApi.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
+      const unsub = await substrateApi.api.query.eqBalances.account.multi(addresses.map(address => [address, [assetId]]), balances => {
         const items = balances.map((balance, index) => {
           return {
             address: addresses[index],