@zebec-network/zebec-vault-sdk 1.0.1 → 1.0.2

package/dist/artifacts/zebec_vault.d.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/zebec_vault.json`.
  */
 export type ZebecVault = {
-    address: "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS";
+    address: "ANqQ8QaAMAyLrY2LVLKALP7pBWRvdTrSF94PBTAvCyim";
     metadata: {
         name: "zebecVault";
         version: "0.1.0";
@@ -109,6 +109,25 @@ export type ZebecVault = {
                 }
             ];
         },
+        {
+            name: "deleteProposal";
+            discriminator: [195, 115, 85, 157, 254, 15, 175, 201];
+            accounts: [
+                {
+                    name: "proposer";
+                    signer: true;
+                },
+                {
+                    name: "vault";
+                    relations: ["proposal"];
+                },
+                {
+                    name: "proposal";
+                    writable: true;
+                }
+            ];
+            args: [];
+        },
         {
             name: "depositSol";
             discriminator: [108, 81, 78, 117, 125, 155, 56, 200];
@@ -129,7 +148,7 @@ export type ZebecVault = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
                             },
                             {
                                 kind: "account";
@@ -172,7 +191,7 @@ export type ZebecVault = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
                             },
                             {
                                 kind: "account";
@@ -410,7 +429,7 @@ export type ZebecVault = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
                             },
                             {
                                 kind: "account";
@@ -440,7 +459,7 @@ export type ZebecVault = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
                             },
                             {
                                 kind: "account";
@@ -485,7 +504,7 @@ export type ZebecVault = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
                             },
                             {
                                 kind: "account";
@@ -528,7 +547,7 @@ export type ZebecVault = {
                         seeds: [
                             {
                                 kind: "const";
-                                value: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
+                                value: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114];
                             },
                             {
                                 kind: "account";
@@ -760,6 +779,10 @@ export type ZebecVault = {
             name: "actionsAppended";
             discriminator: [58, 232, 160, 225, 22, 253, 24, 141];
         },
+        {
+            name: "proposalClosed";
+            discriminator: [57, 90, 47, 164, 105, 55, 97, 27];
+        },
         {
             name: "proposalCreated";
             discriminator: [186, 8, 160, 108, 81, 13, 51, 206];
@@ -1111,6 +1134,30 @@ export type ZebecVault = {
                 ];
             };
         },
+        {
+            name: "proposalClosed";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "closedBy";
+                        type: "pubkey";
+                    },
+                    {
+                        name: "closedDate";
+                        type: "i64";
+                    },
+                    {
+                        name: "proposal";
+                        type: "pubkey";
+                    },
+                    {
+                        name: "vault";
+                        type: "pubkey";
+                    }
+                ];
+            };
+        },
         {
             name: "proposalCreated";
             type: {
@@ -1392,9 +1439,9 @@ export type ZebecVault = {
         {
             name: "vaultSignerPrefix";
             type: {
-                array: ["u8", 17];
+                array: ["u8", 18];
             };
-            value: "[97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]";
+            value: "[122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]";
         }
     ];
 };

package/dist/artifacts/zebec_vault.json

@@ -1,5 +1,5 @@
 {
-    "address": "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS",
+    "address": "ANqQ8QaAMAyLrY2LVLKALP7pBWRvdTrSF94PBTAvCyim",
     "metadata": {
         "name": "zebec_vault",
         "version": "0.1.0",
@@ -103,6 +103,25 @@
                 }
             ]
         },
+        {
+            "name": "delete_proposal",
+            "discriminator": [195, 115, 85, 157, 254, 15, 175, 201],
+            "accounts": [
+                {
+                    "name": "proposer",
+                    "signer": true
+                },
+                {
+                    "name": "vault",
+                    "relations": ["proposal"]
+                },
+                {
+                    "name": "proposal",
+                    "writable": true
+                }
+            ],
+            "args": []
+        },
         {
             "name": "deposit_sol",
             "discriminator": [108, 81, 78, 117, 125, 155, 56, 200],
@@ -123,7 +142,7 @@
                         "seeds": [
                             {
                                 "kind": "const",
-                                "value": [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
+                                "value": [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
                             },
                             {
                                 "kind": "account",
@@ -166,7 +185,7 @@
                         "seeds": [
                             {
                                 "kind": "const",
-                                "value": [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
+                                "value": [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
                             },
                             {
                                 "kind": "account",
@@ -284,7 +303,7 @@
                         "seeds": [
                             {
                                 "kind": "const",
-                                "value": [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
+                                "value": [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
                             },
                             {
                                 "kind": "account",
@@ -314,7 +333,7 @@
                         "seeds": [
                             {
                                 "kind": "const",
-                                "value": [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
+                                "value": [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
                             },
                             {
                                 "kind": "account",
@@ -359,7 +378,7 @@
                         "seeds": [
                             {
                                 "kind": "const",
-                                "value": [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
+                                "value": [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
                             },
                             {
                                 "kind": "account",
@@ -402,7 +421,7 @@
                         "seeds": [
                             {
                                 "kind": "const",
-                                "value": [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
+                                "value": [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]
                             },
                             {
                                 "kind": "account",
@@ -514,6 +533,10 @@
             "name": "ActionsAppended",
             "discriminator": [58, 232, 160, 225, 22, 253, 24, 141]
         },
+        {
+            "name": "ProposalClosed",
+            "discriminator": [57, 90, 47, 164, 105, 55, 97, 27]
+        },
         {
             "name": "ProposalCreated",
             "discriminator": [186, 8, 160, 108, 81, 13, 51, 206]
@@ -865,6 +888,30 @@
                 ]
             }
         },
+        {
+            "name": "ProposalClosed",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "closed_by",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "closed_date",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "proposal",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "vault",
+                        "type": "pubkey"
+                    }
+                ]
+            }
+        },
         {
             "name": "ProposalCreated",
             "type": {
@@ -1146,9 +1193,9 @@
         {
             "name": "VAULT_SIGNER_PREFIX",
             "type": {
-                "array": ["u8", 17]
+                "array": ["u8", 18]
             },
-            "value": "[97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]"
+            "value": "[122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]"
         }
     ]
 }

package/dist/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TEN_BIGNUM = exports.ZEBEC_VAULT_PROGRAM_ID = void 0;
 const bignumber_js_1 = require("bignumber.js");
 exports.ZEBEC_VAULT_PROGRAM_ID = {
-    "mainnet-beta": "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS",
-    devnet: "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS",
+    "mainnet-beta": "ANqQ8QaAMAyLrY2LVLKALP7pBWRvdTrSF94PBTAvCyim",
+    devnet: "ANqQ8QaAMAyLrY2LVLKALP7pBWRvdTrSF94PBTAvCyim",
 };
 exports.TEN_BIGNUM = (0, bignumber_js_1.BigNumber)(10);

package/dist/pda.js

@@ -4,7 +4,7 @@ exports.deriveVaultSigner = deriveVaultSigner;
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const SEEDS = {
-    VAULT_SIGNER: [97, 97, 99, 115, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114],
+    VAULT_SIGNER: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114],
 };
 function deriveVaultSigner(vault, programId) {
     const addressAndBump = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(SEEDS.VAULT_SIGNER), (0, anchor_1.translateAddress)(vault).toBuffer()], (0, anchor_1.translateAddress)(programId));

package/dist/service.d.ts

@@ -17,6 +17,7 @@ export declare class ZebecVaultService {
     getWithdrawTokenInstruction(withdrawer: PublicKey, vault: PublicKey, tokenMint: PublicKey, amount: BN, decimals: number): Promise<TransactionInstruction>;
     getCreateProposalInstruction(proposer: PublicKey, vault: PublicKey, proposal: PublicKey, name: string, actions: ProposalAction[], proposalAccountSize: number): Promise<TransactionInstruction>;
     getAppendActionInstruction(proposer: PublicKey, proposal: PublicKey, actions: ProposalAction[], newProposalAccountSize: number): Promise<TransactionInstruction>;
+    getDeleteProposalInstruction(proposal: PublicKey): Promise<TransactionInstruction>;
     getExecuteProposalInstruction(caller: PublicKey, proposal: PublicKey, remainingAccounts: AccountMeta[]): Promise<TransactionInstruction>;
     getExecuteProposalDirectInstruction(vault: PublicKey, proposer: PublicKey, actions: ProposalAction[], remainingAccounts: AccountMeta[]): Promise<TransactionInstruction>;
     createVault(params: {
@@ -46,21 +47,24 @@ export declare class ZebecVaultService {
         amount: Numeric;
     }): Promise<TransactionPayload>;
     createProposal(params: {
-        proposer: Address;
+        proposer?: Address;
         vault: Address;
         proposalKeypair?: Keypair;
         name: string;
         actions: TransactionInstruction[];
     }): Promise<TransactionPayload>;
     appendActions(params: {
-        proposer: Address;
+        proposer?: Address;
         proposal: Address;
         actions: TransactionInstruction[];
     }): Promise<TransactionPayload>;
+    deleteProposal(params: {
+        caller?: Address;
+        proposal: Address;
+    }): Promise<TransactionPayload>;
     executeProposal(params: {
-        caller: Address;
+        caller?: Address;
         proposal: Address;
-        remainingAccounts: AccountMeta[];
     }): Promise<TransactionPayload>;
     executeProposalDirect(params: {
         vault: Address;
@@ -68,9 +72,9 @@ export declare class ZebecVaultService {
         actions: TransactionInstruction[];
     }): Promise<TransactionPayload>;
     private _createTransactionPayload;
-    getVaultInfosOfUser(user?: Address): Promise<VaultInfo[]>;
+    getVaultsInfoOfUser(user?: Address): Promise<VaultInfo[]>;
     getAllVaultsInfo(): Promise<VaultInfo[]>;
-    getAllProposalOfVault(vault: Address): Promise<ProposalInfo[]>;
+    getProposalsInfoOfVault(vault: Address): Promise<ProposalInfo[]>;
     get programId(): PublicKey;
     get connection(): import("@solana/web3.js").Connection;
 }

package/dist/service.js

@@ -106,6 +106,14 @@ class ZebecVaultService {
         })
             .instruction();
     }
+    async getDeleteProposalInstruction(proposal) {
+        return this.program.methods
+            .deleteProposal()
+            .accounts({
+            proposal,
+        })
+            .instruction();
+    }
     async getExecuteProposalInstruction(caller, proposal, remainingAccounts) {
         return this.program.methods
             .executeProposal()
@@ -194,12 +202,12 @@ class ZebecVaultService {
             data: ix.data,
             programId: ix.programId,
         }));
-        const proposalAccountSize = (0, utils_1.calculateProposalSize)(actions);
+        const proposalAccountSize = (0, utils_1.calculateProposalSize)(params.name, actions);
         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);
-        return this._createTransactionPayload(proposer, [ix]);
+        return this._createTransactionPayload(proposer, [ix], [proposalKeypair]);
     }
     async appendActions(params) {
         const proposer = params.proposer ? (0, anchor_1.translateAddress)(params.proposer) : this.provider.publicKey;
@@ -216,15 +224,24 @@ class ZebecVaultService {
             data: ix.data,
             programId: ix.programId,
         }));
-        const actions = proposalAccount.actions;
-        actions.push(...newActions);
-        const newProposalAccountSize = (0, utils_1.calculateProposalSize)(actions);
+        const allActions = proposalAccount.actions;
+        allActions.push(...newActions);
+        const newProposalAccountSize = (0, utils_1.calculateProposalSize)(proposalAccount.name, allActions);
         if (newProposalAccountSize > 10_000) {
             throw new Error("Proposal size exceeds maximum allowed size of 10,000 bytes");
         }
-        const ix = await this.getAppendActionInstruction(proposer, proposal, actions, newProposalAccountSize);
+        const ix = await this.getAppendActionInstruction(proposer, proposal, newActions, newProposalAccountSize);
         return this._createTransactionPayload(proposer, [ix]);
     }
+    async deleteProposal(params) {
+        const caller = params.caller ? (0, anchor_1.translateAddress)(params.caller) : this.provider.publicKey;
+        if (!caller) {
+            throw new Error("Either provide a caller or use AnchorProvider for provider in the service");
+        }
+        const proposal = (0, anchor_1.translateAddress)(params.proposal);
+        const ix = await this.getDeleteProposalInstruction(proposal);
+        return this._createTransactionPayload(caller, [ix]);
+    }
     async executeProposal(params) {
         const caller = params.caller ? (0, anchor_1.translateAddress)(params.caller) : this.provider.publicKey;
         if (!caller) {
@@ -243,10 +260,15 @@ class ZebecVaultService {
                 isSigner: spec.pubkey.equals(vaultSigner) ? false : spec.isSigner,
                 isWritable: spec.isWritable,
             }));
-            acc.push(...accounts);
+            acc.push(...accounts, {
+                isSigner: false,
+                isWritable: false,
+                pubkey: current.programId,
+            });
             return acc;
         }, []);
         const ix = await this.getExecuteProposalInstruction(caller, proposal, remainingAccounts);
+        console.log("ix:", JSON.stringify(ix.keys, null, 2));
         return this._createTransactionPayload(caller, [ix]);
     }
     async executeProposalDirect(params) {
@@ -267,7 +289,11 @@ class ZebecVaultService {
                 isSigner: spec.pubkey.equals(vaultSigner) ? false : spec.isSigner,
                 isWritable: spec.isWritable,
             }));
-            acc.push(...accounts);
+            acc.push(...accounts, {
+                isSigner: false,
+                isWritable: false,
+                pubkey: current.programId,
+            });
             return acc;
         }, []);
         const ix = await this.getExecuteProposalDirectInstruction(vault, proposer, actions, remainingAccounts);
@@ -285,7 +311,7 @@ class ZebecVaultService {
         }
         return new solana_common_1.TransactionPayload(this.provider.connection, errorMap, instructions, payerKey, signers, addressLookupTableAccounts, signTransaction);
     }
-    async getVaultInfosOfUser(user) {
+    async getVaultsInfoOfUser(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");
@@ -314,7 +340,7 @@ class ZebecVaultService {
             return {
                 vault: accountInfo.pubkey,
                 owner: vaultAccount.owner,
-                createdAt: vaultAccount.createdAt.toNumber(),
+                createdDate: vaultAccount.createdDate.toNumber(),
                 signerBump: vaultAccount.signerBump,
             };
         });
@@ -338,27 +364,27 @@ class ZebecVaultService {
             return {
                 vault: accountInfo.pubkey,
                 owner: vaultAccount.owner,
-                createdAt: vaultAccount.createdAt.toNumber(),
+                createdDate: vaultAccount.createdDate.toNumber(),
                 signerBump: vaultAccount.signerBump,
             };
         });
         return vaults;
     }
-    async getAllProposalOfVault(vault) {
+    async getProposalsInfoOfVault(vault) {
         const _vault = (0, anchor_1.translateAddress)(vault);
         const accountInfos = await this.connection.getProgramAccounts(this.programId, {
             commitment: this.connection.commitment,
             filters: [
                 {
                     memcmp: {
-                        offset: 0, // offset for discriminator in Vault
+                        offset: 0, // offset for discriminator in Proposal
                         bytes: anchor_1.utils.bytes.bs58.encode(this.program.idl.accounts[0].discriminator),
                         encoding: "base58",
                     },
                 },
                 {
                     memcmp: {
-                        offset: 8, // offset for owner field in Vault
+                        offset: 8, // offset for owner field in Proposal
                         bytes: _vault.toBase58(),
                         encoding: "base58",
                     },

package/dist/types.d.ts

@@ -30,6 +30,6 @@ export type ProposalInfo = {
 export type VaultInfo = {
     vault: PublicKey;
     owner: PublicKey;
-    createdAt: number;
+    createdDate: number;
     signerBump: number;
 };

package/dist/utils.d.ts

@@ -1,3 +1,3 @@
 import { ProposalAction } from "./types";
 export declare function calculateActionsSize(actions: ProposalAction[]): number;
-export declare function calculateProposalSize(actions: ProposalAction[]): number;
+export declare function calculateProposalSize(name: string, actions: ProposalAction[]): number;

package/dist/utils.js

@@ -2,13 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateActionsSize = calculateActionsSize;
 exports.calculateProposalSize = calculateProposalSize;
+const anchor_1 = require("@coral-xyz/anchor");
 function calculateActionsSize(actions) {
     return actions
         .map((ix) => 4 + ix.accountSpecs.length * 34 + 4 + ix.data.length + 32)
         .reduce((acc, curr) => acc + curr, 0);
 }
-function calculateProposalSize(actions) {
+function calculateProposalSize(name, actions) {
     const ix_size = calculateActionsSize(actions);
-    const withExtraSpace = 32 + 1 + 8 + 8 + 1 + /** name */ 4 + 60 + /** actions */ 4 + ix_size + /** extra */ 20;
+    const withExtraSpace = 32 +
+        1 +
+        8 +
+        8 +
+        1 +
+        /** name */
+        4 +
+        anchor_1.utils.bytes.utf8.encode(name).length +
+        /** actions */
+        4 +
+        ix_size +
+        /** extra */ 20;
     return withExtraSpace;
 }

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@zebec-network/zebec-vault-sdk",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "An SDK for zebec vault solana program",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Ashish Sapkota",
   "license": "MIT",
   "files": [
-    "dist"
+    "dist",
+    "assets"
   ],
   "keywords": [
     "solana",