Claim limit fixes - optional params (#255)

* address PR comments * fix comment * make close claim data parameters optional * fix passing undefined to newDistributor * remove leftover console logs * fix for closeClaim optionals as well
streamflow-finance · Jan 29, 2025 · 074fa58 · 074fa58
1 parent 7c307d2
commit 074fa58
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 16 deletions.
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/common",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "Common utilities and types used by streamflow packages.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "./dist/esm/index.js",

diff --git a/packages/distributor/package.json b/packages/distributor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/distributor",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "JavaScript SDK to interact with Streamflow Airdrop protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",

diff --git a/packages/distributor/solana/clients/BaseDistributorClient.ts b/packages/distributor/solana/clients/BaseDistributorClient.ts
@@ -348,8 +348,8 @@ export default abstract class BaseDistributorClient {
     };
 
     const closeClaimArgs: CloseClaimArgs = {
-      amountLocked: new BN(data.amountLocked),
-      amountUnlocked: new BN(data.amountUnlocked),
+      amountLocked: data.amountLocked ? new BN(data.amountLocked) : undefined,
+      amountUnlocked: data.amountUnlocked ? new BN(data.amountUnlocked) : undefined,
       proof: data.proof,
     };
 

diff --git a/packages/distributor/solana/generated/instructions/closeClaim.ts b/packages/distributor/solana/generated/instructions/closeClaim.ts
@@ -44,9 +44,9 @@ export function closeClaim(args: CloseClaimArgs, accounts: CloseClaimAccounts, p
   const buffer = Buffer.alloc(1000);
   const len = layout.encode(
     {
-      amountUnlocked: args.amountUnlocked,
-      amountLocked: args.amountLocked,
-      proof: args.proof,
+      amountUnlocked: args.amountUnlocked ?? null,
+      amountLocked: args.amountLocked ?? null,
+      proof: args.proof ?? null,
     },
     buffer,
   );

diff --git a/packages/distributor/solana/generated/instructions/newDistributor.ts b/packages/distributor/solana/generated/instructions/newDistributor.ts
@@ -15,8 +15,8 @@ export interface NewDistributorArgs {
   endVestingTs: BN;
   clawbackStartTs: BN;
   claimsClosableByAdmin: boolean;
-  claimsClosableByClaimant?: boolean;
-  claimsLimit?: number;
+  claimsClosableByClaimant?: boolean | null;
+  claimsLimit?: number | null;
 }
 
 export interface NewDistributorAccounts {
@@ -113,8 +113,8 @@ export function newDistributor(
       canUpdateDuration: null,
       totalAmountUnlocked: null,
       totalAmountLocked: null,
-      claimsClosableByClaimant: args.claimsClosableByClaimant,
-      claimsLimit: args.claimsLimit,
+      claimsClosableByClaimant: args.claimsClosableByClaimant ?? null,
+      claimsLimit: args.claimsLimit ?? null,
     },
     buffer,
   );

diff --git a/packages/distributor/solana/types.ts b/packages/distributor/solana/types.ts
@@ -81,7 +81,8 @@ export interface IClaimData {
   proof: Array<Array<number>>;
 }
 
-export interface ICloseClaimData extends IClaimData {
+export interface ICloseClaimData extends Partial<Omit<IClaimData, "id">> {
+  id: string;
   claimant: string | PublicKey;
 }
 

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/eslint-config",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "license": "ISC",
   "main": "index.js",
   "files": [

diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/launchpad",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "JavaScript SDK to interact with Streamflow Launchpad protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",

diff --git a/packages/staking/package.json b/packages/staking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/staking",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "JavaScript SDK to interact with Streamflow Staking protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",

diff --git a/packages/stream/package.json b/packages/stream/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/stream",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "JavaScript SDK to interact with Streamflow protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "./dist/esm/index.js",