Add the validation of the accountAddressOrAddresses parameter;

Fix typos
baking-bad · Mar 20, 2024 · 744376d · 744376d
1 parent a485de3
commit 744376d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/src/bridgeDataProviders/defaultDataProvider/defaultDataProvider.ts b/src/bridgeDataProviders/defaultDataProvider/defaultDataProvider.ts
@@ -63,9 +63,9 @@ export class DefaultDataProvider implements TransfersBridgeDataProvider, Balance
   async getAccountTokenTransfers(accountAddresses: readonly string[]): Promise<BridgeTokenTransfer[]>;
   async getAccountTokenTransfers(accountAddress: string, fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
   async getAccountTokenTransfers(accountAddresses: readonly string[], fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  async getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  async getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]> {
-    return this.dipDupBridgeDataProvider.getAccountTokenTransfers(accountAddressOfAddresses, fetchOptions);
+  async getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
+  async getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]> {
+    return this.dipDupBridgeDataProvider.getAccountTokenTransfers(accountAddressOrAddresses, fetchOptions);
   }
 
   async getOperationTokenTransfers(operationHash: string): Promise<BridgeTokenTransfer[]>;

diff --git a/src/bridgeDataProviders/dipDupBridgeDataProvider/dipDupBridgeDataProvider.ts b/src/bridgeDataProviders/dipDupBridgeDataProvider/dipDupBridgeDataProvider.ts
@@ -93,9 +93,11 @@ export class DipDupBridgeDataProvider extends RemoteService implements Transfers
   async getAccountTokenTransfers(accountAddresses: readonly string[]): Promise<BridgeTokenTransfer[]>;
   async getAccountTokenTransfers(accountAddress: string, fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
   async getAccountTokenTransfers(accountAddresses: readonly string[], fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  async getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  async getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]> {
-    return this.getTokenTransfersInternal(accountAddressOfAddresses, fetchOptions);
+  async getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
+  async getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]> {
+    return this.validateAccountAddressOrAddresses(accountAddressOrAddresses)
+      ? this.getTokenTransfersInternal(accountAddressOrAddresses, fetchOptions)
+      : [];
   }
 
   async getOperationTokenTransfers(operationHash: string): Promise<BridgeTokenTransfer[]>;
@@ -162,6 +164,9 @@ export class DipDupBridgeDataProvider extends RemoteService implements Transfers
   subscribeToAccountTokenTransfers(accountAddresses: readonly string[]): void;
   subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
   subscribeToAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void {
+    if (!this.validateAccountAddressOrAddresses(accountAddressOrAddresses))
+      return;
+
     this.startDipDupWebSocketClientIfNeeded();
     this.subscribeToTokenTransfersInternal(accountAddressOrAddresses);
   }
@@ -170,6 +175,9 @@ export class DipDupBridgeDataProvider extends RemoteService implements Transfers
   unsubscribeFromAccountTokenTransfers(accountAddresses: readonly string[]): void;
   unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void;
   unsubscribeFromAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[]): void {
+    if (!this.validateAccountAddressOrAddresses(accountAddressOrAddresses))
+      return;
+
     this.unsubscribeFromTokenTransfersInternal(accountAddressOrAddresses);
   }
 
@@ -480,6 +488,11 @@ export class DipDupBridgeDataProvider extends RemoteService implements Transfers
     return [previousSubscribedAddressesSize, updatedSubscribedAddressesSize];
   }
 
+  private validateAccountAddressOrAddresses(accountAddressOrAddresses: unknown): accountAddressOrAddresses is string | readonly string[] {
+    return !!((guards.isReadonlyArray(accountAddressOrAddresses) && accountAddressOrAddresses.length)
+      || (typeof accountAddressOrAddresses === 'string' && accountAddressOrAddresses));
+  }
+
   private getPreparedOffsetParameter(offsetOrFetchOptions: number | undefined | null | BalancesFetchOptions): number {
     const offset = typeof offsetOrFetchOptions === 'number' ? offsetOrFetchOptions : offsetOrFetchOptions?.offset;
 

diff --git a/src/bridgeDataProviders/transfersBridgeDataProvider/transfersBridgeDataProvider.ts b/src/bridgeDataProviders/transfersBridgeDataProvider/transfersBridgeDataProvider.ts
@@ -20,7 +20,7 @@ export interface TransfersBridgeDataProvider {
   getAccountTokenTransfers(accountAddresses: readonly string[]): Promise<BridgeTokenTransfer[]>;
   getAccountTokenTransfers(accountAddress: string, fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
   getAccountTokenTransfers(accountAddresses: readonly string[], fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
+  getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
 
   getOperationTokenTransfers(operationHash: string): Promise<BridgeTokenTransfer[]>;
   getOperationTokenTransfers(tokenTransfer: BridgeTokenTransfer): Promise<BridgeTokenTransfer[]>;

diff --git a/src/tokenBridge/tokenBridge.ts b/src/tokenBridge/tokenBridge.ts
@@ -453,10 +453,10 @@ export class TokenBridge<
   protected getAccountTokenTransfers(accountAddresses: readonly string[]): Promise<BridgeTokenTransfer[]>;
   protected getAccountTokenTransfers(accountAddress: string, fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
   protected getAccountTokenTransfers(accountAddresses: readonly string[], fetchOptions: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  protected getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
-  protected getAccountTokenTransfers(accountAddressOfAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]> {
+  protected getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]>;
+  protected getAccountTokenTransfers(accountAddressOrAddresses: string | readonly string[], fetchOptions?: TransfersFetchOptions): Promise<BridgeTokenTransfer[]> {
     return this.bridgeComponents.transfersBridgeDataProvider
-      .getAccountTokenTransfers(accountAddressOfAddresses, fetchOptions);
+      .getAccountTokenTransfers(accountAddressOrAddresses, fetchOptions);
   }
 
   protected getOperationTokenTransfers(operationHash: string): Promise<BridgeTokenTransfer[]>;