Add fee instruction to claim transactions (#280)

* add fee instruction to claim transaction

* fix versions

Author: tatomir-streamflow

lerna.json

@@ -2,6 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "7.5.0",
+  "version": "7.5.1",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/common",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "Common utilities and types used by streamflow packages.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "./dist/esm/index.js",

packages/distributor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/distributor",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "JavaScript SDK to interact with Streamflow Airdrop protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",

packages/distributor/solana/clients/BaseDistributorClient.ts

@@ -30,7 +30,13 @@ import {
 } from "@solana/spl-token";
 import bs58 from "bs58";
 
-import { DISTRIBUTOR_ADMIN_OFFSET, DISTRIBUTOR_MINT_OFFSET, DISTRIBUTOR_PROGRAM_ID } from "../constants";
+import {
+  AIRDROP_CLAIM_FEE,
+  DISTRIBUTOR_ADMIN_OFFSET,
+  DISTRIBUTOR_MINT_OFFSET,
+  DISTRIBUTOR_PROGRAM_ID,
+  STREAMFLOW_TREASURY_PUBLIC_KEY,
+} from "../constants";
 import {
   IClaimData,
   IClawbackData,
@@ -298,6 +304,8 @@ export default abstract class BaseDistributorClient {
       ixs.push(claimLocked(accounts, this.programId));
     }
 
+    ixs.push(this.prepareClaimFeeInstruction(extParams.invoker.publicKey));
+
     return ixs;
   }
 
@@ -462,6 +470,14 @@ export default abstract class BaseDistributorClient {
     }));
   }
 
+  protected prepareClaimFeeInstruction(payer: PublicKey): TransactionInstruction {
+    return SystemProgram.transfer({
+      fromPubkey: payer,
+      toPubkey: STREAMFLOW_TREASURY_PUBLIC_KEY,
+      lamports: AIRDROP_CLAIM_FEE,
+    });
+  }
+
   protected getNewDistributorArgs(data: ICreateDistributorData): NewDistributorArgs {
     const args = {
       version: new BN(data.version),

packages/distributor/solana/constants.ts

@@ -1,3 +1,4 @@
+import { PublicKey } from "@solana/web3.js";
 import { ICluster } from "@streamflow/common";
 
 export const ANCHOR_DISCRIMINATOR_OFFSET = 8;
@@ -10,6 +11,9 @@ export const TEST_ORACLE_PREFIX = Buffer.from("test-oracle", "utf-8");
 export const CLAIM_STATUS_PREFIX = Buffer.from("ClaimStatus", "utf-8");
 export const ALIGNED_PRECISION_FACTOR_POW = 9;
 
+export const AIRDROP_CLAIM_FEE = BigInt(5_200_000);
+export const STREAMFLOW_TREASURY_PUBLIC_KEY = new PublicKey("5SEpbdjFK5FxwTvfsGMXVQTD2v4M2c5tyRTxhdsPkgDw");
+
 export const ONE_IN_BASIS_POINTS = BigInt(10_000);
 
 export const ALIGNED_DISTRIBUTOR_PROGRAM_ID = {

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/eslint-config",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "license": "ISC",
   "main": "index.js",
   "files": [

packages/launchpad/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/launchpad",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "JavaScript SDK to interact with Streamflow Launchpad protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",

packages/staking/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/staking",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "JavaScript SDK to interact with Streamflow Staking protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",

packages/stream/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/stream",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "JavaScript SDK to interact with Streamflow protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "./dist/esm/index.js",