@subwallet/extension-base 1.1.17-0 → 1.1.18-0

package/cjs/packageInfo.js

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

package/cjs/services/campaign-service/helpers.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runCampaign = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _i18next = require("i18next");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const runCampaign = (notificationService, campaign) => {
+  const {
+    action,
+    message,
+    metadata,
+    title
+  } = campaign.data;
+  const {
+    buttons
+  } = campaign;
+  const onClick = (action, metadata) => {
+    return () => {
+      switch (action) {
+        case 'open_url':
+          {
+            if (metadata) {
+              const url = metadata.url;
+              if (url) {
+                window.open(url);
+              }
+            }
+            break;
+          }
+        default:
+          break;
+      }
+    };
+  };
+  const onButtonClick = btnIndex => {
+    const {
+      metadata,
+      type
+    } = buttons[btnIndex];
+    onClick(type, metadata)();
+  };
+  notificationService.notify({
+    type: _KoniTypes.NotificationType.SUCCESS,
+    title: (0, _i18next.t)(title),
+    message: (0, _i18next.t)(message),
+    action: {
+      buttonClick: onButtonClick,
+      click: onClick(action, metadata)
+    },
+    notifyViaBrowser: true,
+    buttons: buttons.map(button => ({
+      title: button.name
+    }))
+  });
+};
+exports.runCampaign = runCampaign;

package/cjs/services/campaign-service/index.js

@@ -0,0 +1,142 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _constants = require("@subwallet/extension-base/constants");
+var _utils = require("@subwallet/extension-base/utils");
+var _axios = _interopRequireDefault(require("axios"));
+var _helpers = require("./helpers");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class CampaignService {
+  #state;
+  constructor(state) {
+    this.#state = state;
+    this.fetchCampaign().catch(e => {
+      console.error('Error on fetch campaigns', e);
+    });
+    this.runCampaign().catch(e => {
+      console.error('Error on run campaigns', e);
+    });
+  }
+  async fetchCampaign() {
+    const response = await _axios.default.request({
+      method: 'GET',
+      url: _constants.MARKETING_CAMPAIGN_URL
+    });
+    const respData = response.data;
+    const campaigns = [];
+    for (const data of respData) {
+      // eslint-disable-next-line camelcase
+      const {
+        condition,
+        end_time,
+        id: campaignId,
+        start_time
+      } = data;
+      const endTime = new Date(end_time).getTime();
+      const startTime = new Date(start_time).getTime();
+      for (const banner of data.banners) {
+        const {
+          buttons,
+          id,
+          ...baseData
+        } = banner;
+        const slug = `${campaignId}-banner-${id}`;
+        if (banner.environments.includes(_utils.TARGET_ENV)) {
+          campaigns.push({
+            slug,
+            endTime,
+            startTime,
+            isDone: false,
+            campaignId,
+            type: _KoniTypes.CampaignDataType.BANNER,
+            buttons,
+            data: baseData,
+            condition
+          });
+        }
+      }
+      for (const notification of data.notifications) {
+        const {
+          buttons,
+          id,
+          ...baseData
+        } = notification;
+        const slug = `${campaignId}-notification-${id}`;
+        campaigns.push({
+          slug,
+          endTime,
+          startTime,
+          isDone: false,
+          campaignId,
+          type: _KoniTypes.CampaignDataType.NOTIFICATION,
+          buttons,
+          data: baseData,
+          condition
+        });
+      }
+    }
+    for (const campaign of campaigns) {
+      const exists = await this.#state.dbService.getCampaign(campaign.slug);
+      if (!exists) {
+        await this.#state.dbService.upsertCampaign(campaign);
+      }
+    }
+    this.#state.eventService.emit('campaign.ready', true);
+  }
+  async runCampaign() {
+    await this.#state.eventService.waitCampaignReady;
+    const campaigns = (await this.getProcessingCampaign()).filter(data => data.type === _KoniTypes.CampaignDataType.NOTIFICATION);
+    campaigns.forEach(campaign => {
+      const {
+        isDone,
+        slug,
+        type
+      } = campaign;
+      if (isDone) {
+        return;
+      }
+      const onComplete = () => {
+        this.completeCampaignNotification(slug).catch(e => {
+          console.error('Error when complete campaign', slug, e);
+        });
+      };
+      try {
+        switch (type) {
+          case _KoniTypes.CampaignDataType.NOTIFICATION:
+            {
+              (0, _helpers.runCampaign)(this.#state.notificationService, campaign);
+              onComplete();
+              break;
+            }
+          default:
+            throw new Error('Missing handle campaign');
+        }
+      } catch (e) {
+        console.error('Error on running campaigns', slug, e);
+      }
+    });
+  }
+  getProcessingCampaign() {
+    return this.#state.dbService.getProcessingCampaign();
+  }
+  subscribeProcessingCampaign() {
+    return this.#state.dbService.subscribeProcessingCampaign();
+  }
+  async completeCampaignNotification(slug) {
+    const campaign = await this.#state.dbService.getCampaign(slug);
+    if (campaign) {
+      await this.#state.dbService.upsertCampaign({
+        ...campaign,
+        isDone: true
+      });
+    }
+  }
+}
+exports.default = CampaignService;

package/cjs/services/campaign-service/types.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/services/event-service/index.js

@@ -27,6 +27,8 @@ class EventService extends _eventemitter.default {
     this.waitAccountReady = this.generateWaitPromise('account.ready');
     this.waitChainReady = this.generateWaitPromise('chain.ready');
     this.waitAssetReady = this.generateWaitPromise('asset.ready');
+    this.waitMigrateReady = this.generateWaitPromise('migration.done');
+    this.waitCampaignReady = this.generateWaitPromise('campaign.ready');
   }
   generateWaitPromise(eventType) {
     return new Promise(resolve => {

package/cjs/services/migration-service/index.js

@@ -12,8 +12,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // SPDX-License-Identifier: Apache-2.0
 
 class MigrationService {
-  constructor(state) {
+  #eventService;
+  constructor(state, eventService) {
     this.state = state;
+    this.#eventService = eventService;
     this.logger = (0, _util.logger)('Migration');
   }
   async run() {
@@ -40,6 +42,7 @@ class MigrationService {
         this.logger.error('Migration error: ', _scripts.default[keys[i]].name, error);
       }
     }
+    this.#eventService.emit('migration.done', true);
   }
 }
 exports.default = MigrationService;

package/cjs/services/notification-service/NotificationService.js

@@ -25,26 +25,40 @@ class NotificationService {
     });
     this.notificationSubject.next(notifications);
     if (notification.notifyViaBrowser) {
-      var _notification$action;
-      NotificationService.createBrowserNotification(notification.title, notification.message, notification === null || notification === void 0 ? void 0 : (_notification$action = notification.action) === null || _notification$action === void 0 ? void 0 : _notification$action.url);
+      NotificationService.createBrowserNotification(notification.title, notification.message, notification.action, notification.buttons);
     }
   }
 
   // Create a new chrome notification with link
-  static createBrowserNotification(title, message, link) {
+  static createBrowserNotification(title, message, action, buttons) {
     var _chrome, _chrome$notifications;
+    const link = action === null || action === void 0 ? void 0 : action.url;
+    const onClick = action === null || action === void 0 ? void 0 : action.click;
+    const onButtonClick = action === null || action === void 0 ? void 0 : action.buttonClick;
     (_chrome = chrome) === null || _chrome === void 0 ? void 0 : (_chrome$notifications = _chrome.notifications) === null || _chrome$notifications === void 0 ? void 0 : _chrome$notifications.create({
       type: 'basic',
       title,
       message,
       iconUrl: './images/icon-128.png',
       priority: 2,
-      isClickable: !!link
+      isClickable: !!link || !!onClick,
+      buttons
     }, notificationId => {
-      if (link) {
+      if (link || onClick) {
         chrome.notifications.onClicked.addListener(nId => {
           if (nId === notificationId) {
-            window.open(link);
+            if (onClick) {
+              onClick();
+            } else {
+              window.open(link);
+            }
+          }
+        });
+      }
+      if (onButtonClick) {
+        chrome.notifications.onButtonClicked.addListener((nId, btnIndex) => {
+          if (nId === notificationId) {
+            onButtonClick(btnIndex);
           }
         });
       }

package/cjs/services/storage-service/DatabaseService.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _databases = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/databases"));
 var _dbStores = require("@subwallet/extension-base/services/storage-service/db-stores");
+var _Campaign = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/Campaign"));
 var _ChainStakingMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata"));
 var _MantaPay = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/MantaPay"));
 var _NominatorMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata"));
@@ -41,7 +42,8 @@ class DatabaseService {
       // staking
       chainStakingMetadata: new _ChainStakingMetadata.default(this._db.chainStakingMetadata),
       nominatorMetadata: new _NominatorMetadata.default(this._db.nominatorMetadata),
-      mantaPay: new _MantaPay.default(this._db.mantaPay)
+      mantaPay: new _MantaPay.default(this._db.mantaPay),
+      campaign: new _Campaign.default(this._db.campaign)
     };
   }
   async updatePriceStore(priceData) {
@@ -270,5 +272,20 @@ class DatabaseService {
   async getMantaPayFirstConfig(chain) {
     return this.stores.mantaPay.getFirstConfig(chain);
   }
+
+  /* Campaign */
+
+  subscribeProcessingCampaign() {
+    return this.stores.campaign.subscribeProcessingCampaign();
+  }
+  getProcessingCampaign() {
+    return this.stores.campaign.getProcessingCampaign();
+  }
+  getCampaign(slug) {
+    return this.stores.campaign.getCampaign(slug);
+  }
+  upsertCampaign(campaign) {
+    return this.stores.campaign.upsertCampaign(campaign);
+  }
 }
 exports.default = DatabaseService;

package/cjs/services/storage-service/databases/index.js

@@ -39,6 +39,9 @@ class KoniDatabase extends _dexie.default {
     this.conditionalVersion(3, {
       mantaPay: 'key, chain'
     });
+    this.conditionalVersion(4, {
+      campaign: 'slug'
+    });
   }
   conditionalVersion(version, schema, upgrade) {
     if (this.schemaVersion != null && this.schemaVersion < version) {

package/cjs/services/storage-service/db-stores/Campaign.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _BaseStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/BaseStore"));
+var _dexie = require("dexie");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const filterProcessing = campaign => {
+  const now = new Date().getTime();
+  const isExpired = now <= campaign.startTime || now >= campaign.endTime;
+  return !(campaign.isDone || isExpired);
+};
+class CampaignStore extends _BaseStore.default {
+  async getAll() {
+    return this.table.toArray();
+  }
+  async getCampaign(slug) {
+    return this.table.get(slug);
+  }
+  async getProcessingCampaign() {
+    return (await this.table.toArray()).filter(filterProcessing);
+  }
+  subscribeProcessingCampaign() {
+    return (0, _dexie.liveQuery)(() => this.table.filter(filterProcessing).toArray());
+  }
+  upsertCampaign(campaign) {
+    return this.table.put(campaign);
+  }
+}
+exports.default = CampaignStore;

package/constants/index.d.ts

@@ -20,5 +20,6 @@ export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
+export declare const MARKETING_CAMPAIGN_URL: string;
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -23,5 +23,6 @@ export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
+export const MARKETING_CAMPAIGN_URL = process.env.MARKETING_CAMPAIGN_URL || '';
 export * from "./staking.js";
 export * from "./storage.js";

package/koni/api/dotsama/crowdloan.d.ts

@@ -1,7 +1,8 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
-import { CrowdloanItem, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
+import { _ChainInfo, _CrowdloanFund } from '@subwallet/chain-list/types';
+import { CrowdloanItem } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { ApiPromise } from '@polkadot/api';
-export declare const subscribeAcalaContributeInterval: (polkadotAddresses: string[], paraState: CrowdloanParaState, callback: (rs: CrowdloanItem) => void) => () => void;
-export declare function getCrowdloanFundsStatus(api: ApiPromise): Promise<Record<string, CrowdloanParaState>>;
-export declare function subscribeCrowdloan(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, callback: (networkKey: string, rs: CrowdloanItem) => void, chainInfoMap: Record<string, _ChainInfo>): Promise<() => void>;
+export declare type CrowdloanFundInfo = _CrowdloanFund & {
+    chain: string;
+};
+export declare const subscribeAcalaContributeInterval: (polkadotAddresses: string[], fundInfo: _CrowdloanFund, callback: (rs: CrowdloanItem) => void) => () => void;
+export declare function subscribeCrowdloan(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, callback: (networkKey: string, rs: CrowdloanItem) => void, chainInfoMap: Record<string, _ChainInfo>): Promise<(() => void) | undefined>;

package/koni/api/dotsama/crowdloan.js

@@ -2,14 +2,34 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { _FundStatus } from '@subwallet/chain-list/types';
 import { APIItemState, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ACALA_REFRESH_CROWDLOAN_INTERVAL } from '@subwallet/extension-base/constants';
 import registry from '@subwallet/extension-base/koni/api/dotsama/typeRegistry';
-import { _getChainSubstrateAddressPrefix, _getSubstrateParaId, _getSubstrateRelayParent, _isChainEvmCompatible, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, reformatAddress } from '@subwallet/extension-base/utils';
 import axios from 'axios';
 import { BN } from '@polkadot/util';
-function getRPCCrowdloan(parentAPI, paraId, hexAddresses, paraState, callback) {
+const STATUS_MAP = {
+  [_FundStatus.IN_AUCTION]: CrowdloanParaState.ONGOING,
+  [_FundStatus.WITHDRAW]: CrowdloanParaState.FAILED,
+  [_FundStatus.FAILED]: CrowdloanParaState.FAILED,
+  [_FundStatus.WON]: CrowdloanParaState.COMPLETED
+};
+const getOnlineFundList = (async () => {
+  const request = await axios.get('https://static-data.subwallet.app/crowdloan-funds/list.json');
+  return request.data;
+})();
+function getRPCCrowdloan(parentAPI, fundInfo, hexAddresses, callback) {
+  const {
+    auctionIndex,
+    endTime,
+    firstPeriod,
+    fundId,
+    lastPeriod,
+    paraId,
+    startTime,
+    status
+  } = fundInfo;
   const unsubPromise = parentAPI.api.derive.crowdloan.ownContributions(paraId, hexAddresses, result => {
     let contribute = new BN(0);
     Object.values(result).forEach(item => {
@@ -17,8 +37,16 @@ function getRPCCrowdloan(parentAPI, paraId, hexAddresses, paraState, callback) {
     });
     const rs = {
       state: APIItemState.READY,
-      paraState,
-      contribute: contribute.toString()
+      paraState: STATUS_MAP[fundInfo.status],
+      contribute: contribute.toString(),
+      fundId,
+      paraId,
+      status,
+      startTime,
+      endTime,
+      auctionIndex,
+      firstPeriod,
+      lastPeriod
     };
     callback(rs);
   });
@@ -28,7 +56,18 @@ function getRPCCrowdloan(parentAPI, paraId, hexAddresses, paraState, callback) {
     }).catch(console.error);
   };
 }
-export const subscribeAcalaContributeInterval = (polkadotAddresses, paraState, callback) => {
+export const subscribeAcalaContributeInterval = (polkadotAddresses, fundInfo, callback) => {
+  const {
+    auctionIndex,
+    endTime,
+    firstPeriod,
+    fundId,
+    lastPeriod,
+    paraId,
+    startTime,
+    status
+  } = fundInfo;
+  const paraState = STATUS_MAP[fundInfo.status];
   const acalaContributionApi = 'https://api.polkawallet.io/acala-distribution-v2/crowdloan?account=';
   const getContributeInfo = () => {
     Promise.all(polkadotAddresses.map(polkadotAddress => {
@@ -37,14 +76,21 @@ export const subscribeAcalaContributeInterval = (polkadotAddresses, paraState, c
       let contribute = new BN(0);
       resList.forEach(res => {
         var _res$data$data, _res$data$data$acala, _res$data$data$acala$;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         contribute = contribute.add(new BN(((_res$data$data = res.data.data) === null || _res$data$data === void 0 ? void 0 : (_res$data$data$acala = _res$data$data.acala) === null || _res$data$data$acala === void 0 ? void 0 : (_res$data$data$acala$ = _res$data$data$acala[0]) === null || _res$data$data$acala$ === void 0 ? void 0 : _res$data$data$acala$.totalDOTLocked) || '0'));
       });
       const rs = {
         state: APIItemState.READY,
         paraState,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
-        contribute: contribute.toString()
+        contribute: contribute.toString(),
+        fundId,
+        paraId,
+        status,
+        startTime,
+        endTime,
+        auctionIndex,
+        firstPeriod,
+        lastPeriod
       };
       callback(rs);
     }).catch(console.error);
@@ -55,64 +101,70 @@ export const subscribeAcalaContributeInterval = (polkadotAddresses, paraState, c
     clearInterval(interval);
   };
 };
-export async function getCrowdloanFundsStatus(api) {
-  const leases = await api.query.slots.leases.keys();
-  const leasesParaIds = leases.map(({
-    args: [paraId]
-  }) => paraId.toString());
-  const rs = await api.query.crowdloan.funds.entries();
-  const newRaise = await api.query.crowdloan.newRaise();
-  const newRaiseParaIds = newRaise.toJSON().map(p => p.toString());
-  return rs.reduce((stateMap, [{
-    args: [paraId]
-  }, fundData]) => {
-    const paraStr = paraId.toString();
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    // const item = fundData.unwrap() as PolkadotRuntimeCommonCrowdloanFundInfo;
+// export async function getCrowdloanFundsStatus (api: ApiPromise) {
+//   const leases = await api.query.slots.leases.keys<ParaId[]>();
+//   const leasesParaIds = leases.map(({ args: [paraId] }) => paraId.toString());
 
-    if (leasesParaIds.indexOf(paraStr) > -1) {
-      stateMap[paraStr] = CrowdloanParaState.COMPLETED;
-    }
-    if (newRaiseParaIds.indexOf(paraStr) > -1) {
-      stateMap[paraStr] = CrowdloanParaState.ONGOING;
-    }
-    return stateMap;
-  }, {});
-}
+//   const rs = await api.query.crowdloan.funds.entries<Option<any>, ParaId[]>();
+//   const newRaise = await api.query.crowdloan.newRaise<Vec<u32>>();
+
+//   const newRaiseParaIds = (newRaise.toJSON() as number[]).map((p) => p.toString());
+
+//   return rs.reduce((stateMap, [{ args: [paraId] }, fundData]) => {
+//     const paraStr = paraId.toString();
+//     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+//     // const item = fundData.unwrap() as PolkadotRuntimeCommonCrowdloanFundInfo;
+//     if (leasesParaIds.indexOf(paraStr) > -1) {
+//       stateMap[paraStr] = CrowdloanParaState.COMPLETED;
+//     }
+//     if (newRaiseParaIds.indexOf(paraStr) > -1) {
+//       stateMap[paraStr] = CrowdloanParaState.ONGOING;
+//     }
+//     return stateMap;
+//   }, {} as Record<string, CrowdloanParaState>);
+// }
 
 // Get All crowdloan
 export async function subscribeCrowdloan(addresses, substrateApiMap, callback, chainInfoMap) {
   const unsubMap = {};
+  const latestMap = {};
+  const rawFundList = await getOnlineFundList;
+  rawFundList.forEach(fundInfo => {
+    const chainSlug = fundInfo.chain;
+    if (!latestMap[chainSlug] || fundInfo.auctionIndex > latestMap[chainSlug].auctionIndex) {
+      latestMap[chainSlug] = fundInfo;
+    }
+  });
   if (Object.keys(substrateApiMap).includes(COMMON_CHAIN_SLUGS.KUSAMA) && Object.keys(substrateApiMap).includes(COMMON_CHAIN_SLUGS.POLKADOT)) {
+    const now = Date.now();
     const polkadotAPI = await substrateApiMap[COMMON_CHAIN_SLUGS.POLKADOT].isReady;
-    const polkadotFundsStatusMap = await getCrowdloanFundsStatus(polkadotAPI.api);
     const kusamaAPI = await substrateApiMap[COMMON_CHAIN_SLUGS.KUSAMA].isReady;
-    const kusamaFundsStatusMap = await getCrowdloanFundsStatus(kusamaAPI.api);
-
-    // TODO: find all crowdloan valid networks: parachains, in-crowdloan, crowdloan but failed
-
     const substrateAddresses = categoryAddresses(addresses)[0];
     const hexAddresses = substrateAddresses.map(address => {
       return registry.createType('AccountId', address).toHex();
     });
-    Object.entries(chainInfoMap).forEach(([networkKey, chainInfo]) => {
-      if (_isSubstrateParaChain(chainInfo)) {
-        const parentChain = _getSubstrateRelayParent(chainInfo);
+    if (addresses.length === 0) {
+      return;
+    }
+    Object.values(latestMap).forEach(fundInfo => {
+      var _chainInfoMap$chainSl;
+      const chainSlug = fundInfo.chain;
+      const endTime = new Date(fundInfo.endTime).getTime();
+      const parentChain = fundInfo.relayChain;
+      const substrateInfo = (_chainInfoMap$chainSl = chainInfoMap[chainSlug]) === null || _chainInfoMap$chainSl === void 0 ? void 0 : _chainInfoMap$chainSl.substrateInfo;
+      if (chainSlug && parentChain && STATUS_MAP[fundInfo.status] && fundInfo.paraId && endTime > now && substrateInfo) {
         const crowdloanCb = rs => {
-          callback(networkKey, rs);
+          callback(chainSlug, rs);
         };
-        const paraId = _getSubstrateParaId(chainInfo);
-        if (paraId <= -1 || addresses.length === 0 || parentChain.length === 0) {
-          return;
-        }
-        if (networkKey === COMMON_CHAIN_SLUGS.ACALA) {
-          const acalaAddresses = substrateAddresses.map(address => reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo), _isChainEvmCompatible(chainInfo)));
-          unsubMap.acala = subscribeAcalaContributeInterval(acalaAddresses, CrowdloanParaState.COMPLETED, crowdloanCb);
-        } else if (parentChain === COMMON_CHAIN_SLUGS.POLKADOT && polkadotFundsStatusMap[paraId]) {
-          unsubMap[networkKey] = getRPCCrowdloan(polkadotAPI, paraId, hexAddresses, polkadotFundsStatusMap[paraId], crowdloanCb);
-        } else if (parentChain === COMMON_CHAIN_SLUGS.KUSAMA && kusamaFundsStatusMap[paraId]) {
-          unsubMap[networkKey] = getRPCCrowdloan(kusamaAPI, paraId, hexAddresses, kusamaFundsStatusMap[paraId], crowdloanCb);
+        fundInfo.paraId = substrateInfo.crowdloanParaId || substrateInfo.paraId || fundInfo.paraId;
+        if (chainSlug === COMMON_CHAIN_SLUGS.ACALA) {
+          const acalaAddresses = substrateAddresses.map(address => reformatAddress(address, 10, false));
+          unsubMap.acala = subscribeAcalaContributeInterval(acalaAddresses, fundInfo, crowdloanCb);
+        } else if (parentChain === COMMON_CHAIN_SLUGS.POLKADOT) {
+          unsubMap[chainSlug] = getRPCCrowdloan(polkadotAPI, fundInfo, hexAddresses, crowdloanCb);
+        } else if (parentChain === COMMON_CHAIN_SLUGS.KUSAMA) {
+          unsubMap[chainSlug] = getRPCCrowdloan(kusamaAPI, fundInfo, hexAddresses, crowdloanCb);
         }
       }
     });

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

@@ -213,5 +213,7 @@ export default class KoniExtension {
     private resolveAddressByDomain;
     private addInjects;
     private removeInjects;
+    private subscribeProcessingBanner;
+    private completeCampaignBanner;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }