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

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

@@ -19,6 +19,7 @@ import { KeyringService } from '@subwallet/extension-base/services/keyring-servi
 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 { MultisigService } from '@subwallet/extension-base/services/multisig-service';
 import NftService from '@subwallet/extension-base/services/nft-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import OpenGovService from '@subwallet/extension-base/services/open-gov';
@@ -84,6 +85,7 @@ export default class KoniState {
     readonly inappNotificationService: InappNotificationService;
     readonly chainOnlineService: ChainOnlineService;
     readonly openGovService: OpenGovService;
+    readonly multisigService: MultisigService;
     readonly substrateProxyAccountService: SubstrateProxyAccountService;
     private generalStatus;
     private waitSleeping;
@@ -267,7 +269,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

@@ -28,6 +28,7 @@ import { KeyringService } from '@subwallet/extension-base/services/keyring-servi
 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 { MultisigService } from '@subwallet/extension-base/services/multisig-service';
 import NftService from '@subwallet/extension-base/services/nft-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import OpenGovService from '@subwallet/extension-base/services/open-gov';
@@ -125,6 +126,7 @@ export default class KoniState {
     this.inappNotificationService = new InappNotificationService(this.dbService, this.keyringService, this.eventService, this.chainService);
     this.chainOnlineService = new ChainOnlineService(this.chainService, this.settingService, this.eventService, this.dbService);
     this.openGovService = new OpenGovService(this);
+    this.multisigService = new MultisigService(this.eventService, this.chainService, this.keyringService, this.inappNotificationService);
     this.substrateProxyAccountService = new SubstrateProxyAccountService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
@@ -230,6 +232,7 @@ export default class KoniState {
     await this.swapService.init();
     await this.inappNotificationService.init();
     await this.openGovService.init();
+    await this.multisigService.init();
 
     // this.onReady();
     this.onAccountAdd();
@@ -1663,7 +1666,7 @@ export default class KoniState {
     this.campaignService.stop();
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop(), this.inappNotificationService.stop(), this.openGovService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop(), this.inappNotificationService.stop(), this.openGovService.stop(), this.multisigService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1719,7 +1722,7 @@ export default class KoniState {
     this.generalStatus = ServiceStatus.STARTING_FULL;
     const startingFull = createPromiseHandler();
     this.waitStartingFull = startingFull.promise;
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start(), this.inappNotificationService.start(), this.openGovService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start(), this.inappNotificationService.start(), this.openGovService.start(), this.multisigService.start()]);
     this.eventService.emit('general.start_full', true);
     this.waitStartingFull = null;
     this.generalStatus = ServiceStatus.STARTED_FULL;
@@ -1792,10 +1795,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/handlers/Tabs.js

@@ -69,10 +69,11 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
   const injectedAccounts = Object.values(accounts).filter(({
     json: {
       meta: {
-        isHidden
+        isHidden,
+        isMultisig
       }
     }
-  }) => !isHidden).filter(authTypeFilter).filter(({
+  }) => !isHidden && !isMultisig).filter(authTypeFilter).filter(({
     json: {
       address
     }

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.74-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1386,6 +1386,11 @@
       "require": "./cjs/services/keyring-service/context/handlers/Modify.js",
       "default": "./services/keyring-service/context/handlers/Modify.js"
     },
+    "./services/keyring-service/context/handlers/Multisig": {
+      "types": "./services/keyring-service/context/handlers/Multisig.d.ts",
+      "require": "./cjs/services/keyring-service/context/handlers/Multisig.js",
+      "default": "./services/keyring-service/context/handlers/Multisig.js"
+    },
     "./services/keyring-service/context/handlers/Secret": {
       "types": "./services/keyring-service/context/handlers/Secret.d.ts",
       "require": "./cjs/services/keyring-service/context/handlers/Secret.js",
@@ -1721,6 +1726,16 @@
       "require": "./cjs/services/mkt-campaign-service/types.js",
       "default": "./services/mkt-campaign-service/types.js"
     },
+    "./services/multisig-service": {
+      "types": "./services/multisig-service/index.d.ts",
+      "require": "./cjs/services/multisig-service/index.js",
+      "default": "./services/multisig-service/index.js"
+    },
+    "./services/multisig-service/utils": {
+      "types": "./services/multisig-service/utils.d.ts",
+      "require": "./cjs/services/multisig-service/utils.js",
+      "default": "./services/multisig-service/utils.js"
+    },
     "./services/nft-service": {
       "types": "./services/nft-service/index.d.ts",
       "require": "./cjs/services/nft-service/index.js",
@@ -2521,6 +2536,11 @@
       "require": "./cjs/types/metadata.js",
       "default": "./types/metadata.js"
     },
+    "./types/multisig": {
+      "types": "./types/multisig/index.d.ts",
+      "require": "./cjs/types/multisig/index.js",
+      "default": "./types/multisig/index.js"
+    },
     "./types/notification": {
       "types": "./types/notification/index.d.ts",
       "require": "./cjs/types/notification/index.js",
@@ -2856,6 +2876,21 @@
       "require": "./cjs/utils/lazy.js",
       "default": "./utils/lazy.js"
     },
+    "./utils/logger": {
+      "types": "./utils/logger/index.d.ts",
+      "require": "./cjs/utils/logger/index.js",
+      "default": "./utils/logger/index.js"
+    },
+    "./utils/logger/Logger": {
+      "types": "./utils/logger/Logger.d.ts",
+      "require": "./cjs/utils/logger/Logger.js",
+      "default": "./utils/logger/Logger.js"
+    },
+    "./utils/logger/types": {
+      "types": "./utils/logger/types.d.ts",
+      "require": "./cjs/utils/logger/types.js",
+      "default": "./utils/logger/types.js"
+    },
     "./utils/metadata": {
       "types": "./utils/metadata.d.ts",
       "require": "./cjs/utils/metadata.js",
@@ -2972,12 +3007,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/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-monorepos/subwallet-services-sdk": "0.1.16",
+    "@subwallet/chain-list": "0.2.124-beta.1",
+    "@subwallet/extension-base": "^1.3.74-0",
+    "@subwallet/extension-chains": "^1.3.74-0",
+    "@subwallet/extension-dapp": "^1.3.74-0",
+    "@subwallet/extension-inject": "^1.3.74-0",
     "@subwallet/keyring": "^0.1.14",
     "@subwallet/ui-keyring": "^0.1.14",
     "@ton/core": "^0.56.3",
@@ -3006,6 +3041,7 @@
     "is-buffer": "^2.0.5",
     "joi": "^17.13.3",
     "json-rpc-engine": "^6.1.0",
+    "loglevel": "^1.9.2",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
     "protobufjs": "^7.5.4",

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.74-0'
 };

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

@@ -135,8 +135,6 @@ const subscribeWithSystemAccountPallet = async ({
       args: addresses
     });
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   const subscription = substrateApi.subscribeDataWithMulti(params, async rs => {
     const balances = rs[systemAccountKey];
     const poolMemberInfos = rs[poolMembersKey];

package/services/chain-service/handler/SubstrateApi.js

@@ -10,7 +10,7 @@ import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { goldbergRpc, goldbergTypes, spec as availSpec } from 'avail-js-sdk';
-import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs';
+import { BehaviorSubject, catchError, combineLatest, map, Observable, of } from 'rxjs';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { typesBundle as _typesBundle } from '@polkadot/apps-config/api';
 import { TypeRegistry } from '@polkadot/types/create';
@@ -350,7 +350,12 @@ export class SubstrateApi {
           subscriber.next([]);
         });
       } else {
-        observables[key] = apiRx[section][module][method].multi(args).pipe(map(codecs => codecs.map(codec => codec.toPrimitive())));
+        observables[key] = apiRx[section][module][method].multi(args).pipe(
+        // tap((codecs) => console.log('raw data', key, codecs)), // this line is used to debug data before transformation
+        map(codecs => codecs.map(codec => codec.toPrimitive())), catchError((error, caught) => {
+          console.error(`RxJS pipe() error for key ${key}`, error);
+          return of([]);
+        }));
       }
     });
     return combineLatest(observables).subscribe(callback);

package/services/chain-service/index.js

@@ -1422,6 +1422,7 @@ export class ChainService {
         hasNativeNft: false,
         supportStaking: params.chainSpec.paraId === null,
         supportProxy: false,
+        supportMultisig: false,
         supportSmartContract: null
       };
     } else if (params.chainSpec.evmChainId !== null) {

package/services/chain-service/types.d.ts

@@ -100,7 +100,7 @@ export interface _SubstrateAdapterSubscriptionArgs extends Omit<Required<_Substr
 }
 export interface _SubstrateApiAdapter {
     makeRpcQuery<T extends AnyJson | `0x${string}` | Registry | RuntimeVersion>(params: _SubstrateAdapterQueryArgs): Promise<T>;
-    subscribeDataWithMulti(params: _SubstrateAdapterSubscriptionArgs[], callback: (rs: Record<string, AnyJson[]>) => void): Subscription;
+    subscribeDataWithMulti(params: _SubstrateAdapterSubscriptionArgs[], callback: (rs: Record<string, AnyJson[]>) => void | Promise<void>): Subscription;
 }
 export interface _EvmApi extends _ChainBaseApi {
     api: Web3;

package/services/chain-service/utils/index.js

@@ -644,6 +644,10 @@ export const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) =>
     type: accountType
   } = accountInfo;
   if (accountChainType === AccountChainType.SUBSTRATE) {
+    var _chainInfo$substrateI19;
+    if (accountSignMode === AccountSignMode.MULTISIG && !((_chainInfo$substrateI19 = chainInfo.substrateInfo) !== null && _chainInfo$substrateI19 !== void 0 && _chainInfo$substrateI19.supportMultisig)) {
+      return false;
+    }
     return _isPureSubstrateChain(chainInfo) && AllSubstrateKeypairTypes.includes(accountType);
   }
   if (accountChainType === AccountChainType.ETHEREUM) {

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/services/event-service/index.d.ts

@@ -22,6 +22,7 @@ export declare class EventService extends EventEmitter<EventRegistry> {
     readonly waitEarningReady: Promise<boolean>;
     readonly waitLedgerReady: Promise<boolean>;
     readonly waitOpenGovReady: Promise<boolean>;
+    readonly waitMultisigReady: Promise<boolean>;
     constructor();
     private generateWaitPromise;
     private setLazyTimeout;

package/services/event-service/index.js

@@ -34,6 +34,7 @@ export class EventService extends EventEmitter {
     this.waitEarningReady = this.generateWaitPromise('earning.ready');
     this.waitLedgerReady = this.generateWaitPromise('ledger.ready');
     this.waitOpenGovReady = this.generateWaitPromise('open-gov.ready');
+    this.waitMultisigReady = this.generateWaitPromise('multisig-service.ready');
   }
   generateWaitPromise(eventType) {
     return new Promise(resolve => {

package/services/event-service/types.d.ts

@@ -46,6 +46,7 @@ export interface EventRegistry {
     'swap.ready': [boolean];
     'ledger.ready': [boolean];
     'open-gov.ready': [boolean];
+    'multisig-service.ready': [boolean];
 }
 export declare type EventType = keyof EventRegistry;
 export declare const COMMON_RELOAD_EVENTS: EventType[];

package/services/fee-service/utils/index.js

@@ -45,13 +45,13 @@ export const parseInfuraFee = (info, threshold) => {
 };
 export const fetchInfuraFeeData = async (chainId, infuraAuth) => {
   const baseUrl = 'https://gas.api.infura.io/networks/{{chainId}}/suggestedGasFees';
-  const baseThressholdUrl = 'https://gas.api.infura.io/networks/{{chainId}}/busyThreshold';
+  const baseThresholdUrl = 'https://gas.api.infura.io/networks/{{chainId}}/busyThreshold';
   // const baseFeeHistoryUrl = 'https://gas.api.infura.io/networks/{{chainId}}/baseFeeHistory';
   // const baseFeePercentileUrl = 'https://gas.api.infura.io/networks/{{chainId}}/baseFeePercentile';
   const feeUrl = baseUrl.replaceAll('{{chainId}}', chainId.toString());
-  const thressholdUrl = baseThressholdUrl.replaceAll('{{chainId}}', chainId.toString());
+  const thresholdUrl = baseThresholdUrl.replaceAll('{{chainId}}', chainId.toString());
   try {
-    const [feeResp, thressholdResp] = await Promise.all([feeUrl, thressholdUrl].map(url => {
+    const [feeResp, thresholdResp] = await Promise.all([feeUrl, thresholdUrl].map(url => {
       return fetch(url, {
         method: 'GET',
         headers: {
@@ -61,7 +61,7 @@ export const fetchInfuraFeeData = async (chainId, infuraAuth) => {
     }));
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const [feeInfo, thresholdInfo] = await Promise.all([feeResp.json(), thressholdResp.json()]);
+    const [feeInfo, thresholdInfo] = await Promise.all([feeResp.json(), thresholdResp.json()]);
     return parseInfuraFee(feeInfo, thresholdInfo);
   } catch (e) {
     console.warn(e);

package/services/inapp-notification-service/consts.d.ts

@@ -1,4 +1,4 @@
-import { getAvailBridgeClaimDescription, getClaimDescription, getPolygonBridgeClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from './utils';
+import { getAvailBridgeClaimDescription, getClaimDescription, getMultisigApprovalDescription, getPolygonBridgeClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from './utils';
 export declare const NotificationTitleMap: {
     WITHDRAW: string;
     CLAIM: string;
@@ -7,6 +7,7 @@ export declare const NotificationTitleMap: {
     CLAIM_AVAIL_BRIDGE_ON_AVAIL: string;
     CLAIM_AVAIL_BRIDGE_ON_ETHEREUM: string;
     CLAIM_POLYGON_BRIDGE: string;
+    MULTISIG_APPROVAL: string;
 };
 export declare const NotificationDescriptionMap: {
     WITHDRAW: typeof getWithdrawDescription;
@@ -16,5 +17,6 @@ export declare const NotificationDescriptionMap: {
     CLAIM_AVAIL_BRIDGE_ON_AVAIL: typeof getAvailBridgeClaimDescription;
     CLAIM_AVAIL_BRIDGE_ON_ETHEREUM: typeof getAvailBridgeClaimDescription;
     CLAIM_POLYGON_BRIDGE: typeof getPolygonBridgeClaimDescription;
+    MULTISIG_APPROVAL: typeof getMultisigApprovalDescription;
 };
 export declare const ONE_DAY_MILLISECOND: number;

package/services/inapp-notification-service/consts.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { NotificationActionType } from "./interfaces.js";
-import { getAvailBridgeClaimDescription, getClaimDescription, getPolygonBridgeClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from "./utils/index.js";
+import { getAvailBridgeClaimDescription, getClaimDescription, getMultisigApprovalDescription, getPolygonBridgeClaimDescription, getReceiveDescription, getSendDescription, getWithdrawDescription } from "./utils/index.js";
 export const NotificationTitleMap = {
   [NotificationActionType.WITHDRAW]: '[{{accountName}}] WITHDRAW {{tokenSymbol}}',
   [NotificationActionType.CLAIM]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
@@ -10,7 +10,8 @@ export const NotificationTitleMap = {
   [NotificationActionType.RECEIVE]: '[{{accountName}}] RECEIVE {{tokenSymbol}}',
   [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_AVAIL]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
   [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
-  [NotificationActionType.CLAIM_POLYGON_BRIDGE]: '[{{accountName}}] CLAIM {{tokenSymbol}}'
+  [NotificationActionType.CLAIM_POLYGON_BRIDGE]: '[{{accountName}}] CLAIM {{tokenSymbol}}',
+  [NotificationActionType.MULTISIG_APPROVAL]: '[{{accountName}}] APPROVAL REQUIRED'
 };
 export const NotificationDescriptionMap = {
   [NotificationActionType.WITHDRAW]: getWithdrawDescription,
@@ -19,6 +20,7 @@ export const NotificationDescriptionMap = {
   [NotificationActionType.RECEIVE]: getReceiveDescription,
   [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_AVAIL]: getAvailBridgeClaimDescription,
   [NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM]: getAvailBridgeClaimDescription,
-  [NotificationActionType.CLAIM_POLYGON_BRIDGE]: getPolygonBridgeClaimDescription
+  [NotificationActionType.CLAIM_POLYGON_BRIDGE]: getPolygonBridgeClaimDescription,
+  [NotificationActionType.MULTISIG_APPROVAL]: getMultisigApprovalDescription
 };
 export const ONE_DAY_MILLISECOND = 1000 * 24 * 60 * 60;

package/services/inapp-notification-service/index.d.ts

@@ -7,7 +7,7 @@ import { AvailBridgeTransaction, PolygonTransaction } from '@subwallet/extension
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { ProcessTransactionData } from '@subwallet/extension-base/types';
-import { GetNotificationParams, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
+import { GetNotificationParams, MarkAllReadParams, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
 export declare class InappNotificationService implements CronServiceInterface {
     private readonly dbService;
     private readonly keyringService;
@@ -17,13 +17,14 @@ export declare class InappNotificationService implements CronServiceInterface {
     private refeshAvailBridgeClaimTimeOut;
     constructor(dbService: DatabaseService, keyringService: KeyringService, eventService: EventService, chainService: ChainService);
     init(): Promise<void>;
-    markAllRead(proxyId: string): Promise<void>;
+    markAllRead(params: MarkAllReadParams): Promise<void>;
     switchReadStatus(params: RequestSwitchStatusParams): Promise<void>;
     subscribeUnreadNotificationsCountMap(callback: (data: Record<string, number>) => void): import("dexie").Subscription;
     getUnreadNotificationsCountMap(): Promise<Record<string, number>>;
     fetchNotificationsByParams(params: GetNotificationParams): Promise<_NotificationInfo[]>;
     getNotificationById(id: string): Promise<_NotificationInfo | undefined>;
     cleanUpOldNotifications(overdueTime?: number): Promise<number>;
+    cleanUpNotificationByIds(ids: string[]): Promise<number>;
     passValidateNotification(candidateNotification: _BaseNotificationInfo, comparedNotifications: _NotificationInfo[], remindTimeConfigInHrs: Record<NotificationActionType, number>): boolean;
     validateAndWriteNotificationsToDB(notifications: _BaseNotificationInfo[], address: string): Promise<void>;
     cronCreateBridgeClaimNotification(): void;

package/services/inapp-notification-service/index.js

@@ -29,8 +29,8 @@ export class InappNotificationService {
     await this.start();
     this.onAccountProxyRemove();
   }
-  async markAllRead(proxyId) {
-    await this.dbService.markAllRead(proxyId);
+  async markAllRead(params) {
+    await this.dbService.markAllRead(params);
   }
   async switchReadStatus(params) {
     await this.dbService.switchReadStatus(params);
@@ -52,6 +52,9 @@ export class InappNotificationService {
   cleanUpOldNotifications(overdueTime = ONE_DAY_MILLISECOND * 60) {
     return this.dbService.cleanUpOldNotifications(overdueTime);
   }
+  cleanUpNotificationByIds(ids) {
+    return this.dbService.cleanUpNotificationByIds(ids);
+  }
   passValidateNotification(candidateNotification, comparedNotifications, remindTimeConfigInHrs) {
     // todo: simplify condition !!
     if ([NotificationActionType.WITHDRAW, NotificationActionType.CLAIM].includes(candidateNotification.actionType)) {
@@ -87,6 +90,7 @@ export class InappNotificationService {
     }
     if ([NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_ETHEREUM, NotificationActionType.CLAIM_AVAIL_BRIDGE_ON_AVAIL].includes(candidateNotification.actionType)) {
       const {
+        actionType,
         address,
         metadata,
         time
@@ -97,6 +101,9 @@ export class InappNotificationService {
         if (notification.address !== address) {
           continue;
         }
+        if (notification.actionType !== actionType) {
+          continue;
+        }
         if (time - notification.time >= remindTime) {
           continue;
         }
@@ -109,6 +116,7 @@ export class InappNotificationService {
     }
     if ([NotificationActionType.CLAIM_POLYGON_BRIDGE].includes(candidateNotification.actionType)) {
       const {
+        actionType,
         address,
         metadata,
         time
@@ -119,6 +127,9 @@ export class InappNotificationService {
         if (notification.address !== address) {
           continue;
         }
+        if (notification.actionType !== actionType) {
+          continue;
+        }
         if (time - notification.time >= remindTime) {
           continue;
         }
@@ -130,9 +141,16 @@ export class InappNotificationService {
       }
     }
     if ([NotificationActionType.SWAP, NotificationActionType.EARNING].includes(candidateNotification.actionType)) {
-      const candidateMetadata = candidateNotification.metadata;
+      const {
+        actionType,
+        metadata
+      } = candidateNotification;
+      const candidateMetadata = metadata;
       const processId = candidateMetadata.processId;
       for (const notification of comparedNotifications) {
+        if (notification.actionType !== actionType) {
+          continue;
+        }
         const comparedMetadata = notification.metadata;
         const _processId = comparedMetadata.processId;
         if (processId === _processId) {
@@ -140,10 +158,33 @@ export class InappNotificationService {
         }
       }
     }
+    if ([NotificationActionType.MULTISIG_APPROVAL].includes(candidateNotification.actionType)) {
+      const {
+        actionType,
+        address,
+        metadata
+      } = candidateNotification;
+      const candidateMetadata = metadata;
+
+      // todo: experiment without notification reminder, remove this todo if no problems raised
+      for (const notification of comparedNotifications) {
+        if (notification.address !== address) {
+          continue;
+        }
+        if (notification.actionType !== actionType) {
+          continue;
+        }
+        const comparedMetadata = notification.metadata;
+        const sameNotification = candidateMetadata.multisigTxType === comparedMetadata.multisigTxType && candidateMetadata.multisigKey === comparedMetadata.multisigKey;
+        if (sameNotification) {
+          return false;
+        }
+      }
+    }
     return true;
   }
   async validateAndWriteNotificationsToDB(notifications, address) {
-    const proxyId = this.keyringService.context.belongUnifiedAccount(address) || address;
+    const proxyId = this.keyringService.context.belongUnifiedAccount(address) || reformatAddress(address);
     const accountName = this.keyringService.context.getCurrentAccountProxyName(proxyId);
     const passNotifications = [];
     const [comparedNotifications, remindTimeConfig] = await Promise.all([this.fetchNotificationsByParams({
@@ -422,7 +463,9 @@ export class InappNotificationService {
       this.status = ServiceStatus.STARTING;
       await this.startCron();
       this.status = ServiceStatus.STARTED;
-    } catch (e) {}
+    } catch (e) {
+      console.error('Failed to start InappNotificationService', e);
+    }
   }
   async startCron() {
     this.cleanUpOldNotifications().catch(console.error);
@@ -434,7 +477,9 @@ export class InappNotificationService {
       this.status = ServiceStatus.STOPPING;
       await this.stopCron();
       this.status = ServiceStatus.STOPPED;
-    } catch (e) {}
+    } catch (e) {
+      console.error('Failed to stop InappNotificationService', e);
+    }
   }
   stopCron() {
     return Promise.resolve(undefined);