@zebec-network/zebec-vault-sdk 1.1.0 → 2.0.0

package/dist/service.js

@@ -24,7 +24,7 @@ class ZebecVaultService {
         program = program ?? new anchor_1.Program(artifacts_1.ZEBEC_VAULT_IDL_V1, provider);
         return new ZebecVaultService(provider, program, network);
     }
-    async getCreateVaultInstruction(payer, vault, owner, signerBump) {
+    async getCreateVaultInstruction(payer, owner, signerBump) {
         return this.program.methods
             .createVault({
             owner,
@@ -32,59 +32,54 @@ class ZebecVaultService {
         })
             .accounts({
             payer,
-            vault,
         })
             .instruction();
     }
-    async getDepositSolInstruction(depositor, vault, amount) {
+    async getDepositSolInstruction(depositor, amount) {
         return this.program.methods
             .depositSol({
             amount,
         })
             .accounts({
-            vault,
             depositor,
         })
             .instruction();
     }
-    async getWithdrawSolInstruction(withdrawer, vault, amount) {
+    async getWithdrawSolInstruction(withdrawer, amount) {
         return this.program.methods
             .withdrawSol({
             amount,
         })
             .accounts({
-            vault,
             withdrawer,
         })
             .instruction();
     }
-    async getDepositTokenInstruction(depositor, vault, tokenMint, amount, decimals) {
+    async getDepositTokenInstruction(depositor, tokenMint, amount, decimals) {
         return this.program.methods
             .depositToken({
             amount,
             decimals,
         })
             .accounts({
-            vault,
             depositor,
             tokenMint,
         })
             .instruction();
     }
-    async getWithdrawTokenInstruction(withdrawer, vault, tokenMint, amount, decimals) {
+    async getWithdrawTokenInstruction(withdrawer, tokenMint, amount, decimals) {
         return this.program.methods
             .withdrawToken({
             amount,
             decimals,
         })
             .accounts({
-            vault,
             withdrawer,
             tokenMint,
         })
             .instruction();
     }
-    async getCreateProposalInstruction(proposer, vault, proposal, name, actions, proposalAccountSize) {
+    async getCreateProposalInstruction(proposer, proposal, name, actions, proposalAccountSize) {
         return this.program.methods
             .createProposal({
             actions,
@@ -92,7 +87,6 @@ class ZebecVaultService {
             proposalAccountSize,
         })
             .accounts({
-            vault,
             proposal,
             proposer,
         })
@@ -128,13 +122,12 @@ class ZebecVaultService {
             .remainingAccounts(remainingAccounts)
             .instruction();
     }
-    async getExecuteProposalDirectInstruction(vault, proposer, actions, remainingAccounts) {
+    async getExecuteProposalDirectInstruction(proposer, actions, remainingAccounts) {
         return this.program.methods
             .executeProposalDirect({
             actions,
         })
             .accounts({
-            vault,
             proposer,
         })
             .remainingAccounts(remainingAccounts)
@@ -145,19 +138,18 @@ class ZebecVaultService {
         if (!payer) {
             throw new Error("Either provide a payer or use AnchorProvider for provider in the service");
         }
-        const vaultKeypair = params.vaultKeypair ?? web3_js_1.Keypair.generate();
-        const [, signerBump] = (0, pda_1.deriveVaultSigner)(vaultKeypair.publicKey, this.programId);
-        const ix = await this.getCreateVaultInstruction(payer, vaultKeypair.publicKey, payer, signerBump);
-        return this._createTransactionPayload(payer, [ix], [vaultKeypair]);
+        const [vault] = (0, pda_1.deriveUserVault)(payer, this.programId);
+        const [, signerBump] = (0, pda_1.deriveVaultSigner)(vault, this.programId);
+        const ix = await this.getCreateVaultInstruction(payer, payer, signerBump);
+        return this._createTransactionPayload(payer, [ix]);
     }
     async depositSol(params) {
         const depositor = params.depositor ? (0, anchor_1.translateAddress)(params.depositor) : this.provider.publicKey;
         if (!depositor) {
             throw new Error("Either provide a depositor or use AnchorProvider for provider in the service");
         }
-        const vault = (0, anchor_1.translateAddress)(params.vault);
         const amount = new anchor_1.BN((0, solana_common_1.parseSol)(params.amount).toString());
-        const ix = await this.getDepositSolInstruction(depositor, vault, amount);
+        const ix = await this.getDepositSolInstruction(depositor, amount);
         return this._createTransactionPayload(depositor, [ix]);
     }
     async withdrawSol(params) {
@@ -165,9 +157,8 @@ class ZebecVaultService {
         if (!withdrawer) {
             throw new Error("Either provide a withdrawer or use AnchorProvider for provider in the service");
         }
-        const vault = (0, anchor_1.translateAddress)(params.vault);
         const amount = new anchor_1.BN((0, solana_common_1.parseSol)(params.amount).toString());
-        const ix = await this.getWithdrawSolInstruction(withdrawer, vault, amount);
+        const ix = await this.getWithdrawSolInstruction(withdrawer, amount);
         return this._createTransactionPayload(withdrawer, [ix]);
     }
     async depositToken(params) {
@@ -175,11 +166,10 @@ class ZebecVaultService {
         if (!depositor) {
             throw new Error("Either provide a depositor or use AnchorProvider for provider in the service");
         }
-        const vault = (0, anchor_1.translateAddress)(params.vault);
         const tokenMint = (0, anchor_1.translateAddress)(params.tokenMint);
         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 ix = await this.getDepositTokenInstruction(depositor, vault, tokenMint, amount, decimals);
+        const ix = await this.getDepositTokenInstruction(depositor, tokenMint, amount, decimals);
         return this._createTransactionPayload(depositor, [ix]);
     }
     async withdrawToken(params) {
@@ -187,11 +177,10 @@ class ZebecVaultService {
         if (!withdrawer) {
             throw new Error("Either provide a withdrawer or use AnchorProvider for provider in the service");
         }
-        const vault = (0, anchor_1.translateAddress)(params.vault);
         const tokenMint = (0, anchor_1.translateAddress)(params.tokenMint);
         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 ix = await this.getWithdrawTokenInstruction(withdrawer, vault, tokenMint, amount, decimals);
+        const ix = await this.getWithdrawTokenInstruction(withdrawer, tokenMint, amount, decimals);
         return this._createTransactionPayload(withdrawer, [ix]);
     }
     async createProposal(params) {
@@ -199,7 +188,6 @@ class ZebecVaultService {
         if (!proposer) {
             throw new Error("Either provide a proposer or use AnchorProvider for provider in the service");
         }
-        const vault = (0, anchor_1.translateAddress)(params.vault);
         const proposalKeypair = params.proposalKeypair ?? web3_js_1.Keypair.generate();
         const actions = params.actions.map((ix) => ({
             accountSpecs: ix.keys,
@@ -210,7 +198,7 @@ class ZebecVaultService {
         if (proposalAccountSize > 10_000) {
             throw new Error("Proposal size exceeds maximum allowed size of 10,000 bytes");
         }
-        const ix = await this.getCreateProposalInstruction(proposer, vault, proposalKeypair.publicKey, params.name, actions, proposalAccountSize);
+        const ix = await this.getCreateProposalInstruction(proposer, proposalKeypair.publicKey, params.name, actions, proposalAccountSize);
         return this._createTransactionPayload(proposer, [ix], [proposalKeypair]);
     }
     async appendActions(params) {
@@ -291,7 +279,7 @@ class ZebecVaultService {
         if (!proposer) {
             throw new Error("Either provide a caller or use AnchorProvider for provider in the service");
         }
-        const vault = (0, anchor_1.translateAddress)(params.vault);
+        const [vault] = (0, pda_1.deriveUserVault)(proposer, this.programId);
         const [vaultSigner] = (0, pda_1.deriveVaultSigner)(vault, this.programId);
         const actions = params.actions.map((ix) => ({
             accountSpecs: ix.keys,
@@ -311,7 +299,7 @@ class ZebecVaultService {
             });
             return acc;
         }, []);
-        const ix = await this.getExecuteProposalDirectInstruction(vault, proposer, actions, remainingAccounts);
+        const ix = await this.getExecuteProposalDirectInstruction(proposer, actions, remainingAccounts);
         const addressLookupTableAccounts = [];
         if (params.addressLookupTables) {
             const promises = params.addressLookupTables.map(async (lookupTable) => {
@@ -337,40 +325,22 @@ class ZebecVaultService {
         }
         return new solana_common_1.TransactionPayload(this.provider.connection, errorMap, instructions, payerKey, signers, addressLookupTableAccounts, signTransaction);
     }
-    async getVaultsInfoOfUser(user) {
+    async getVaultInfoOfUser(user) {
         user = user ? (0, anchor_1.translateAddress)(user) : this.provider.publicKey;
         if (!user) {
             throw new Error("Either provide a user or use AnchorProvider for provider in the service");
         }
-        const accountInfos = await this.connection.getProgramAccounts(this.programId, {
-            commitment: this.connection.commitment,
-            filters: [
-                {
-                    memcmp: {
-                        offset: 0, // offset for discriminator in Vault
-                        bytes: anchor_1.utils.bytes.bs58.encode(this.program.idl.accounts[1].discriminator),
-                        encoding: "base58",
-                    },
-                },
-                {
-                    memcmp: {
-                        offset: 8, // offset for owner field in Vault
-                        bytes: user.toBase58(),
-                        encoding: "base58",
-                    },
-                },
-            ],
-        });
-        const vaults = accountInfos.map((accountInfo) => {
-            const vaultAccount = this.program.coder.accounts.decode(this.program.idl.accounts[1].name, accountInfo.account.data);
-            return {
-                vault: accountInfo.pubkey,
-                owner: vaultAccount.owner,
-                createdDate: vaultAccount.createdDate.toNumber(),
-                signerBump: vaultAccount.signerBump,
-            };
-        });
-        return vaults;
+        const [vault] = (0, pda_1.deriveUserVault)(user, this.programId);
+        const vaultAccount = await this.program.account.vault.fetchNullable(vault, this.connection.commitment);
+        if (!vaultAccount) {
+            return null;
+        }
+        return {
+            createdDate: vaultAccount.createdDate.toNumber(),
+            owner: vaultAccount.owner,
+            signerBump: vaultAccount.signerBump,
+            vault,
+        };
     }
     async getAllVaultsInfo() {
         const accountInfos = await this.connection.getProgramAccounts(this.programId, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zebec-network/zebec-vault-sdk",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "An SDK for zebec vault solana program",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,6 +27,8 @@
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.0.1",
+    "@zebec-network/core-utils": "^1.0.4",
+    "@zebec-network/zebec-card-v2-sdk": "^1.1.0",
     "@zebec-network/zebec-stake-sdk": "^1.0.10",
     "dotenv": "^16.5.0",
     "mocha": "^11.6.0",