@zebec-network/zebec-vault-sdk 5.2.4-beta.1 → 5.2.5

package/dist/artifacts/zebec_vault.d.ts

@@ -2188,6 +2188,151 @@ export type ZebecVault = {
                 }
             ];
         },
+        {
+            name: "unstakeZbcn";
+            discriminator: [90, 202, 101, 187, 218, 99, 244, 1];
+            accounts: [
+                {
+                    name: "vaultOwner";
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: "vault";
+                    pda: {
+                        seeds: [
+                            {
+                                kind: "const";
+                                value: [
+                                    122,
+                                    101,
+                                    98,
+                                    101,
+                                    99,
+                                    95,
+                                    117,
+                                    115,
+                                    101,
+                                    114,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116
+                                ];
+                            },
+                            {
+                                kind: "account";
+                                path: "vaultOwner";
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: "vaultSigner";
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: "const";
+                                value: [
+                                    122,
+                                    101,
+                                    98,
+                                    101,
+                                    99,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    115,
+                                    105,
+                                    103,
+                                    110,
+                                    101,
+                                    114
+                                ];
+                            },
+                            {
+                                kind: "account";
+                                path: "vault";
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: "vaultSignerStakeAta";
+                    writable: true;
+                },
+                {
+                    name: "vaultSignerRewardAta";
+                    writable: true;
+                },
+                {
+                    name: "lockup";
+                    writable: true;
+                },
+                {
+                    name: "stakePda";
+                    writable: true;
+                },
+                {
+                    name: "stakeToken";
+                },
+                {
+                    name: "rewardToken";
+                },
+                {
+                    name: "stakeVault";
+                    writable: true;
+                },
+                {
+                    name: "rewardVault";
+                    writable: true;
+                },
+                {
+                    name: "stakeVaultTokenAccount";
+                    writable: true;
+                },
+                {
+                    name: "rewardVaultTokenAccount";
+                    writable: true;
+                },
+                {
+                    name: "feeVault";
+                },
+                {
+                    name: "feeVaultTokenAccount";
+                    writable: true;
+                },
+                {
+                    name: "zebecStakeProgram";
+                    address: "zSTKzGLiN6T6EVzhBiL6sjULXMahDavAS2p4R62afGv";
+                },
+                {
+                    name: "tokenProgram";
+                    address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+                },
+                {
+                    name: "associatedTokenProgram";
+                    address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+                },
+                {
+                    name: "systemProgram";
+                    address: "11111111111111111111111111111111";
+                }
+            ];
+            args: [
+                {
+                    name: "nonce";
+                    type: "u64";
+                }
+            ];
+        },
         {
             name: "withdrawSol";
             discriminator: [145, 131, 74, 136, 65, 137, 42, 38];

package/dist/artifacts/zebec_vault.json

@@ -1469,6 +1469,121 @@
             "discriminator": [103, 60, 61, 79, 56, 61, 76, 49],
             "name": "transfer_fees"
         },
+        {
+            "accounts": [
+                {
+                    "name": "vault_owner",
+                    "signer": true,
+                    "writable": true
+                },
+                {
+                    "name": "vault",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    122, 101, 98, 101, 99, 95, 117, 115, 101, 114, 95, 118, 97,
+                                    117, 108, 116
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault_owner"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "vault_signer",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115,
+                                    105, 103, 110, 101, 114
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault"
+                            }
+                        ]
+                    },
+                    "writable": true
+                },
+                {
+                    "name": "vault_signer_stake_ata",
+                    "writable": true
+                },
+                {
+                    "name": "vault_signer_reward_ata",
+                    "writable": true
+                },
+                {
+                    "name": "lockup",
+                    "writable": true
+                },
+                {
+                    "name": "stake_pda",
+                    "writable": true
+                },
+                {
+                    "name": "stake_token"
+                },
+                {
+                    "name": "reward_token"
+                },
+                {
+                    "name": "stake_vault",
+                    "writable": true
+                },
+                {
+                    "name": "reward_vault",
+                    "writable": true
+                },
+                {
+                    "name": "stake_vault_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "reward_vault_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "fee_vault"
+                },
+                {
+                    "name": "fee_vault_token_account",
+                    "writable": true
+                },
+                {
+                    "address": "zSTKzGLiN6T6EVzhBiL6sjULXMahDavAS2p4R62afGv",
+                    "name": "zebec_stake_program"
+                },
+                {
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+                    "name": "token_program"
+                },
+                {
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL",
+                    "name": "associated_token_program"
+                },
+                {
+                    "address": "11111111111111111111111111111111",
+                    "name": "system_program"
+                }
+            ],
+            "args": [
+                {
+                    "name": "nonce",
+                    "type": "u64"
+                }
+            ],
+            "discriminator": [90, 202, 101, 187, 218, 99, 244, 1],
+            "name": "unstake_zbcn"
+        },
         {
             "accounts": [
                 {

package/dist/service.d.ts

@@ -6,7 +6,7 @@ import { type ZebecStakeIdlV1 } from "@zebec-network/zebec-stake-sdk";
 import { type ZebecStreamIdl } from "@zebec-network/zebec-stream-sdk";
 import { type ZebecVaultV1Idl } from "./artifacts";
 import type { RpcNetwork } from "./constants";
-import type { CancelStreamParams, ChangeStreamReceiverParams, CreateSilverCardInstructionData, CreateSilverCardParams, CreateStreamFromVaultParams, createMultipleStreamFromVaultParams, LoadCarbonCardInstructionData, LoadCarbonCardParams, Numeric, PauseResumeStreamParams, ProposalAction, ProposalInfo, StakeInstructionData, StakeUserNonceInfo, StreamMetadataInfo, SwapAndCreateSilverCardParams, SwapAndLoadCarbonCardParams, TokenFeeRecord, VaultInfo, WithdrawStreamParams } from "./types";
+import type { CancelStreamParams, ChangeStreamReceiverParams, createMultipleStreamFromVaultParams, CreateSilverCardInstructionData, CreateSilverCardParams, CreateStreamFromVaultParams, LoadCarbonCardInstructionData, LoadCarbonCardParams, Numeric, PauseResumeStreamParams, ProposalAction, ProposalInfo, StakeInstructionData, StakeUserNonceInfo, StreamMetadataInfo, SwapAndCreateSilverCardParams, SwapAndLoadCarbonCardParams, TokenFeeRecord, VaultInfo, WithdrawStreamParams } from "./types";
 export declare class ZebecVaultService {
     readonly provider: Provider;
     readonly vaultV1Program: Program<ZebecVaultV1Idl>;
@@ -342,7 +342,7 @@ export declare class ZebecVaultService {
     withdrawStream(params: WithdrawStreamParams): Promise<TransactionPayload>;
     getStreamMetadataInfo(streamMetadata: Address, commitment?: Commitment): Promise<StreamMetadataInfo>;
     getStakeInstruction(feePayer: PublicKey, lockup: PublicKey, stakeToken: PublicKey, stakeVault: PublicKey, staker: PublicKey, userNonce: PublicKey, stakePda: PublicKey, stakeVaultTokenAccount: PublicKey, data: StakeInstructionData): Promise<TransactionInstruction>;
-    getUnstakeInstruction(feePayer: PublicKey, feeVault: PublicKey, lockup: PublicKey, stakePda: PublicKey, rewardToken: PublicKey, rewardVault: PublicKey, stakeToken: PublicKey, stakeVault: PublicKey, staker: PublicKey, stakerTokenAccount: PublicKey, nonce: BN): Promise<TransactionInstruction>;
+    getUnstakeInstruction(feeVault: PublicKey, lockup: PublicKey, stakePda: PublicKey, rewardVault: PublicKey, stakeToken: PublicKey, rewardToken: PublicKey, stakeVault: PublicKey, vault: PublicKey, vaultOwner: PublicKey, vaultSigner: PublicKey, vaultSignerStakeAta: PublicKey, vaultSignerRewardAta: PublicKey, feeVaultTokenAccount: PublicKey, rewardVaultTokenAccount: PublicKey, stakeVaultTokenAccount: PublicKey, nonce: BN): Promise<TransactionInstruction>;
     stake(params: {
         lockupName: string;
         vaultOwner?: Address;

package/dist/service.js

@@ -1,9 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZebecVaultService = void 0;
+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");
@@ -12,8 +10,6 @@ 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 errors_1 = require("./errors");
 const pda_1 = require("./pda");
@@ -355,7 +351,8 @@ class ZebecVaultService {
             const promises = params.addressLookupTables.map(async (lookupTable) => {
                 const lookupTables = await this.connection.getAddressLookupTable((0, anchor_1.translateAddress)(lookupTable));
                 const lookupTableAccount = lookupTables.value;
-                (0, assert_1.default)(lookupTableAccount, "Lookup table account not found");
+                if (!lookupTableAccount)
+                    throw new Error("Lookup table account not found");
                 return lookupTableAccount;
             });
             const accounts = await Promise.all(promises);
@@ -392,7 +389,8 @@ class ZebecVaultService {
             const promises = params.addressLookupTables.map(async (lookupTable) => {
                 const lookupTables = await this.connection.getAddressLookupTable((0, anchor_1.translateAddress)(lookupTable));
                 const lookupTableAccount = lookupTables.value;
-                (0, assert_1.default)(lookupTableAccount, "Lookup table account not found");
+                if (!lookupTableAccount)
+                    throw new Error("Lookup table account not found");
                 return lookupTableAccount;
             });
             const accounts = await Promise.all(promises);
@@ -419,7 +417,8 @@ class ZebecVaultService {
     }
     async getAllVaultsInfo() {
         const vaultAccount = this.vaultV1Program.idl.accounts.find((acc) => acc.name === "vault");
-        (0, assert_1.default)(vaultAccount, "Vault account not found in IDL");
+        if (!vaultAccount)
+            throw new Error("Vault account not found in IDL");
         const accountInfos = await this.connection.getProgramAccounts(this.vaultV1ProgramId, {
             commitment: this.connection.commitment,
             filters: [
@@ -446,7 +445,8 @@ class ZebecVaultService {
     async getProposalsInfoOfVault(vaultAddress) {
         const vault = (0, anchor_1.translateAddress)(vaultAddress);
         const proposalAccount = this.vaultV1Program.idl.accounts.find((acc) => acc.name === "proposal");
-        (0, assert_1.default)(proposalAccount, "Proposal account not found in IDL");
+        if (!proposalAccount)
+            throw new Error("Proposal account not found in IDL");
         const accountInfos = await this.connection.getProgramAccounts(this.vaultV1ProgramId, {
             commitment: this.connection.commitment,
             filters: [
@@ -653,7 +653,8 @@ class ZebecVaultService {
         }, []);
         const lookupTables = await this.connection.getAddressLookupTable((0, anchor_1.translateAddress)(zebec_card_v2_sdk_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]));
         const lookupTableAccount = lookupTables.value;
-        (0, assert_1.default)(lookupTableAccount, "Lookup table account not found");
+        if (!lookupTableAccount)
+            throw new Error("Lookup table account not found");
         const executeProposalDirectIx = await this.getExecuteProposalDirectInstruction(vaultOwner, actions, remainingAccounts);
         return this._createTransactionPayload(vaultOwner, [executeProposalDirectIx], [], [lookupTableAccount]);
     }
@@ -707,7 +708,8 @@ class ZebecVaultService {
         }, []);
         const lookupTables = await this.connection.getAddressLookupTable((0, anchor_1.translateAddress)(zebec_card_v2_sdk_1.CARD_LOOKUP_TABLE_ADDRESS[this.network]));
         const lookupTableAccount = lookupTables.value;
-        (0, assert_1.default)(lookupTableAccount, "Lookup table account not found");
+        if (!lookupTableAccount)
+            throw new Error("Lookup table account not found");
         const executeProposalDirectIx = await this.getExecuteProposalDirectInstruction(vaultOwner, actions, remainingAccounts);
         return this._createTransactionPayload(vaultOwner, [executeProposalDirectIx], [], [lookupTableAccount]);
     }
@@ -816,7 +818,8 @@ class ZebecVaultService {
             addressLookupTableAccounts: addressLookupTableAccounts,
         });
         const swapInstruction = message.instructions.find((ix) => ix.programId.equals((0, anchor_1.translateAddress)(zebec_card_v2_sdk_1.JUPITER_AGGREGATOR_PROGRAM_ID)));
-        (0, assert_1.default)(swapInstruction, "Swap instruction not found in the transaction message");
+        if (!swapInstruction)
+            throw new Error("Swap instruction not found in the transaction message");
         const otherIxs = message.instructions.filter((ix) => !ix.programId.equals((0, anchor_1.translateAddress)(zebec_card_v2_sdk_1.JUPITER_AGGREGATOR_PROGRAM_ID)) &&
             !ix.programId.equals(web3_js_1.ComputeBudgetProgram.programId));
         const index = new anchor_1.BN(params.nextCardCounter.toString());
@@ -935,7 +938,8 @@ class ZebecVaultService {
             addressLookupTableAccounts: addressLookupTableAccounts,
         });
         const swapInstruction = message.instructions.find((ix) => ix.programId.equals((0, anchor_1.translateAddress)(zebec_card_v2_sdk_1.JUPITER_AGGREGATOR_PROGRAM_ID)));
-        (0, assert_1.default)(swapInstruction, "Swap instruction not found in the transaction message");
+        if (!swapInstruction)
+            throw new Error("Swap instruction not found in the transaction message");
         const otherIxs = message.instructions.filter((ix) => !ix.programId.equals((0, anchor_1.translateAddress)(zebec_card_v2_sdk_1.JUPITER_AGGREGATOR_PROGRAM_ID)) &&
             !ix.programId.equals(web3_js_1.ComputeBudgetProgram.programId));
         const index = new anchor_1.BN(params.nextCardCounter.toString());
@@ -1076,6 +1080,7 @@ class ZebecVaultService {
         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);
+        console.log("vaultSigner:", vaultSigner.toString());
         const receiver = (0, anchor_1.translateAddress)(params.receiver);
         const [receiverVault] = (0, pda_1.deriveUserVault)(receiver, this.vaultV1ProgramId);
         const [receiverVaultSigner] = (0, pda_1.deriveVaultSigner)(receiverVault, this.vaultV1ProgramId);
@@ -1094,6 +1099,7 @@ class ZebecVaultService {
             .times(solana_common_1.TEN_BIGNUM.pow(streamTokenDecimals))
             .toFixed(0);
         const feeInfo = await (0, zebec_stream_sdk_1.getFeeInfoForStream)(streamToken, amount, streamTokenDecimals, this.network);
+        console.debug("feeInfo:", feeInfo);
         const feeToken = (0, anchor_1.translateAddress)(feeInfo.feeToken.mintAddress);
         const feeTokenDecimals = await (0, solana_common_1.getMintDecimals)(this.connection, feeToken);
         const parsedFeeAmount = feeInfo.feeAmountRaw;
@@ -1451,20 +1457,25 @@ class ZebecVaultService {
         })
             .instruction();
     }
-    async getUnstakeInstruction(feePayer, feeVault, lockup, stakePda, rewardToken, rewardVault, stakeToken, stakeVault, staker, stakerTokenAccount, nonce) {
-        return this.stakeProgram.methods
+    async getUnstakeInstruction(feeVault, lockup, stakePda, rewardVault, stakeToken, rewardToken, stakeVault, vault, vaultOwner, vaultSigner, vaultSignerStakeAta, vaultSignerRewardAta, feeVaultTokenAccount, rewardVaultTokenAccount, stakeVaultTokenAccount, nonce) {
+        return this.vaultV1Program.methods
             .unstakeZbcn(nonce)
             .accountsPartial({
-            feePayer,
-            feeVault,
+            feeVaultTokenAccount,
+            rewardVaultTokenAccount,
+            stakeVaultTokenAccount,
+            vault,
+            vaultOwner,
+            vaultSigner,
             rewardToken,
+            vaultSignerStakeAta,
+            vaultSignerRewardAta,
+            feeVault,
             stakeToken,
-            staker,
             lockup,
             stakeVault,
             stakePda,
             rewardVault,
-            stakerTokenAccount,
         })
             .instruction();
     }
@@ -1522,7 +1533,8 @@ class ZebecVaultService {
         const ixFinal = await this.getExecuteProposalDirectInstruction(vaultOwner, actions, remainingAccounts);
         const lookupTables = await this.connection.getAddressLookupTable((0, anchor_1.translateAddress)(zebec_stake_sdk_1.STAKE_LOOKUP_TABLE_ADDRESS[this.network]));
         const lookupTableAccount = lookupTables.value;
-        (0, assert_1.default)(lookupTableAccount, "Lookup table account not found");
+        if (!lookupTableAccount)
+            throw new Error("Lookup table account not found");
         return this._createTransactionPayload(vaultOwner, [ixFinal], [], [lookupTableAccount]);
     }
     async unstake(params) {
@@ -1534,7 +1546,6 @@ 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, zebec_stake_sdk_1.deriveLockupAddress)(params.lockupName, this.stakeProgramId);
         const lockupAccount = await this.stakeProgram.account.lockup.fetchNullable(lockup, this.connection.commitment);
         if (!lockupAccount) {
@@ -1544,29 +1555,20 @@ class ZebecVaultService {
         const rewardToken = lockupAccount.rewardToken.tokenAddress;
         const feeVault = lockupAccount.feeInfo.feeVault;
         const stakePda = (0, zebec_stake_sdk_1.deriveStakeAddress)(vaultSigner, lockup, params.nonce, this.stakeProgramId);
+        console.log("StakePda:", stakePda.toString());
         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)];
-        const remainingAccounts = actions.reduce((acc, current) => {
-            const accounts = current.accountSpecs.map((spec) => ({
-                pubkey: spec.pubkey,
-                isSigner: spec.pubkey.equals(vaultSigner) ? false : spec.isSigner,
-                isWritable: spec.isWritable,
-            }));
-            acc.push(...accounts, {
-                isSigner: false,
-                isWritable: false,
-                pubkey: current.programId,
-            });
-            return acc;
-        }, []);
-        const ixFinal = await this.getExecuteProposalDirectInstruction(vaultOwner, actions, remainingAccounts);
+        const vaultSignerStakeTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, vaultSigner, true);
+        const vaultSignerRewardTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(rewardToken, vaultSigner, true);
+        const feeVaultTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, feeVault, true);
+        const rewardVaultTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(rewardToken, rewardVault, true);
+        const stakeVaultTokenAccount = (0, solana_common_1.getAssociatedTokenAddressSync)(stakeToken, stakeVault, true);
+        const instruction = await this.getUnstakeInstruction(feeVault, lockup, stakePda, rewardVault, stakeToken, rewardToken, stakeVault, vault, vaultOwner, vaultSigner, vaultSignerStakeTokenAccount, vaultSignerRewardTokenAccount, feeVaultTokenAccount, rewardVaultTokenAccount, stakeVaultTokenAccount, new anchor_1.BN(params.nonce.toString()));
         const lookupTables = await this.connection.getAddressLookupTable((0, anchor_1.translateAddress)(zebec_stake_sdk_1.STAKE_LOOKUP_TABLE_ADDRESS[this.network]));
         const lookupTableAccount = lookupTables.value;
-        (0, assert_1.default)(lookupTableAccount, "Lookup table account not found");
-        return this._createTransactionPayload(vaultOwner, [ixFinal], [], [lookupTableAccount]);
+        if (!lookupTableAccount)
+            throw new Error("Lookup table account not found");
+        return this._createTransactionPayload(vaultOwner, [instruction], [], [lookupTableAccount]);
     }
     async getStakeUserNonceInfo(lockupName, vaultOwnerAddress, commitment) {
         const vaultOwner = (0, anchor_1.translateAddress)(vaultOwnerAddress);

package/package.json

@@ -9,7 +9,7 @@
 		"@zebec-network/solana-common": "^2.3.1",
 		"@zebec-network/zebec-card-v2-sdk": "^2.6.0",
 		"@zebec-network/zebec-stake-sdk": "^1.3.1",
-		"@zebec-network/zebec-stream-sdk": "^3.3.0-beta.1",
+		"@zebec-network/zebec-stream-sdk": "^3.3.0",
 		"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.2.4-beta.1"
-}
+	"version": "5.2.5"
+}