revert git add -A check and make apiUrl required

Author: tatomir-streamflow

packages/distributor/solana/clients/BaseDistributorClient.ts

@@ -77,7 +77,7 @@ export interface IInitOptions {
   programId?: string;
   sendRate?: number;
   sendThrottler?: PQueue;
-  apiUrl?: string;
+  apiUrl: string;
   apiKey?: string;
 }
 
@@ -94,7 +94,7 @@ export default abstract class BaseDistributorClient {
 
   protected cluster: ICluster;
 
-  protected apiUrl?: string;
+  protected apiUrl: string;
 
   protected apiKey?: string;
 

packages/distributor/solana/clients/SolanaAlignedDistributorClient.ts

@@ -21,8 +21,8 @@ import { getAlignedDistributorPda, getTestOraclePda } from "../utils.js";
 export default class SolanaAlignedDistributorClient extends BaseDistributorClient {
   public alignedProxyProgram: Program<AlignedAirdropsProgramType>;
 
-  public constructor({ clusterUrl, cluster, commitment, programId, sendRate, sendThrottler }: IInitOptions) {
-    super({ clusterUrl, cluster, commitment, programId, sendRate, sendThrottler });
+  public constructor({ clusterUrl, cluster, commitment, programId, sendRate, sendThrottler, apiUrl, apiKey }: IInitOptions) {
+    super({ clusterUrl, cluster, commitment, programId, sendRate, sendThrottler, apiUrl, apiKey });
     const alignedAirdropsProgram = {
       ...StreamflowAlignedAirdropsIDL,
     } as AlignedAirdropsProgramType;

packages/distributor/solana/fees.ts

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

packages/distributor/solana/fetchAirdropFee.ts

@@ -1,5 +1,3 @@
-import { ICluster } from "@streamflow/common";
-
 export type AirdropFeeResponse = {
   claimFee: string | number;
   claimFeeDynamic?: {
@@ -19,13 +17,11 @@ export interface AirdropFeeQueryOptionsOverrides {
 
 export const fetchAirdropFee = async (
   distributorId: string,
-  cluster: ICluster,
-  apiUrl?: string,
+  apiUrl: string,
   apiKey?: string,
   fetchFn: typeof fetch = fetch,
 ): Promise<AirdropFeeResponse> => {
-  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 url = `${apiUrl}/v2/api/airdrops/${encodeURIComponent(distributorId)}/fees`;
 
   const res = await fetchFn(url, {
     method: "GET",