expose apiUrl and apiKey in distributor client

Author: tatomir-streamflow

packages/distributor/solana/clients/BaseDistributorClient.ts

@@ -77,6 +77,8 @@ export interface IInitOptions {
   programId?: string;
   sendRate?: number;
   sendThrottler?: PQueue;
+  apiUrl?: string;
+  apiKey?: string;
 }
 
 export default abstract class BaseDistributorClient {
@@ -92,13 +94,19 @@ export default abstract class BaseDistributorClient {
 
   protected cluster: ICluster;
 
+  protected apiUrl?: string;
+
+  protected apiKey?: string;
+
   public constructor({
     clusterUrl,
     cluster = ICluster.Mainnet,
     commitment = "confirmed",
     programId = "",
     sendRate = 1,
     sendThrottler,
+    apiUrl,
+    apiKey,
   }: IInitOptions) {
     this.commitment = commitment;
     this.cluster = cluster;
@@ -109,6 +117,8 @@ export default abstract class BaseDistributorClient {
       ...MerkleDistributorIDL,
     } as MerkleDistributorProgramType;
     this.merkleDistributorProgram = new Program(merkleDistributorProgram, { connection: this.connection });
+    this.apiUrl = apiUrl;
+    this.apiKey = apiKey;
   }
 
   protected abstract getNewDistributorInstruction(
@@ -391,6 +401,8 @@ export default abstract class BaseDistributorClient {
           mintAccount,
           claimableAmount,
           cluster: this.cluster,
+          apiUrl: this.apiUrl,
+          apiKey: this.apiKey,
         });
       } catch (_) {
         feeLamports = MINIMUM_FEE_FALLBACK;

packages/distributor/solana/fees.ts

@@ -167,12 +167,14 @@ export async function resolveAirdropFeeLamportsUsingApi(params: {
   mintAccount: Mint;
   claimableAmount: bigint;
   cluster: ICluster;
+  apiUrl?: string;
+  apiKey?: string;
 }): Promise<bigint> {
-  const { distributorAddress, mintAccount, claimableAmount, cluster } = params;
+  const { distributorAddress, mintAccount, claimableAmount, cluster, apiUrl, apiKey } = params;
   let apiFeesResponse = undefined;
 
   try {
-    apiFeesResponse = await fetchAirdropFee(distributorAddress, cluster);
+    apiFeesResponse = await fetchAirdropFee(distributorAddress, cluster, apiUrl, apiKey);
   } catch (_) {
     // ignore and fallback
   }
@@ -190,7 +192,7 @@ export async function resolveAirdropFeeLamportsUsingApi(params: {
 
   const response = apiFeesResponse ?? defaultAPIFeesResponse;
 
-  if (response?.isCustom && response.claimFee !== null && response.claimFee !== undefined) {
+  if (response?.isCustom && !!response.claimFee) {
     return toLamportsSOL(response.claimFee);
   }
 

packages/distributor/solana/fetchAirdropFee.ts

@@ -19,17 +19,19 @@ export interface AirdropFeeQueryOptionsOverrides {
 
 export const fetchAirdropFee = async (
   distributorId: string,
-  cluster: ICluster = ICluster.Mainnet,
+  cluster: ICluster,
+  apiUrl?: string,
+  apiKey?: string,
   fetchFn: typeof fetch = fetch,
 ): Promise<AirdropFeeResponse> => {
-  const baseUrl =
-    cluster === ICluster.Mainnet ? "https://api.streamflow.finance" : "https://staging-api.streamflow.finance";
+  const baseUrl = apiUrl ?? cluster === ICluster.Mainnet ? "https://api.streamflow.finance" : "https://staging-api.streamflow.finance";
   const url = `${baseUrl}/v2/api/airdrops/${encodeURIComponent(distributorId)}/fees`;
 
   const res = await fetchFn(url, {
     method: "GET",
     headers: {
       "Content-Type": "application/json",
+      ...(apiKey ? { "x-api-key": apiKey } : {}),
     },
   });