@subwallet/extension-base 1.0.6-2 → 1.0.7-1

package/services/storage-service/DatabaseService.d.ts

@@ -38,7 +38,7 @@ export default class DatabaseService {
     getPooledStakings(addresses: string[], chainHashes?: string[]): Promise<StakingItem[]>;
     subscribeStaking(addresses: string[], chainList?: string[], callback?: (stakingItems: StakingItem[]) => void): Subscription;
     subscribeChainStakingMetadata(chains: string[], callback: (data: ChainStakingMetadata[]) => void): void;
-    subscribeNominatorMetadata(callback: (data: NominatorMetadata[]) => void): void;
+    subscribeNominatorMetadata(addresses: string[], callback: (data: NominatorMetadata[]) => void): Subscription;
     getHistories(query?: HistoryQuery): Promise<import("@subwallet/extension-base/services/storage-service/databases").ITransactionHistoryItem[]>;
     upsertHistory(histories: TransactionHistoryItem[]): Promise<unknown>;
     updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<unknown>;
@@ -58,7 +58,7 @@ export default class DatabaseService {
     updateAssetStore(item: _ChainAsset): Promise<unknown>;
     getAllAssetStore(): Promise<_ChainAsset[]>;
     removeFromAssetStore(items: string[]): Promise<number>;
-    updateChainStakingMetadata(item: ChainStakingMetadata): Promise<unknown>;
+    updateChainStakingMetadata(item: ChainStakingMetadata, changes?: Record<string, unknown>): Promise<unknown>;
     getChainStakingMetadata(): Promise<ChainStakingMetadata[]>;
     getStakingMetadataByChain(chain: string, type?: StakingType): Promise<ChainStakingMetadata | undefined>;
     updateNominatorMetadata(item: NominatorMetadata): Promise<unknown>;

package/services/storage-service/DatabaseService.js

@@ -99,8 +99,8 @@ export default class DatabaseService {
       next: data => callback && callback(data)
     });
   }
-  subscribeNominatorMetadata(callback) {
-    this.stores.nominatorMetadata.subscribeAll().subscribe({
+  subscribeNominatorMetadata(addresses, callback) {
+    return this.stores.nominatorMetadata.subscribeByAddresses(addresses).subscribe({
       next: data => callback && callback(data)
     });
   }
@@ -191,7 +191,11 @@ export default class DatabaseService {
   }
 
   // Staking
-  async updateChainStakingMetadata(item) {
+  async updateChainStakingMetadata(item, changes) {
+    const existingRecord = await this.stores.chainStakingMetadata.getByChainAndType(item.chain, item.type);
+    if (existingRecord && changes) {
+      return this.stores.chainStakingMetadata.updateByChainAndType(item.chain, item.type, changes);
+    }
     return this.stores.chainStakingMetadata.upsert(item);
   }
   async getChainStakingMetadata() {

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

@@ -6,4 +6,5 @@ export default class ChainStakingMetadataStore extends BaseStoreWithChain<ChainS
     getByChains(chains: string[]): Promise<ChainStakingMetadata[]>;
     getByChainAndType(chain: string, type?: StakingType): import("dexie").PromiseExtended<ChainStakingMetadata | undefined>;
     removeByChains(chains: string[]): Promise<number>;
+    updateByChainAndType(chain: string, type: StakingType | undefined, changes: Record<string, unknown>): import("dexie").PromiseExtended<number>;
 }

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

@@ -26,4 +26,7 @@ export default class ChainStakingMetadataStore extends BaseStoreWithChain {
   async removeByChains(chains) {
     return this.table.where('chain').anyOfIgnoreCase(chains).delete();
   }
+  updateByChainAndType(chain, type = StakingType.NOMINATED, changes) {
+    return this.table.update([chain, type], changes);
+  }
 }

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

@@ -2,8 +2,8 @@ import { NominatorMetadata } from '@subwallet/extension-base/background/KoniType
 import BaseStoreWithAddressAndChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain';
 export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain<NominatorMetadata> {
     getAll(): Promise<NominatorMetadata[]>;
-    subscribeByAddress(address: string): import("dexie").Observable<NominatorMetadata[]>;
+    subscribeByAddresses(addresses: string[]): import("dexie").Observable<NominatorMetadata[]>;
     subscribeAll(): import("dexie").Observable<NominatorMetadata[]>;
-    getByAddress(address: string): import("dexie").PromiseExtended<NominatorMetadata[]>;
+    getByAddress(addresses: string[]): import("dexie").PromiseExtended<NominatorMetadata[]>;
     removeByAddress(address: string): Promise<number>;
 }

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

@@ -7,14 +7,14 @@ export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain
   async getAll() {
     return this.table.toArray();
   }
-  subscribeByAddress(address) {
-    return liveQuery(() => this.getByAddress(address));
+  subscribeByAddresses(addresses) {
+    return liveQuery(() => this.getByAddress(addresses));
   }
   subscribeAll() {
     return liveQuery(() => this.getAll());
   }
-  getByAddress(address) {
-    return this.table.where('address').anyOfIgnoreCase(address).toArray();
+  getByAddress(addresses) {
+    return this.table.where('address').anyOfIgnoreCase(addresses).toArray();
   }
   async removeByAddress(address) {
     return this.table.where('address').anyOfIgnoreCase(address).delete();

package/services/transaction-service/index.js

@@ -631,7 +631,12 @@ export default class TransactionService {
     if (!payload.parseData) {
       const isToContract = await isContractAddress(payload.to || '', evmApi);
       payload.isToContract = isToContract;
-      payload.parseData = isToContract ? payload.data ? (await parseContractInput(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
+      try {
+        payload.parseData = isToContract ? payload.data ? (await parseContractInput(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
+      } catch (e) {
+        console.warn('Unable to parse contract input data');
+        payload.parseData = payload.data;
+      }
     }
     if ('data' in payload && payload.data === undefined) {
       delete payload.data;