@zebec-network/zebec-vault-sdk 5.1.2 → 5.2.0-dev.1

package/dist/service.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZebecVaultService = void 0;
-const assert_1 = __importDefault(require("assert"));
-const bignumber_js_1 = require("bignumber.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
@@ -14,6 +12,8 @@ const solana_common_1 = require("@zebec-network/solana-common");
 const zebec_card_v2_sdk_1 = require("@zebec-network/zebec-card-v2-sdk");
 const zebec_stake_sdk_1 = require("@zebec-network/zebec-stake-sdk");
 const zebec_stream_sdk_1 = require("@zebec-network/zebec-stream-sdk");
+const assert_1 = __importDefault(require("assert"));
+const bignumber_js_1 = require("bignumber.js");
 const artifacts_1 = require("./artifacts");
 const constants_1 = require("./constants");
 const errors_1 = require("./errors");
@@ -247,15 +247,13 @@ class ZebecVaultService {
         const decimals = await (0, solana_common_1.getMintDecimals)(this.provider.connection, tokenMint);
         const amount = new anchor_1.BN((0, solana_common_1.parseToken)(params.amount, decimals).toString());
         const instructions = [];
-        const wsolTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(solana_common_1.WSOL, // mint (Wrapped SOL)
+        const withdrawerTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(tokenMint, // mint
         withdrawer, // owner
         true);
-        if (isSolUnwrapNeeded) {
-            const wsolAccountInfo = await this.connection.getAccountInfo(wsolTokenAccount, this.connection.commitment);
-            if (!wsolAccountInfo) {
-                const createWsolAccountIx = (0, solana_common_1.createAssociatedTokenAccountInstruction)(withdrawer, wsolTokenAccount, withdrawer, solana_common_1.WSOL);
-                instructions.push(createWsolAccountIx);
-            }
+        const tokenAccountInfo = await this.connection.getAccountInfo(withdrawerTokenAccount, this.connection.commitment);
+        if (!tokenAccountInfo) {
+            const createTokenAccountIx = (0, solana_common_1.createAssociatedTokenAccountInstruction)(withdrawer, withdrawerTokenAccount, withdrawer, tokenMint);
+            instructions.push(createTokenAccountIx);
         }
         const ix = await this.getWithdrawTokenInstruction(withdrawer, tokenMint, amount, decimals);
         instructions.push(ix);
@@ -583,7 +581,7 @@ class ZebecVaultService {
         }
     }
     async getNextCardIndex() {
-        const [cardConfig] = (0, pda_1.deriveCardConfigPda)(this.cardV2Program.programId);
+        const [cardConfig] = (0, zebec_card_v2_sdk_1.deriveCardConfigPda)(this.cardV2Program.programId);
         const decoded = await this.cardV2Program.account.card.fetch(cardConfig, "confirmed");
         return BigInt(decoded.index.addn(1).toString());
     }
@@ -597,8 +595,8 @@ class ZebecVaultService {
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
         const usdcMint = (0, anchor_1.translateAddress)(params.usdcAddress);
         const amount = (0, bignumber_js_1.BigNumber)(params.amount);
-        const [cardConfig] = (0, pda_1.deriveCardConfigPda)(this.cardV2Program.programId);
-        const [userPurchaseRecord] = (0, pda_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2Program.programId);
+        const [cardConfig] = (0, zebec_card_v2_sdk_1.deriveCardConfigPda)(this.cardV2Program.programId);
+        const [userPurchaseRecord] = (0, zebec_card_v2_sdk_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2Program.programId);
         const cardConfigInfo = await this.cardV2Program.account.card.fetch(cardConfig, "confirmed");
         const cardVault = cardConfigInfo.cardVault;
         const revenueVault = cardConfigInfo.revenueVault;
@@ -644,8 +642,8 @@ class ZebecVaultService {
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
         const usdcMint = (0, anchor_1.translateAddress)(params.usdcAddress);
         const amount = (0, bignumber_js_1.BigNumber)(params.amount);
-        const [cardConfig] = (0, pda_1.deriveCardConfigPda)(this.cardV2Program.programId);
-        const [userPurchaseRecord] = (0, pda_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2Program.programId);
+        const [cardConfig] = (0, zebec_card_v2_sdk_1.deriveCardConfigPda)(this.cardV2Program.programId);
+        const [userPurchaseRecord] = (0, zebec_card_v2_sdk_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2Program.programId);
         const cardConfigInfo = await this.cardV2Program.account.card.fetch(cardConfig, "confirmed");
         const cardVault = cardConfigInfo.cardVault;
         const revenueVault = cardConfigInfo.revenueVault;
@@ -693,8 +691,8 @@ class ZebecVaultService {
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
         const inputMint = (0, anchor_1.translateAddress)(quoteInfo.inputMint);
         const usdc = (0, anchor_1.translateAddress)(quoteInfo.outputMint);
-        const [userPurchaseRecord] = (0, pda_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2ProgramId);
-        const [cardConfig] = (0, pda_1.deriveCardConfigPda)(this.cardV2ProgramId);
+        const [userPurchaseRecord] = (0, zebec_card_v2_sdk_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2ProgramId);
+        const [cardConfig] = (0, zebec_card_v2_sdk_1.deriveCardConfigPda)(this.cardV2ProgramId);
         const cardConfigInfo = await this.cardV2Program.account.card.fetch(cardConfig, this.connection.commitment);
         const revenueVault = cardConfigInfo.revenueVault;
         const cardVault = cardConfigInfo.cardVault;
@@ -712,7 +710,7 @@ class ZebecVaultService {
         if (!inputMint.equals(solana_common_1.WSOL) || !isSolWrapUnwrapNeeded) {
             const userInputMintAtaInfo = await this.connection.getAccountInfo(userInputMintAta, this.connection.commitment);
             if (!userInputMintAtaInfo) {
-                throw new errors_1.AssociatedTokenAccountDoesNotExistsError("User doesn't have associated token account of input mint: " + inputMint.toString());
+                throw new errors_1.AssociatedTokenAccountDoesNotExistsError(`User doesn't have associated token account of input mint: ${inputMint.toString()}`);
             }
             const resAndCtx = await this.connection.getTokenAccountBalance(userInputMintAta, this.connection.commitment);
             const balance = resAndCtx.value.amount;
@@ -754,15 +752,25 @@ class ZebecVaultService {
         const transaction = web3_js_1.VersionedTransaction.deserialize(swapTransactionBuf);
         // get address lookup table accounts
         const addressLookupTableAccounts = await Promise.all(transaction.message.addressTableLookups.map(async (lookup) => {
-            const data = await this.connection.getAccountInfo(lookup.accountKey).then((res) => res.data);
+            const data = await this.connection.getAccountInfo(lookup.accountKey).then((res) => {
+                if (!res) {
+                    throw new Error(`Lookup table account not found for key: ${(0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]).toString()}`);
+                }
+                return res.data;
+            });
             return new web3_js_1.AddressLookupTableAccount({
                 key: lookup.accountKey,
                 state: web3_js_1.AddressLookupTableAccount.deserialize(data),
             });
         }));
-        const lookupTableData = await new web3_js_1.Connection((0, web3_js_1.clusterApiUrl)("devnet"))
+        const lookupTableData = await this.connection
             .getAccountInfo((0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]))
-            .then((res) => res.data);
+            .then((res) => {
+            if (!res) {
+                throw new Error(`Lookup table account not found for key: ${(0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]).toString()}`);
+            }
+            return res.data;
+        });
         addressLookupTableAccounts.push(new web3_js_1.AddressLookupTableAccount({
             key: (0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]),
             state: web3_js_1.AddressLookupTableAccount.deserialize(lookupTableData),
@@ -797,8 +805,8 @@ class ZebecVaultService {
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
         const inputMint = (0, anchor_1.translateAddress)(quoteInfo.inputMint);
         const usdc = (0, anchor_1.translateAddress)(quoteInfo.outputMint);
-        const [userPurchaseRecord] = (0, pda_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2ProgramId);
-        const [cardConfig] = (0, pda_1.deriveCardConfigPda)(this.cardV2ProgramId);
+        const [userPurchaseRecord] = (0, zebec_card_v2_sdk_1.deriveUserPurchaseRecordPda)(vaultSigner, this.cardV2ProgramId);
+        const [cardConfig] = (0, zebec_card_v2_sdk_1.deriveCardConfigPda)(this.cardV2ProgramId);
         const cardConfigInfo = await this.cardV2Program.account.card.fetch(cardConfig, this.connection.commitment);
         const revenueVault = cardConfigInfo.revenueVault;
         const cardVault = cardConfigInfo.cardVault;
@@ -858,15 +866,25 @@ class ZebecVaultService {
         const transaction = web3_js_1.VersionedTransaction.deserialize(swapTransactionBuf);
         // get address lookup table accounts
         const addressLookupTableAccounts = await Promise.all(transaction.message.addressTableLookups.map(async (lookup) => {
-            const data = await this.connection.getAccountInfo(lookup.accountKey).then((res) => res.data);
+            const data = await this.connection.getAccountInfo(lookup.accountKey).then((res) => {
+                if (!res) {
+                    throw new Error(`Lookup table account not found for key: ${lookup.accountKey.toString()}`);
+                }
+                return res.data;
+            });
             return new web3_js_1.AddressLookupTableAccount({
                 key: lookup.accountKey,
                 state: web3_js_1.AddressLookupTableAccount.deserialize(data),
             });
         }));
-        const lookupTableData = await new web3_js_1.Connection((0, web3_js_1.clusterApiUrl)("devnet"))
+        const lookupTableData = await this.connection
             .getAccountInfo((0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]))
-            .then((res) => res.data);
+            .then((res) => {
+            if (!res) {
+                throw new Error(`Lookup table account not found for key: ${(0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]).toString()}`);
+            }
+            return res.data;
+        });
         addressLookupTableAccounts.push(new web3_js_1.AddressLookupTableAccount({
             key: (0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]),
             state: web3_js_1.AddressLookupTableAccount.deserialize(lookupTableData),
@@ -892,7 +910,7 @@ class ZebecVaultService {
         return this._createTransactionPayload(vaultOwner, otherIxs, [], addressLookupTableAccounts);
     }
     async getCardCustomTokenFees() {
-        const [tokeFeeMapPda] = (0, pda_1.deriveTokenFeeMapPda)(this.cardV2ProgramId);
+        const [tokeFeeMapPda] = (0, zebec_card_v2_sdk_1.deriveTokenFeeMapPda)(this.cardV2ProgramId);
         const decoded = await this.cardV2Program.account.customFeeMap.fetch(tokeFeeMapPda, this.connection.commitment);
         const tokenFeeList = decoded.feeMap.map((item) => ({
             tokenAddress: item.tokenAddress,
@@ -900,6 +918,21 @@ class ZebecVaultService {
         }));
         return tokenFeeList;
     }
+    async getTransfeFeesForStreamInstruction(streamConfig, feeVault, tokenMint, vaultOwner, feeVaultTokenAccount, vault, vaultSigner, vaultSignerTokenAccount, data) {
+        return this.vaultV1Program.methods
+            .transferFees({ decimals: data.decimals, feeAmount: data.feeAmount })
+            .accountsPartial({
+            streamConfig,
+            feeVault,
+            tokenMint,
+            vaultOwner,
+            feeVaultTokenAccount,
+            vault,
+            vaultSigner,
+            vaultSignerTokenAccount,
+        })
+            .instruction();
+    }
     async getCreateStreamFromVaultInstruction(vaultOwner, vault, vaultSigner, vaultSignerAta, receiver, receiverAta, streamToken, streamMetadata, streamConfig, withdrawAccount, streamVault, streamVaultAta, zebecStreamProgram, streamData) {
         return this.vaultV1Program.methods
             .createStream({
@@ -986,6 +1019,19 @@ class ZebecVaultService {
         })
             .instruction();
     }
+    async getTransferFeesForStreamInstruction(feeVault, tokenMint, vaultOwner, feeVaultTokenAccount, vault, vaultSigner, vaultSignerTokenAccount, data) {
+        return this.vaultV1Program.methods
+            .transferFees({ decimals: data.decimals, feeAmount: data.feeAmount })
+            .accountsPartial({
+            feeVault,
+            tokenMint,
+            vaultOwner,
+            feeVaultTokenAccount,
+            vault,
+            vaultSigner,
+            vaultSignerTokenAccount,
+        });
+    }
     async createStreamFromVault(params) {
         const vaultOwner = (0, anchor_1.translateAddress)(params.vaultOwner);
         const [vault] = (0, pda_1.deriveUserVault)(vaultOwner, this.vaultV1ProgramId);
@@ -996,15 +1042,28 @@ class ZebecVaultService {
         const streamToken = (0, anchor_1.translateAddress)(params.streamToken);
         const vaultSignerAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, vaultSigner, true);
         const receiverVaultSignerAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, receiverVaultSigner, true);
-        const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamProgramId);
+        const [streamConfig] = (0, zebec_stream_sdk_1.deriveStreamConfigPda)(params.streamConfigName, this.streamProgramId);
         const streamConfigInfo = await this.streamProgram.account.streamConfig.fetch(streamConfig, this.connection.commitment);
         const withdrawAccount = streamConfigInfo.withdrawAccount;
         const streamMetatdataKeypair = params.streamMetadataKeypair ?? web3_js_1.Keypair.generate();
         const streamMetadata = streamMetatdataKeypair.publicKey;
-        const [streamVault] = (0, pda_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
+        const [streamVault] = (0, zebec_stream_sdk_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
         const streamVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, streamVault, true);
         const streamTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, streamToken);
-        const amount = new anchor_1.BN((0, bignumber_js_1.BigNumber)(params.amount).times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals)).toFixed(0));
+        const amount = (0, bignumber_js_1.BigNumber)(params.amount).times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals)).toFixed(0);
+        const feeInfo = await (0, zebec_stream_sdk_1.getFeeInfoForStream)(streamToken, amount, streamTokenDecimals, this.network);
+        const feeToken = (0, anchor_1.translateAddress)(feeInfo.feeToken.mintAddress);
+        const feeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, feeToken);
+        const parsedFeeAmount = feeInfo.feeAmountRaw;
+        const feeVault = streamConfigInfo.feeVault;
+        const feeVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(feeToken, feeVault, true);
+        const vaultSignerFeeTokenAta = (0, solana_common_1.getAssociatedTokenAddressSync)(feeToken, vaultSigner, true);
+        const ixs = [];
+        const transferFeesIx = await this.getTransfeFeesForStreamInstruction(streamConfig, feeVault, feeToken, vaultOwner, feeVaultAta, vault, vaultSigner, vaultSignerFeeTokenAta, {
+            decimals: feeTokenDecimals,
+            feeAmount: new anchor_1.BN(parsedFeeAmount),
+        });
+        ixs.push(transferFeesIx);
         const cliffPercentage = new anchor_1.BN((0, core_utils_1.percentToBps)(params.cliffPercentage));
         const STREAM_NAME_BUFFER_SIZE = 128;
         const streamNameArray = new Uint8Array(STREAM_NAME_BUFFER_SIZE);
@@ -1013,8 +1072,8 @@ class ZebecVaultService {
         if (params.automaticWithdrawal && autoWithdrawFrequency <= 0) {
             throw new Error("autoWithdrawFrequency must be greater than 0 when automaticWithdrawal is enabled");
         }
-        const ix = await this.getCreateStreamFromVaultInstruction(vaultOwner, vault, vaultSigner, vaultSignerAta, receiverVaultSigner, receiverVaultSignerAta, streamToken, streamMetadata, streamConfig, withdrawAccount, streamVault, streamVaultAta, this.streamProgramId, {
-            amount,
+        const createStreamIx = await this.getCreateStreamFromVaultInstruction(vaultOwner, vault, vaultSigner, vaultSignerAta, receiverVaultSigner, receiverVaultSignerAta, streamToken, streamMetadata, streamConfig, withdrawAccount, streamVault, streamVaultAta, this.streamProgramId, {
+            amount: new anchor_1.BN(amount),
             automaticWithdrawal: params.automaticWithdrawal,
             autoWithdrawFrequency: new anchor_1.BN(autoWithdrawFrequency),
             cancelableByRecipient: params.cancelableByRecipient,
@@ -1031,12 +1090,35 @@ class ZebecVaultService {
             transferableByRecipient: params.transferableByRecipient,
             transferableBySender: params.transferableBySender,
         });
-        return this._createTransactionPayload(vaultOwner, [ix], [streamMetatdataKeypair]);
+        const lookupTable = zebec_stream_sdk_1.STREAM_PROGRAM_LOOKUP_TABLE_ADDRESS[this.network];
+        const lookupTableData = await this.connection.getAccountInfo((0, anchor_1.translateAddress)(lookupTable)).then((res) => {
+            if (!res) {
+                throw new Error(`Lookup table account not found for key: ${(0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]).toString()}`);
+            }
+            return res.data;
+        });
+        const addressLookupTableAccount = new web3_js_1.AddressLookupTableAccount({
+            key: (0, anchor_1.translateAddress)(lookupTable),
+            state: web3_js_1.AddressLookupTableAccount.deserialize(lookupTableData),
+        });
+        ixs.push(createStreamIx);
+        return this._createTransactionPayload(vaultOwner, ixs, [streamMetatdataKeypair], [addressLookupTableAccount]);
     }
     async createMultipleStreamFromVault(params) {
         const vaultOwner = (0, anchor_1.translateAddress)(params.vaultOwner);
         const [vault] = (0, pda_1.deriveUserVault)(vaultOwner, this.vaultV1ProgramId);
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
+        const lookupTable = zebec_stream_sdk_1.STREAM_PROGRAM_LOOKUP_TABLE_ADDRESS[this.network];
+        const lookupTableData = await this.connection.getAccountInfo((0, anchor_1.translateAddress)(lookupTable)).then((res) => {
+            if (!res) {
+                throw new Error(`Lookup table account not found for key: ${(0, anchor_1.translateAddress)(constants_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]).toString()}`);
+            }
+            return res.data;
+        });
+        const addressLookupTableAccount = new web3_js_1.AddressLookupTableAccount({
+            key: (0, anchor_1.translateAddress)(lookupTable),
+            state: web3_js_1.AddressLookupTableAccount.deserialize(lookupTableData),
+        });
         const transactionArtifacts = await Promise.all(params.streamInfo.map(async (info) => {
             const receiver = (0, anchor_1.translateAddress)(info.receiver);
             const [receiverVault] = (0, pda_1.deriveUserVault)(receiver, this.vaultV1ProgramId);
@@ -1044,15 +1126,28 @@ class ZebecVaultService {
             const streamToken = (0, anchor_1.translateAddress)(info.streamToken);
             const vaultSignerAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, vaultSigner, true);
             const receiverVaultSignerAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, receiverVaultSigner, true);
-            const [streamConfig] = (0, pda_1.deriveStreamConfigPda)(this.streamProgramId);
+            const [streamConfig] = (0, zebec_stream_sdk_1.deriveStreamConfigPda)(params.streamConfigName, this.streamProgramId);
             const streamConfigInfo = await this.streamProgram.account.streamConfig.fetch(streamConfig, this.connection.commitment);
             const withdrawAccount = streamConfigInfo.withdrawAccount;
             const streamMetatdataKeypair = info.streamMetadataKeypair ?? web3_js_1.Keypair.generate();
             const streamMetadata = streamMetatdataKeypair.publicKey;
-            const [streamVault] = (0, pda_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
+            const [streamVault] = (0, zebec_stream_sdk_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
             const streamVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, streamVault, true);
             const streamTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, streamToken);
-            const amount = new anchor_1.BN((0, bignumber_js_1.BigNumber)(info.amount).times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals)).toFixed(0));
+            const amount = (0, bignumber_js_1.BigNumber)(info.amount).times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals)).toFixed(0);
+            const feeInfo = await (0, zebec_stream_sdk_1.getFeeInfoForStream)(streamToken, amount, streamTokenDecimals, this.network);
+            const feeToken = (0, anchor_1.translateAddress)(feeInfo.feeToken.mintAddress);
+            const feeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, feeToken);
+            const parsedFeeAmount = feeInfo.feeAmountRaw;
+            const feeVault = streamConfigInfo.feeVault;
+            const feeVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(feeToken, feeVault, true);
+            const vaultSignerFeeTokenAta = (0, solana_common_1.getAssociatedTokenAddressSync)(feeToken, vaultSigner, true);
+            const ixs = [];
+            const transferFeesIx = await this.getTransfeFeesForStreamInstruction(streamConfig, feeVault, feeToken, vaultOwner, feeVaultAta, vault, vaultSigner, vaultSignerFeeTokenAta, {
+                decimals: feeTokenDecimals,
+                feeAmount: new anchor_1.BN(parsedFeeAmount),
+            });
+            ixs.push(transferFeesIx);
             const cliffPercentage = new anchor_1.BN((0, core_utils_1.percentToBps)(info.cliffPercentage));
             const STREAM_NAME_BUFFER_SIZE = 128;
             const streamNameArray = new Uint8Array(STREAM_NAME_BUFFER_SIZE);
@@ -1061,8 +1156,8 @@ class ZebecVaultService {
             if (info.automaticWithdrawal && autoWithdrawFrequency <= 0) {
                 throw new Error("autoWithdrawFrequency must be greater than 0 when automaticWithdrawal is enabled");
             }
-            const ix = await this.getCreateStreamFromVaultInstruction(vaultOwner, vault, vaultSigner, vaultSignerAta, receiverVaultSigner, receiverVaultSignerAta, streamToken, streamMetadata, streamConfig, withdrawAccount, streamVault, streamVaultAta, this.streamProgramId, {
-                amount,
+            const createStreamIx = await this.getCreateStreamFromVaultInstruction(vaultOwner, vault, vaultSigner, vaultSignerAta, receiverVaultSigner, receiverVaultSignerAta, streamToken, streamMetadata, streamConfig, withdrawAccount, streamVault, streamVaultAta, this.streamProgramId, {
+                amount: new anchor_1.BN(amount),
                 automaticWithdrawal: info.automaticWithdrawal,
                 autoWithdrawFrequency: new anchor_1.BN(autoWithdrawFrequency),
                 cancelableByRecipient: info.cancelableByRecipient,
@@ -1079,9 +1174,11 @@ class ZebecVaultService {
                 transferableByRecipient: info.transferableByRecipient,
                 transferableBySender: info.transferableBySender,
             });
+            ixs.push(createStreamIx);
             return {
-                instructions: [ix],
+                instructions: ixs,
                 signers: [streamMetatdataKeypair],
+                addressLookupTableAccounts: [addressLookupTableAccount],
             };
         }));
         return this._createMultiTransactionPayload(vaultOwner, transactionArtifacts);
@@ -1111,7 +1208,7 @@ class ZebecVaultService {
         const feePayer = vaultOwner;
         const userAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, vaultSigner, true);
         const otherPartyAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, otherParty, true);
-        const [streamVault] = (0, pda_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
+        const [streamVault] = (0, zebec_stream_sdk_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
         const streamVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, streamVault, true);
         const ix = await this.getCancelStreamInstruction(feePayer, otherParty, otherPartyAta, vaultSigner, userAta, streamMetadata, streamToken, streamVault, streamVaultAta);
         const actions = [(0, utils_1.transactionInstructionToPropoalAction)(ix)];
@@ -1208,7 +1305,7 @@ class ZebecVaultService {
         const streamMetadataAccount = await this.streamProgram.account.paymentStream.fetch(streamMetadata);
         const streamToken = streamMetadataAccount.financials.streamToken;
         const vaultSignerAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, vaultSigner, true);
-        const [streamVault] = (0, pda_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
+        const [streamVault] = (0, zebec_stream_sdk_1.deriveStreamVaultPda)(streamMetadata, this.streamProgramId);
         const streamVaultAta = (0, solana_common_1.getAssociatedTokenAddressSync)(streamToken, streamVault, true);
         const ix = await this.getWithdrawStreamInstruction(vaultSigner, vaultSignerAta, streamMetadata, streamToken, streamVault, streamVaultAta, withdrawer, feePayer);
         const actions = [(0, utils_1.transactionInstructionToPropoalAction)(ix)];
@@ -1315,7 +1412,7 @@ class ZebecVaultService {
         const feePayer = vaultOwner;
         const [vault] = (0, pda_1.deriveUserVault)(vaultOwner, this.vaultV1ProgramId);
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
-        const lockup = (0, pda_1.deriveLockupAddress)(params.lockupName, this.stakeProgramId);
+        const lockup = (0, zebec_stake_sdk_1.deriveLockupAddress)(params.lockupName, this.stakeProgramId);
         const lockupAccount = await this.stakeProgram.account.lockup.fetchNullable(lockup, this.connection.commitment);
         if (!lockupAccount) {
             throw new Error("Lockup account does not exists for address: " + lockup);
@@ -1325,14 +1422,14 @@ class ZebecVaultService {
             throw new Error("Invalid lockperiod. Available options are: " + lockPeriods.map((l) => l.toString()).concat(", "));
         }
         const stakeToken = lockupAccount.stakedToken.tokenAddress;
-        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.stakeProgramId);
-        const userNonce = (0, pda_1.deriveUserNonceAddress)(vaultSigner, lockup, this.stakeProgramId);
+        const stakeVault = (0, zebec_stake_sdk_1.deriveStakeVaultAddress)(lockup, this.stakeProgramId);
+        const userNonce = (0, zebec_stake_sdk_1.deriveUserNonceAddress)(vaultSigner, lockup, this.stakeProgramId);
         const userNonceAccount = await this.stakeProgram.account.userNonce.fetchNullable(userNonce, this.connection.commitment);
         let nonce = BigInt(0);
         if (userNonceAccount) {
             nonce = BigInt(userNonceAccount.nonce.toString());
         }
-        const stakePda = (0, pda_1.deriveStakeAddress)(vaultSigner, lockup, nonce, this.stakeProgramId);
+        const stakePda = (0, zebec_stake_sdk_1.deriveStakeAddress)(vaultSigner, lockup, nonce, this.stakeProgramId);
         const stakeVaultTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, stakeVault, true);
         const stakeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, stakeToken);
         const UNITS_PER_STAKE_TOKEN = solana_common_1.TEN_BIGNUM.pow(stakeTokenDecimals);
@@ -1369,17 +1466,17 @@ class ZebecVaultService {
         const [vault] = (0, pda_1.deriveUserVault)(vaultOwner, this.vaultV1ProgramId);
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
         const feePayer = vaultOwner;
-        const lockup = (0, pda_1.deriveLockupAddress)(params.lockupName, this.stakeProgramId);
+        const lockup = (0, zebec_stake_sdk_1.deriveLockupAddress)(params.lockupName, this.stakeProgramId);
         const lockupAccount = await this.stakeProgram.account.lockup.fetchNullable(lockup, this.connection.commitment);
         if (!lockupAccount) {
-            throw new Error("Lockup account does not exists for address: " + lockup);
+            throw new Error(`Lockup account does not exists for address: ${lockup}`);
         }
         const stakeToken = lockupAccount.stakedToken.tokenAddress;
         const rewardToken = lockupAccount.rewardToken.tokenAddress;
         const feeVault = lockupAccount.feeInfo.feeVault;
-        const stakePda = (0, pda_1.deriveStakeAddress)(vaultSigner, lockup, params.nonce, this.stakeProgramId);
-        const rewardVault = (0, pda_1.deriveRewardVaultAddress)(lockup, this.stakeProgramId);
-        const stakeVault = (0, pda_1.deriveStakeVaultAddress)(lockup, this.stakeProgramId);
+        const stakePda = (0, zebec_stake_sdk_1.deriveStakeAddress)(vaultSigner, lockup, params.nonce, this.stakeProgramId);
+        const rewardVault = (0, zebec_stake_sdk_1.deriveRewardVaultAddress)(lockup, this.stakeProgramId);
+        const stakeVault = (0, zebec_stake_sdk_1.deriveStakeVaultAddress)(lockup, this.stakeProgramId);
         const stakerTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, vaultSigner, true);
         const instruction = await this.getUnstakeInstruction(feePayer, feeVault, lockup, stakePda, rewardToken, rewardVault, stakeToken, stakeVault, vaultSigner, stakerTokenAccount, new anchor_1.BN(params.nonce.toString()));
         const actions = [(0, utils_1.transactionInstructionToPropoalAction)(instruction)];
@@ -1406,8 +1503,8 @@ class ZebecVaultService {
         const vaultOwner = (0, anchor_1.translateAddress)(vaultOwnerAddress);
         const [vault] = (0, pda_1.deriveUserVault)(vaultOwner, this.vaultV1ProgramId);
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.vaultV1ProgramId);
-        const lockup = (0, pda_1.deriveLockupAddress)(lockupName, this.stakeProgramId);
-        const userNonceAddress = (0, pda_1.deriveUserNonceAddress)(vaultSigner, lockup, this.stakeProgramId);
+        const lockup = (0, zebec_stake_sdk_1.deriveLockupAddress)(lockupName, this.stakeProgramId);
+        const userNonceAddress = (0, zebec_stake_sdk_1.deriveUserNonceAddress)(vaultSigner, lockup, this.stakeProgramId);
         const userNonceAccount = await this.stakeProgram.account.userNonce.fetchNullable(userNonceAddress, commitment ?? this.connection.commitment);
         if (!userNonceAccount) {
             return null;
@@ -1419,8 +1516,8 @@ class ZebecVaultService {
     }
     async _createTransactionPayload(payerKey, instructions, signers, addressLookupTableAccounts) {
         const errorMap = new Map();
-        this.vaultV1Program.idl.errors.forEach((error) => errorMap.set(error.code, error.msg));
-        let signTransaction = undefined;
+        this.vaultV1Program.idl.errors.map((error) => errorMap.set(error.code, error.msg));
+        let signTransaction;
         const provider = this.provider;
         if (provider instanceof anchor_1.AnchorProvider) {
             signTransaction = async (tx) => {
@@ -1431,8 +1528,8 @@ class ZebecVaultService {
     }
     async _createMultiTransactionPayload(payerKey, transactionArtifacts) {
         const errorMap = new Map();
-        this.vaultV1Program.idl.errors.forEach((error) => errorMap.set(error.code, error.msg));
-        let signAllTransactions = undefined;
+        this.vaultV1Program.idl.errors.map((error) => errorMap.set(error.code, error.msg));
+        let signAllTransactions;
         const provider = this.provider;
         if (provider instanceof anchor_1.AnchorProvider) {
             signAllTransactions = async (txns) => {
@@ -1443,6 +1540,7 @@ class ZebecVaultService {
             instructions: data.instructions,
             feePayer: payerKey,
             signers: data.signers,
+            addressLookupTableAccounts: data.addressLookupTableAccounts,
         }));
         return new solana_common_1.MultiTransactionPayload(this.connection, errorMap, transactionData, signAllTransactions);
     }

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { Address, BN } from "@coral-xyz/anchor";
-import { Keypair, PublicKey } from "@solana/web3.js";
+import type { Address, BN } from "@coral-xyz/anchor";
+import type { Keypair, PublicKey } from "@solana/web3.js";
 export type Numeric = number | string;
 export type ProposalAction = {
     programId: PublicKey;
@@ -163,6 +163,7 @@ export type CreateStreamFromVaultParams = {
     vaultOwner: Address;
     receiver: Address;
     streamToken: Address;
+    streamConfigName: string;
     amount: Numeric;
     automaticWithdrawal: boolean;
     cancelableByRecipient: boolean;
@@ -182,6 +183,7 @@ export type CreateStreamFromVaultParams = {
 };
 export type createMultipleStreamFromVaultParams = {
     vaultOwner: Address;
+    streamConfigName: string;
     streamInfo: {
         receiver: Address;
         streamToken: Address;

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { TransactionInstruction } from "@solana/web3.js";
-import { ProposalAction } from "./types";
+import type { TransactionInstruction } from "@solana/web3.js";
+import type { ProposalAction } from "./types";
 export declare function calculateActionsSize(actions: ProposalAction[]): number;
 export declare function calculateProposalSize(name: string, actions: ProposalAction[]): number;
 export declare function transactionInstructionToPropoalAction(ix: TransactionInstruction): ProposalAction;

package/package.json

@@ -9,7 +9,7 @@
     "@zebec-network/solana-common": "^2.3.1",
     "@zebec-network/zebec-card-v2-sdk": "^2.5.4",
     "@zebec-network/zebec-stake-sdk": "^1.2.2",
-    "@zebec-network/zebec-stream-sdk": "^2.1.0",
+    "@zebec-network/zebec-stream-sdk": "^3.1.0-dev.1",
     "bignumber.js": "^9.3.1",
     "buffer": "^6.0.3"
   },
@@ -47,5 +47,5 @@
     "test:single": "ts-mocha -p ./tsconfig.json -t 1000000000"
   },
   "types": "dist/index.d.ts",
-  "version": "5.1.2"
+  "version": "5.2.0-dev.1"
 }