Merge branch 'ncw_ns_squash' into ncw_ns

fireblocks · Aug 20, 2023 · 2d23469 · 2d23469
2 parents 8189dab + 58a4375
commit 2d23469
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 25 deletions.
diff --git a/src/api-client.ts b/src/api-client.ts
@@ -60,17 +60,15 @@ export class ApiClient {
 
     public async issuePostRequest<T>(path: string, body: any, requestOptions?: RequestOptions): Promise<T> {
         const token = this.authProvider.signJwt(path, body);
-        const headers: any = {"Authorization": `Bearer ${token}`};
+        const headers: Record<string, string> = {
+            "Authorization": `Bearer ${token}`,
+            ...requestOptions?.headers
+        };
         const idempotencyKey = requestOptions?.idempotencyKey;
         if (idempotencyKey) {
             headers["Idempotency-Key"] = idempotencyKey;
         }
 
-        const ncwWalletId = requestOptions?.NCW?.walletId;
-        if (ncwWalletId) {
-            headers["X-End-User-Wallet-Id"] = ncwWalletId;
-        }
-
         const response = await this.axiosInstance.post<T>(path, body, {headers});
         return response.data;
     }

diff --git a/src/fireblocks-sdk.ts b/src/fireblocks-sdk.ts
@@ -92,7 +92,7 @@ import {
     SmartTransfersTicketTermPayload,
     SmartTransfersTicketTermFundPayload,
     SmartTransfersTicketTermResponse,
-    UsersGroup, PendingTokenLinkDto,
+    UsersGroup, PendingTokenLinkDto, NCW,
 } from "./types";
 import { AxiosProxyConfig, AxiosResponse } from "axios";
 import { PIIEncryption } from "./pii-client";
@@ -101,6 +101,7 @@ import { NcwSdk } from "./ncw-sdk";
 
 export * from "./types";
 
+
 export interface SDKOptions {
     /** HTTP request timeout */
     timeoutInMs?: number;
@@ -630,8 +631,15 @@ export class FireblocksSDK {
      * @param txId The transaction id to cancel
      * @param requestOptions
      */
-    public async cancelTransactionById(txId: string, requestOptions?: RequestOptions): Promise<CancelTransactionResponse> {
-        return await this.apiClient.issuePostRequest(`/v1/transactions/${txId}/cancel`, {}, requestOptions);
+    public async cancelTransactionById(txId: string, requestOptions?: RequestOptions, ncwWalletId?: string): Promise<CancelTransactionResponse> {
+        const opts =  {
+            ...requestOptions,
+            headers: {
+                [NCW.WalletIdHeader]: ncwWalletId,
+                ...requestOptions?.headers,
+            },
+        };
+        return await this.apiClient.issuePostRequest(`/v1/transactions/${txId}/cancel`, {}, opts);
     }
 
     /**
@@ -821,9 +829,12 @@ export class FireblocksSDK {
             transactionArguments = await this.piiClient.hybridEncode(transactionArguments, travelRuleEncryptionOptions);
         }
 
-        if (transactionArguments.source?.type === PeerType.END_USER_WALLET && !opts.NCW?.walletId) {
+        if (transactionArguments.source?.type === PeerType.END_USER_WALLET && !opts.headers?.[NCW.WalletIdHeader]) {
             const { walletId } = transactionArguments.source;
-            opts.NCW = { ...opts.NCW, walletId };
+            opts.headers = {
+                ...opts.headers,
+                [NCW.WalletIdHeader]: walletId
+            };
         }
 
         return await this.apiClient.issuePostRequest("/v1/transactions", transactionArguments, opts);

diff --git a/src/ncw-api-client.ts b/src/ncw-api-client.ts
@@ -1,6 +1,6 @@
 import { ApiClient } from "./api-client";
 import {
-    AssetResponse, DepositAddressResponse, Web3PagedResponse, NCW
+    AssetResponse, Web3PagedResponse, NCW
 } from "./types";
 import { NcwSdk } from "./ncw-sdk";
 

diff --git a/src/ncw-sdk.ts b/src/ncw-sdk.ts
@@ -1,7 +1,9 @@
 import {
-    AssetResponse, DepositAddressResponse, Web3PagedResponse, NCW,
+    AssetResponse, Web3PagedResponse, NCW,
 } from "./types";
 
+export const NcwWalletIdHeader = "X-End-User-Wallet-Id";
+
 export interface NcwSdk {
     /**
      * Create a new NCW wallet

diff --git a/src/types.ts b/src/types.ts
@@ -1080,9 +1080,7 @@ export interface VaultBalancesFilter {
 
 export interface RequestOptions {
     idempotencyKey?: string;
-    NCW?: {
-        walletId?: string;
-    }
+    headers?: Record<string, string>;
 }
 
 export interface ValidateAddressResponse {
@@ -1547,6 +1545,8 @@ export interface SmartTransfersTicketTermFundPayload {
 }
 
 export namespace NCW {
+    export const WalletIdHeader = "X-End-User-Wallet-Id";
+
     export interface WalletInfo {
         walletId: string;
         enabled: boolean;
@@ -1601,14 +1601,14 @@ export namespace NCW {
         blockchainId?: string;
     }
     export interface WalletAssetAddress {
-        accountName: string,
-        accountId: string,
-        asset: string,
-        address: string,
-        addressType: string,
-        addressDescription?: string,
-        tag?: string,
-        addressIndex?: number,
-        legacyAddress?: string,
+        accountName: string;
+        accountId: string;
+        asset: string;
+        address: string;
+        addressType: string;
+        addressDescription?: string;
+        tag?: string;
+        addressIndex?: number;
+        legacyAddress?: string;
     }
 }