@subwallet/extension-base 1.0.5-2 → 1.0.6-0

package/services/chain-service/index.js

@@ -707,6 +707,11 @@ export class ChainService {
         targetChainInfo.substrateInfo.crowdloanUrl = params.chainEditInfo.crowdloanUrl;
       }
     }
+    if (targetChainInfo.evmInfo) {
+      if (params.chainEditInfo.blockExplorer !== undefined) {
+        targetChainInfo.evmInfo.blockExplorer = params.chainEditInfo.blockExplorer;
+      }
+    }
     this.updateChainInfoMapSubscription();
     this.dbService.updateChainStore({
       ...targetChainInfo,

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

@@ -10,6 +10,7 @@ export declare function _isPureEvmChain(chainInfo: _ChainInfo): boolean;
 export declare function _isPureSubstrateChain(chainInfo: _ChainInfo): boolean;
 export declare function _getOriginChainOfAsset(assetSlug: string): string;
 export declare function _getContractAddressOfToken(tokenInfo: _ChainAsset): string;
+export declare function _isTokenTransferredByEvm(tokenInfo: _ChainAsset): boolean;
 export declare function _checkSmartContractSupportByChain(chainInfo: _ChainInfo, contractType: _AssetType): boolean;
 export declare function _getTokenOnChainAssetId(tokenInfo: _ChainAsset): string;
 export declare function _getTokenOnChainInfo(tokenInfo: _ChainAsset): Record<string, any>;

package/services/chain-service/utils.js

@@ -61,6 +61,10 @@ export function _getContractAddressOfToken(tokenInfo) {
   var _tokenInfo$metadata;
   return ((_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.contractAddress) || '';
 }
+export function _isTokenTransferredByEvm(tokenInfo) {
+  var _tokenInfo$metadata2;
+  return !!((_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.contractAddress) || _isNativeToken(tokenInfo);
+}
 export function _checkSmartContractSupportByChain(chainInfo, contractType) {
   // EVM chains support smart contract by default so just checking Substrate chains
   if (chainInfo.substrateInfo === null || chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract === null) {
@@ -71,12 +75,12 @@ export function _checkSmartContractSupportByChain(chainInfo, contractType) {
 
 // Utils for balance functions
 export function _getTokenOnChainAssetId(tokenInfo) {
-  var _tokenInfo$metadata2;
-  return ((_tokenInfo$metadata2 = tokenInfo.metadata) === null || _tokenInfo$metadata2 === void 0 ? void 0 : _tokenInfo$metadata2.assetId) || '-1';
+  var _tokenInfo$metadata3;
+  return ((_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.assetId) || '-1';
 }
 export function _getTokenOnChainInfo(tokenInfo) {
-  var _tokenInfo$metadata3;
-  return (_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.onChainInfo;
+  var _tokenInfo$metadata4;
+  return (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.onChainInfo;
 }
 export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -229,16 +233,16 @@ export function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, asset
   return assetRef.path === _AssetRefPath.XCM;
 }
 export function _getXcmAssetType(tokenInfo) {
-  var _tokenInfo$metadata4;
-  return ((_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.assetType) || '';
+  var _tokenInfo$metadata5;
+  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetType) || '';
 }
 export function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata5;
-  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetId) || '-1';
+  var _tokenInfo$metadata6;
+  return ((_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.assetId) || '-1';
 }
 export function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata6;
-  return (_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.multilocation;
+  var _tokenInfo$metadata7;
+  return (_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.multilocation;
 }
 export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

package/services/history-service/subsquid-multi-chain-history.js

@@ -244,7 +244,7 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
     const usedAddresses = relatedAddresses.filter(a => lowerAddresses.includes(a.toLowerCase()));
     const chainInfo = chainMap[chainId];
     if (chainInfo === undefined) {
-      console.warn(`Not found chain info for chain id: ${chainId}`); // TODO: resolve conflicting chainId
+      console.debug(`Not found chain info for chain id: ${chainId}`); // TODO: resolve conflicting chainId
 
       return;
     }
@@ -253,7 +253,7 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
         histories.push(transactionData);
       } catch (e) {
-        console.warn('Parse transaction data failed', address, e);
+        console.debug('Parse transaction data failed', address, e);
       }
     });
   });

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -15,7 +15,7 @@ export default class AuthRequestHandler {
     private readonly evmChainSubject;
     readonly authSubjectV2: BehaviorSubject<AuthorizeRequest[]>;
     constructor(requestService: RequestService, chainService: ChainService, keyringService: KeyringService);
-    private stripUrl;
+    stripUrl(url: string): string;
     private getAddressList;
     get numAuthRequestsV2(): number;
     private get allAuthRequestsV2();

package/services/request-service/index.d.ts

@@ -14,6 +14,7 @@ export default class RequestService {
     constructor(chainService: ChainService, settingService: SettingService, keyringService: KeyringService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;
+    stripUrl(url: string): string;
     getAddressList(value?: boolean): Record<string, boolean>;
     get popup(): number[];
     popupClose(): void;

package/services/request-service/index.js

@@ -35,6 +35,9 @@ export default class RequestService {
   updateIconV2(shouldClose) {
     this.#popupHandler.updateIconV2(shouldClose);
   }
+  stripUrl(url) {
+    return this.#authRequestHandler.stripUrl(url);
+  }
   getAddressList(value = false) {
     const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({

package/services/setting-service/SettingService.d.ts

@@ -1,9 +1,13 @@
-import { RequestSettingsType } from '@subwallet/extension-base/background/KoniTypes';
+import { PassPhishing, RequestSettingsType } from '@subwallet/extension-base/background/KoniTypes';
 import { Subject } from 'rxjs';
 export default class SettingService {
     private readonly settingsStore;
+    private readonly passPhishingStore;
     getSubject(): Subject<RequestSettingsType>;
     getSettings(update: (value: RequestSettingsType) => void): void;
     setSettings(data: RequestSettingsType, callback?: () => void): void;
+    passPhishingSubject(): Subject<Record<string, PassPhishing>>;
+    getPassPhishingList(update: (value: Record<string, PassPhishing>) => void): void;
+    setPassPhishing(data: Record<string, PassPhishing>, callback?: () => void): void;
     resetWallet(): void;
 }

package/services/setting-service/SettingService.js

@@ -1,10 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import PassPhishingStore from '@subwallet/extension-base/stores/PassPhishingStore';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
 import { DEFAULT_SETTING } from "./constants.js";
 export default class SettingService {
   settingsStore = new SettingsStore();
+  passPhishingStore = new PassPhishingStore();
   getSubject() {
     return this.settingsStore.getSubject();
   }
@@ -20,7 +22,19 @@ export default class SettingService {
   setSettings(data, callback) {
     this.settingsStore.set('Settings', data, callback);
   }
+  passPhishingSubject() {
+    return this.passPhishingStore.getSubject();
+  }
+  getPassPhishingList(update) {
+    this.passPhishingStore.get('PassPhishing', value => {
+      update(value || {});
+    });
+  }
+  setPassPhishing(data, callback) {
+    this.passPhishingStore.set('PassPhishing', data, callback);
+  }
   resetWallet() {
     this.settingsStore.set('Settings', DEFAULT_SETTING);
+    this.passPhishingStore.set('PassPhishing', {});
   }
 }

package/services/storage-service/DatabaseService.js

@@ -145,7 +145,7 @@ export default class DatabaseService {
   }
   async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
     if (ownNothing) {
-      return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42));
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42), collectionIds);
     }
     return this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionIds, nftIds);
   }

package/services/storage-service/db-stores/Nft.d.ts

@@ -5,7 +5,7 @@ export default class NftStore extends BaseStoreWithAddressAndChain<INft> {
     getNft(addresses: string[], chainList?: string[]): import("dexie").PromiseExtended<INft[]>;
     subscribeNft(addresses: string[], chainList?: string[]): import("dexie").Observable<INft[]>;
     cleanUpNfts(chain: string, address: string, collectionIds: string[], nftIds: string[]): import("dexie").PromiseExtended<number>;
-    deleteNftsByChainAndOwner(chain: string, address: string): import("dexie").PromiseExtended<number>;
+    deleteNftsByChainAndOwner(chain: string, address: string, collectionIds: string[]): import("dexie").PromiseExtended<number>;
     deleteNftByAddress(addresses: string[]): import("dexie").PromiseExtended<number>;
     deleteNftItem(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;
     deleteNftsByCollection(chain: string, collectionId: string): import("dexie").PromiseExtended<number>;

package/services/storage-service/db-stores/Nft.js

@@ -19,13 +19,13 @@ export default class NftStore extends BaseStoreWithAddressAndChain {
     return this.table.where({
       address,
       chain
-    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
+    }).and(nft => collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
   }
-  deleteNftsByChainAndOwner(chain, address) {
+  deleteNftsByChainAndOwner(chain, address, collectionIds) {
     return this.table.where({
       address,
       chain
-    }).delete();
+    }).and(nft => collectionIds.includes(nft.collectionId)).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

package/services/transaction-service/index.js

@@ -122,7 +122,7 @@ export default class TransactionService {
     } else {
       var _pair$meta;
       if ((_pair$meta = pair.meta) !== null && _pair$meta !== void 0 && _pair$meta.isReadOnly) {
-        validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'This is read-only account'));
+        validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'This is watch-only account'));
       }
     }
 
@@ -161,8 +161,8 @@ export default class TransactionService {
     const transactionId = getTransactionId(transaction.chainType, transaction.chain, isInternal);
     return {
       ...transaction,
-      createdAt: new Date(),
-      updatedAt: new Date(),
+      createdAt: new Date().getTime(),
+      updatedAt: new Date().getTime(),
       errors: transaction.errors || [],
       warnings: transaction.warnings || [],
       url: transaction.url || EXTENSION_REQUEST_URL,
@@ -203,6 +203,9 @@ export default class TransactionService {
     const stopByErrors = validatedTransaction.errors.length > 0;
     const stopByWarnings = validatedTransaction.warnings.length > 0 && !validatedTransaction.ignoreWarnings;
     if (stopByErrors || stopByWarnings) {
+      // @ts-ignore
+      'transaction' in validatedTransaction && delete validatedTransaction.transaction;
+      'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
       return validatedTransaction;
     }
     validatedTransaction.warnings = [];
@@ -220,6 +223,10 @@ export default class TransactionService {
         }
       });
     });
+
+    // @ts-ignore
+    'transaction' in validatedTransaction && delete validatedTransaction.transaction;
+    'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
     return validatedTransaction;
   }
   async sendTransaction(transaction) {
@@ -286,7 +293,7 @@ export default class TransactionService {
       status: transaction.status,
       transactionId: transaction.id,
       extrinsicHash: transaction.extrinsicHash,
-      time: transaction.createdAt.getTime(),
+      time: transaction.createdAt,
       fee: transaction.estimateFee,
       blockNumber: 0,
       // Will be added in next step
@@ -295,7 +302,6 @@ export default class TransactionService {
       nonce: nonce || 0,
       startBlock: startBlock || 0
     };
-    console.log('historyItem', historyItem);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = _getChainNativeTokenBasicInfo(chainInfo);
     const baseNativeAmount = {

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

@@ -14,14 +14,14 @@ export interface SWTransaction extends ValidateTransactionResponse, Partial<Pick
     status: ExtrinsicStatus;
     extrinsicHash: string;
     extrinsicType: ExtrinsicType;
-    createdAt: Date;
-    updatedAt: Date;
+    createdAt: number;
+    updatedAt: number;
     estimateFee?: AmountData;
     transaction: SubmittableExtrinsic | TransactionConfig;
     additionalValidator?: (inputTransaction: SWTransactionResponse) => Promise<void>;
     eventsHandler?: (eventEmitter: TransactionEmitter) => void;
 }
-export declare type SWTransactionResult = Omit<SWTransaction, 'transaction'>;
+export declare type SWTransactionResult = Omit<SWTransaction, 'transaction' | 'additionalValidator'>;
 declare type SwInputBase = Pick<SWTransaction, 'address' | 'url' | 'data' | 'extrinsicType' | 'chain' | 'chainType' | 'ignoreWarnings' | 'transferNativeAmount'> & Partial<Pick<SWTransaction, 'additionalValidator'>>;
 export interface SWTransactionInput extends SwInputBase {
     transaction?: SWTransaction['transaction'] | null;

package/services/transaction-service/utils.js

@@ -21,6 +21,9 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (_isPureEvmChain(chainInfo)) {
     return 'tx';
   }
+  if (['aventus'].includes(chainInfo.slug)) {
+    return 'transaction';
+  }
   return 'extrinsic';
 }
 export function getExplorerLink(chainInfo, value, type) {

package/stores/PassPhishingStore.d.ts

@@ -0,0 +1,5 @@
+import { PassPhishing } from '@subwallet/extension-base/background/KoniTypes';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class PassPhishingStore extends SubscribableStore<Record<string, PassPhishing>> {
+    constructor();
+}

package/stores/PassPhishingStore.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { EXTENSION_PREFIX } from '@subwallet/extension-base/defaults';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class PassPhishingStore extends SubscribableStore {
+  constructor() {
+    super(EXTENSION_PREFIX ? `${EXTENSION_PREFIX}subwallet-pass-phishing-list` : null);
+  }
+}