@zebec-network/zebec-stream-sdk 3.0.0-dev.2 → 3.0.0

package/dist/services/streamService.d.ts

@@ -4,11 +4,12 @@ import { TransactionPayload } from "@zebec-network/solana-common";
 import { type ZebecStreamIdl } from "../artifacts";
 import type { CancelStreamParams, ChangeStreamReceiverParams, CreateStreamParams, InitializeStreamConfigParams, RpcNetwork, StreamConfigInfo, StreamMetadataInfo, TokenMetadata, UpdateStreamConfigParams, WhiteListTokensParams, WithdrawStreamParams } from "../types";
 export declare class ZebecStreamService {
+    readonly streamConfigName: string;
     readonly provider: Provider;
     readonly network: RpcNetwork;
     readonly program: Program<ZebecStreamIdl>;
-    constructor(provider: Provider, network: RpcNetwork, program: Program<ZebecStreamIdl>);
-    static create(provider: Provider, network: RpcNetwork): ZebecStreamService;
+    constructor(streamConfigName: string, provider: Provider, network: RpcNetwork, program: Program<ZebecStreamIdl>);
+    static create(streamConfigName: string, provider: Provider, network: RpcNetwork): ZebecStreamService;
     private _createPayload;
     get connection(): Connection;
     get programId(): PublicKey;
@@ -38,7 +39,7 @@ export declare class ZebecStreamService {
         }[];
         feeVault: PublicKey;
     }): Promise<TransactionInstruction>;
-    getCreateStreamInstruction(feePayer: PublicKey, receiver: PublicKey, senderAta: PublicKey, streamToken: PublicKey, withdrawAccount: PublicKey, sender: PublicKey, streamMetadata: PublicKey, streamData: {
+    getCreateStreamInstruction(streamConfig: PublicKey, feePayer: PublicKey, receiver: PublicKey, senderAta: PublicKey, streamToken: PublicKey, withdrawAccount: PublicKey, sender: PublicKey, streamMetadata: PublicKey, streamData: {
         amount: BN;
         automaticWithdrawal: boolean;
         cancelableByRecipient: boolean;
@@ -58,7 +59,7 @@ export declare class ZebecStreamService {
     getPauseResumeStreamInstruction(streamMetadata: PublicKey, user: PublicKey): Promise<TransactionInstruction>;
     getCancelStreamInstruction(feePayer: PublicKey, otherParty: PublicKey, otherPartyAta: PublicKey, signer: PublicKey, signerAta: PublicKey, streamMetadata: PublicKey, streamToken: PublicKey, streamVault: PublicKey, streamVaultAta: PublicKey): Promise<TransactionInstruction>;
     getWithdrawStreamInstruction(receiver: PublicKey, receiverAta: PublicKey, streamMetadata: PublicKey, streamToken: PublicKey, streamVault: PublicKey, streamVaultAta: PublicKey, withdrawer: PublicKey, feePayer: PublicKey): Promise<TransactionInstruction>;
-    getWhitelistTokensInstruction(admin: PublicKey, tokens: PublicKey[]): Promise<TransactionInstruction>;
+    getWhitelistTokensInstruction(admin: PublicKey, streamConfig: PublicKey, tokens: PublicKey[]): Promise<TransactionInstruction>;
     getChangeStreamReceiverInstruction(streamMetadata: PublicKey, newRecipient: PublicKey, signer: PublicKey): Promise<TransactionInstruction>;
     initializeStreamConfig(params: InitializeStreamConfigParams): Promise<TransactionPayload>;
     updateStreamConfig(params: UpdateStreamConfigParams): Promise<TransactionPayload>;

package/dist/services/streamService.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZebecStreamService = void 0;
+const assert_1 = __importDefault(require("assert"));
+const bignumber_js_1 = require("bignumber.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
 const umi_bundle_defaults_1 = require("@metaplex-foundation/umi-bundle-defaults");
@@ -12,22 +14,22 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const core_utils_1 = require("@zebec-network/core-utils");
 const solana_common_1 = require("@zebec-network/solana-common");
-const assert_1 = __importDefault(require("assert"));
-const bignumber_js_1 = require("bignumber.js");
 const artifacts_1 = require("../artifacts");
 const constants_1 = require("../constants");
 const pda_1 = require("../pda");
 const utils_1 = require("../utils");
 class ZebecStreamService {
+    streamConfigName;
     provider;
     network;
     program;
-    constructor(provider, network, program) {
+    constructor(streamConfigName, provider, network, program) {
+        this.streamConfigName = streamConfigName;
         this.provider = provider;
         this.network = network;
         this.program = program;
     }
-    static create(provider, network) {
+    static create(streamConfigName, provider, network) {
         const connection = provider.connection;
         const rpcEndpoint = connection.rpcEndpoint;
         const connNetwork = rpcEndpoint.includes("devnet")
@@ -42,7 +44,7 @@ class ZebecStreamService {
             throw new Error(`InvalidOperation: Network mismatch. network and connection network should be same. network: ${network}, connection: ${connNetwork}`);
         }
         const program = new anchor_1.Program(artifacts_1.ZEBEC_STREAM_IDL, provider);
-        return new ZebecStreamService(provider, network, program);
+        return new ZebecStreamService(streamConfigName, provider, network, program);
     }
     async _createPayload(payerKey, instructions, signers, addressLookupTableAccounts) {
         const errorMap = new Map();
@@ -101,7 +103,7 @@ class ZebecStreamService {
         })
             .instruction();
     }
-    async getCreateStreamInstruction(feePayer, receiver, senderAta, streamToken, withdrawAccount, sender, streamMetadata, streamData) {
+    async getCreateStreamInstruction(streamConfig, feePayer, receiver, senderAta, streamToken, withdrawAccount, sender, streamMetadata, streamData) {
         (0, assert_1.default)(streamData.streamName.length === constants_1.STREAM_NAME_BUFFER_SIZE, `Stream name buffer must be of size ${constants_1.STREAM_NAME_BUFFER_SIZE}`);
         return this.program.methods
             .createStream({
@@ -129,6 +131,7 @@ class ZebecStreamService {
             withdrawAccount,
             sender,
             streamMetadata,
+            streamConfig,
         })
             .instruction();
     }
@@ -172,13 +175,14 @@ class ZebecStreamService {
         })
             .instruction();
     }
-    async getWhitelistTokensInstruction(admin, tokens) {
+    async getWhitelistTokensInstruction(admin, streamConfig, tokens) {
         return this.program.methods
             .whitelistTokens({
             tokens,
         })
-            .accounts({
+            .accountsPartial({
             admin,
+            streamConfig,
         })
             .instruction();
     }
@@ -197,7 +201,7 @@ class ZebecStreamService {
         if (!admin) {
             throw new Error("Either provide admin or create provider with public key");
         }
-        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(params.config.configName, this.programId);
+        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamConfigName, this.programId);
         const baseFee = new anchor_1.BN((0, core_utils_1.percentToBps)(params.config.baseFeePercent));
         const frequencies = params.config.frequencies.map((frequency) => new anchor_1.BN(frequency));
         const platformFee = new anchor_1.BN((0, core_utils_1.percentToBps)(params.config.platformFeePercent));
@@ -216,7 +220,7 @@ class ZebecStreamService {
             platformFee,
             withdrawAccount,
             feeTiers,
-            configName: params.config.configName,
+            configName: this.streamConfigName,
             feeVault,
         });
         return this._createPayload(admin, [ix]);
@@ -226,7 +230,7 @@ class ZebecStreamService {
         if (!admin) {
             throw new Error("Either provide admin or create provider with public key");
         }
-        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(params.config.configName, this.programId);
+        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamConfigName, this.programId);
         const baseFee = new anchor_1.BN((0, core_utils_1.percentToBps)(params.config.baseFeePercent));
         const frequencies = params.config.frequencies.map((frequency) => new anchor_1.BN(frequency));
         const platformFee = new anchor_1.BN((0, core_utils_1.percentToBps)(params.config.platformFeePercent));
@@ -245,7 +249,7 @@ class ZebecStreamService {
             platformFee,
             withdrawAccount,
             feeTiers,
-            configName: params.config.configName,
+            configName: this.streamConfigName,
             feeVault,
         });
         return this._createPayload(admin, [ix]);
@@ -255,7 +259,7 @@ class ZebecStreamService {
         const sender = (0, anchor_1.translateAddress)(params.sender);
         const feePayer = params.feePayer ? (0, anchor_1.translateAddress)(params.feePayer) : sender;
         const streamToken = (0, anchor_1.translateAddress)(params.streamToken);
-        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(params.configName, this.programId);
+        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamConfigName, this.programId);
         const streamConfigAccount = await this.program.account.streamConfig.fetch(streamConfig);
         const withdrawer = streamConfigAccount.withdrawAccount;
         const autoWithdrawFrequencies = new Set(Array.from(streamConfigAccount.frequencies.map((f) => f.toNumber())));
@@ -292,7 +296,7 @@ class ZebecStreamService {
         // add instruction to transfer fee to fee vault
         const transferFeeToVaultIx = (0, spl_token_1.createTransferInstruction)(senderFeeTokenAta, feeVaultAta, sender, BigInt(parsedFeeAmount));
         ixs.push(transferFeeToVaultIx);
-        const createStreamIx = await this.getCreateStreamInstruction(feePayer, receiver, senderAta, streamToken, withdrawer, sender, streamMetadataKeypair.publicKey, {
+        const createStreamIx = await this.getCreateStreamInstruction(streamConfig, feePayer, receiver, senderAta, streamToken, withdrawer, sender, streamMetadataKeypair.publicKey, {
             amount: new anchor_1.BN(amount),
             automaticWithdrawal: params.automaticWithdrawal,
             cancelableByRecipient: params.cancelableByRecipient,
@@ -359,8 +363,9 @@ class ZebecStreamService {
     }
     async whiteListTokens(params) {
         const admin = (0, anchor_1.translateAddress)(params.admin);
+        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamConfigName, this.programId);
         const tokens = params.tokens.map((token) => (0, anchor_1.translateAddress)(token));
-        const ix = await this.getWhitelistTokensInstruction(admin, tokens);
+        const ix = await this.getWhitelistTokensInstruction(admin, streamConfig, tokens);
         return this._createPayload(admin, [ix]);
     }
     async changeStreamReceiver(params) {

package/dist/types.d.ts

@@ -63,7 +63,6 @@ export type TokenMetadata = {
     } | null;
 };
 export type CreateStreamParams = {
-    configName: string;
     feePayer?: Address;
     receiver: Address;
     sender: Address;
@@ -95,7 +94,6 @@ export type InitializeStreamConfigParams = {
         frequencies: number[];
         platformFeePercent: Numeric;
         withdrawAccount: Address;
-        configName: string;
         feeTiers: FeeTier[];
         feeVault: Address;
     };
@@ -112,7 +110,6 @@ export type UpdateStreamConfigParams = {
         frequencies: number[];
         platformFeePercent: Numeric;
         withdrawAccount: Address;
-        configName: string;
         feeTiers: FeeTier[];
         feeVault: Address;
     };

package/dist/utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTokenUsdPrice = getTokenUsdPrice;
 exports.calculateFeeTokenAmountForStream = calculateFeeTokenAmountForStream;
 exports.getFeeRateForUsdAmount = getFeeRateForUsdAmount;
+const bignumber_js_1 = require("bignumber.js");
 const core_utils_1 = require("@zebec-network/core-utils");
 const constants_1 = require("./constants");
 async function getTokenUsdPrice(tokenSymbol, network) {
@@ -25,14 +26,14 @@ async function calculateFeeTokenAmountForStream(streamTokenSymbol, streamTokenAm
     if (oneFeeTokenPriceInUsd === 0) {
         throw new Error(`Fee token price is zero for symbol: ${feeTokenSymbol}, network: ${network}`);
     }
-    const streamTokenAmountUsdPrice = new BigNumber(streamTokenAmount).times(oneStreamTokenPriceInUsd);
+    const streamTokenAmountUsdPrice = new bignumber_js_1.BigNumber(streamTokenAmount).times(oneStreamTokenPriceInUsd);
     const feeRateInBps = getFeeRateForUsdAmount(streamTokenAmountUsdPrice, feeTiers);
     const feeAmountUsdPrice = streamTokenAmountUsdPrice.times(feeRateInBps).div(10000);
     const feeTokenAmount = feeAmountUsdPrice.div(oneFeeTokenPriceInUsd);
     return feeTokenAmount;
 }
 function getFeeRateForUsdAmount(amount, feeTiers) {
-    feeTiers.sort((a, b) => BigNumber(a.minThreshold).comparedTo(BigNumber(b.minThreshold)) ?? 0);
+    feeTiers.sort((a, b) => (0, bignumber_js_1.BigNumber)(a.minThreshold).comparedTo((0, bignumber_js_1.BigNumber)(b.minThreshold)) ?? 0);
     const tier = feeTiers.find((tier) => amount.gte(tier.minThreshold) && amount.lt(tier.maxThreshold));
     if (!tier) {
         throw new Error(`No fee tier found for amount: ${amount}`);

package/package.json

@@ -40,5 +40,5 @@
     "test:single": "ts-mocha -p ./tsconfig.json -t 1000000000"
   },
   "types": "dist/index.d.ts",
-  "version": "3.0.0-dev.2"
+  "version": "3.0.0"
 }