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

package/dist/artifacts/zebec_vault.d.ts

@@ -200,6 +200,39 @@ export type ZebecVault = {
                         ];
                     };
                 },
+                {
+                    name: "whitelist";
+                    pda: {
+                        seeds: [
+                            {
+                                kind: "const";
+                                value: [
+                                    122,
+                                    101,
+                                    98,
+                                    101,
+                                    99,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    119,
+                                    104,
+                                    105,
+                                    116,
+                                    101,
+                                    108,
+                                    105,
+                                    115,
+                                    116
+                                ];
+                            }
+                        ];
+                    };
+                },
                 {
                     name: "tokenMint";
                 },
@@ -484,6 +517,65 @@ export type ZebecVault = {
                 }
             ];
         },
+        {
+            name: "whitelistToken";
+            discriminator: [6, 141, 83, 167, 31, 6, 2, 224];
+            accounts: [
+                {
+                    name: "whitelister";
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: "whitelist";
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: "const";
+                                value: [
+                                    122,
+                                    101,
+                                    98,
+                                    101,
+                                    99,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    119,
+                                    104,
+                                    105,
+                                    116,
+                                    101,
+                                    108,
+                                    105,
+                                    115,
+                                    116
+                                ];
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: "systemProgram";
+                    address: "11111111111111111111111111111111";
+                }
+            ];
+            args: [
+                {
+                    name: "params";
+                    type: {
+                        defined: {
+                            name: "whitelistTokenParams";
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: "withdrawSol";
             discriminator: [145, 131, 74, 136, 65, 137, 42, 38];
@@ -772,6 +864,10 @@ export type ZebecVault = {
         {
             name: "vault";
             discriminator: [211, 8, 232, 43, 2, 152, 117, 119];
+        },
+        {
+            name: "whitelist";
+            discriminator: [204, 176, 52, 79, 146, 121, 54, 247];
         }
     ];
     events: [
@@ -807,6 +903,10 @@ export type ZebecVault = {
             name: "tokenDeposited";
             discriminator: [104, 7, 18, 187, 94, 141, 251, 120];
         },
+        {
+            name: "tokenWhitelisted";
+            discriminator: [65, 3, 231, 165, 235, 116, 154, 51];
+        },
         {
             name: "tokenWithdrawn";
             discriminator: [35, 57, 130, 51, 154, 247, 155, 142];
@@ -861,6 +961,16 @@ export type ZebecVault = {
             code: 6008;
             name: "notEnoughTokens";
             msg: "Not enough tokens for lamports";
+        },
+        {
+            code: 6009;
+            name: "notValidAdmin";
+            msg: "Not valid admin";
+        },
+        {
+            code: 6010;
+            name: "tokenNotWhitelisted";
+            msg: "Token not whitelisted";
         }
     ];
     types: [
@@ -1334,6 +1444,24 @@ export type ZebecVault = {
                 ];
             };
         },
+        {
+            name: "tokenWhitelisted";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "tokenAddresses";
+                        type: {
+                            vec: "pubkey";
+                        };
+                    },
+                    {
+                        name: "whitelister";
+                        type: "pubkey";
+                    }
+                ];
+            };
+        },
         {
             name: "tokenWithdrawn";
             type: {
@@ -1406,6 +1534,54 @@ export type ZebecVault = {
                 ];
             };
         },
+        {
+            name: "whitelist";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "admin";
+                        type: "pubkey";
+                    },
+                    {
+                        name: "whitelistedTokens";
+                        type: {
+                            vec: {
+                                defined: {
+                                    name: "whitelistedToken";
+                                };
+                            };
+                        };
+                    }
+                ];
+            };
+        },
+        {
+            name: "whitelistTokenParams";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "tokenAddresses";
+                        type: {
+                            vec: "pubkey";
+                        };
+                    }
+                ];
+            };
+        },
+        {
+            name: "whitelistedToken";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "tokenAddress";
+                        type: "pubkey";
+                    }
+                ];
+            };
+        },
         {
             name: "withdrawSolParams";
             type: {
@@ -1442,6 +1618,13 @@ export type ZebecVault = {
                 array: ["u8", 18];
             };
             value: "[122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]";
+        },
+        {
+            name: "whitelistPrefix";
+            type: {
+                array: ["u8", 21];
+            };
+            value: "[122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 119, 104, 105, 116, 101, 108, 105, 115, 116]";
         }
     ];
 };

package/dist/artifacts/zebec_vault.json

@@ -194,6 +194,19 @@
                         ]
                     }
                 },
+                {
+                    "name": "whitelist",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 119, 104, 105, 116, 101, 108, 105, 115, 116
+                                ]
+                            }
+                        ]
+                    }
+                },
                 {
                     "name": "token_mint"
                 },
@@ -358,6 +371,45 @@
                 }
             ]
         },
+        {
+            "name": "whitelist_token",
+            "discriminator": [6, 141, 83, 167, 31, 6, 2, 224],
+            "accounts": [
+                {
+                    "name": "whitelister",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "whitelist",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 119, 104, 105, 116, 101, 108, 105, 115, 116
+                                ]
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "params",
+                    "type": {
+                        "defined": {
+                            "name": "WhitelistTokenParams"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "withdraw_sol",
             "discriminator": [145, 131, 74, 136, 65, 137, 42, 38],
@@ -526,6 +578,10 @@
         {
             "name": "Vault",
             "discriminator": [211, 8, 232, 43, 2, 152, 117, 119]
+        },
+        {
+            "name": "Whitelist",
+            "discriminator": [204, 176, 52, 79, 146, 121, 54, 247]
         }
     ],
     "events": [
@@ -561,6 +617,10 @@
             "name": "TokenDeposited",
             "discriminator": [104, 7, 18, 187, 94, 141, 251, 120]
         },
+        {
+            "name": "TokenWhitelisted",
+            "discriminator": [65, 3, 231, 165, 235, 116, 154, 51]
+        },
         {
             "name": "TokenWithdrawn",
             "discriminator": [35, 57, 130, 51, 154, 247, 155, 142]
@@ -615,6 +675,16 @@
             "code": 6008,
             "name": "NotEnoughTokens",
             "msg": "Not enough tokens for lamports"
+        },
+        {
+            "code": 6009,
+            "name": "NotValidAdmin",
+            "msg": "Not valid admin"
+        },
+        {
+            "code": 6010,
+            "name": "TokenNotWhitelisted",
+            "msg": "Token not whitelisted"
         }
     ],
     "types": [
@@ -1088,6 +1158,24 @@
                 ]
             }
         },
+        {
+            "name": "TokenWhitelisted",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "token_addresses",
+                        "type": {
+                            "vec": "pubkey"
+                        }
+                    },
+                    {
+                        "name": "whitelister",
+                        "type": "pubkey"
+                    }
+                ]
+            }
+        },
         {
             "name": "TokenWithdrawn",
             "type": {
@@ -1160,6 +1248,54 @@
                 ]
             }
         },
+        {
+            "name": "Whitelist",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "admin",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "whitelisted_tokens",
+                        "type": {
+                            "vec": {
+                                "defined": {
+                                    "name": "WhitelistedToken"
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "WhitelistTokenParams",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "token_addresses",
+                        "type": {
+                            "vec": "pubkey"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "WhitelistedToken",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "token_address",
+                        "type": "pubkey"
+                    }
+                ]
+            }
+        },
         {
             "name": "WithdrawSolParams",
             "type": {
@@ -1196,6 +1332,13 @@
                 "array": ["u8", 18]
             },
             "value": "[122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114]"
+        },
+        {
+            "name": "WHITELIST_PREFIX",
+            "type": {
+                "array": ["u8", 21]
+            },
+            "value": "[122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 119, 104, 105, 116, 101, 108, 105, 115, 116]"
         }
     ]
 }

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export * from "./providers";
 export * from "./service";
 export * from "./types";
 export * from "./utils";
+export { deriveLockupAddress, deriveRewardVaultAddress, deriveStakeAddress, deriveStakeVaultAddress, deriveUserNonceAddress, InitLockupInstructionData, LockupInfo, ParsedRewardScheme, RateLimitedQueue, ReadonlyProvider, RewardScheme, StakeInfo, StakeInfoWithHash, StakeInstructionData, StakeService, StakeServiceBuilder, UserNonceInfo, ZEBEC_STAKE_IDL_V1, ZEBEC_STAKE_PROGRAM, ZebecStakeIdlV1, } from "@zebec-network/zebec-stake-sdk";

package/dist/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZEBEC_STAKE_PROGRAM = exports.ZEBEC_STAKE_IDL_V1 = exports.StakeServiceBuilder = exports.StakeService = exports.ReadonlyProvider = exports.RateLimitedQueue = exports.deriveUserNonceAddress = exports.deriveStakeVaultAddress = exports.deriveStakeAddress = exports.deriveRewardVaultAddress = exports.deriveLockupAddress = void 0;
 __exportStar(require("./artifacts"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./pda"), exports);
@@ -21,3 +22,15 @@ __exportStar(require("./providers"), exports);
 __exportStar(require("./service"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
+var zebec_stake_sdk_1 = require("@zebec-network/zebec-stake-sdk");
+Object.defineProperty(exports, "deriveLockupAddress", { enumerable: true, get: function () { return zebec_stake_sdk_1.deriveLockupAddress; } });
+Object.defineProperty(exports, "deriveRewardVaultAddress", { enumerable: true, get: function () { return zebec_stake_sdk_1.deriveRewardVaultAddress; } });
+Object.defineProperty(exports, "deriveStakeAddress", { enumerable: true, get: function () { return zebec_stake_sdk_1.deriveStakeAddress; } });
+Object.defineProperty(exports, "deriveStakeVaultAddress", { enumerable: true, get: function () { return zebec_stake_sdk_1.deriveStakeVaultAddress; } });
+Object.defineProperty(exports, "deriveUserNonceAddress", { enumerable: true, get: function () { return zebec_stake_sdk_1.deriveUserNonceAddress; } });
+Object.defineProperty(exports, "RateLimitedQueue", { enumerable: true, get: function () { return zebec_stake_sdk_1.RateLimitedQueue; } });
+Object.defineProperty(exports, "ReadonlyProvider", { enumerable: true, get: function () { return zebec_stake_sdk_1.ReadonlyProvider; } });
+Object.defineProperty(exports, "StakeService", { enumerable: true, get: function () { return zebec_stake_sdk_1.StakeService; } });
+Object.defineProperty(exports, "StakeServiceBuilder", { enumerable: true, get: function () { return zebec_stake_sdk_1.StakeServiceBuilder; } });
+Object.defineProperty(exports, "ZEBEC_STAKE_IDL_V1", { enumerable: true, get: function () { return zebec_stake_sdk_1.ZEBEC_STAKE_IDL_V1; } });
+Object.defineProperty(exports, "ZEBEC_STAKE_PROGRAM", { enumerable: true, get: function () { return zebec_stake_sdk_1.ZEBEC_STAKE_PROGRAM; } });

package/dist/pda.d.ts

@@ -1,3 +1,4 @@
 import { Address } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 export declare function deriveVaultSigner(vault: Address, programId: Address): [PublicKey, number];
+export declare function deriveWhitelist(programId: Address): [PublicKey, number];

package/dist/pda.js

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deriveVaultSigner = deriveVaultSigner;
+exports.deriveWhitelist = deriveWhitelist;
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const SEEDS = {
     VAULT_SIGNER: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 115, 105, 103, 110, 101, 114],
+    WHITELIST: [122, 101, 98, 101, 99, 95, 118, 97, 117, 108, 116, 95, 119, 104, 105, 116, 101, 108, 105, 115, 116],
 };
 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));
     return addressAndBump;
 }
+function deriveWhitelist(programId) {
+    const addressAndBump = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(SEEDS.WHITELIST)], (0, anchor_1.translateAddress)(programId));
+    return addressAndBump;
+}

package/dist/service.d.ts

@@ -1,9 +1,9 @@
 import { Address, BN, Program, Provider } from "@coral-xyz/anchor";
-import { AccountMeta, Keypair, PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { AccountMeta, Keypair, PublicKey, Signer, TransactionInstruction } from "@solana/web3.js";
 import { TransactionPayload } from "@zebec-network/solana-common";
 import { ZebecVaultIdlV1 } from "./artifacts";
 import { RpcNetwork } from "./constants";
-import { Numeric, ProposalAction, ProposalInfo, VaultInfo } from "./types";
+import { Numeric, ProposalAction, ProposalInfo, VaultInfo, WhitelistInfo } from "./types";
 export declare class ZebecVaultService {
     readonly provider: Provider;
     readonly program: Program<ZebecVaultIdlV1>;
@@ -20,6 +20,7 @@ export declare class ZebecVaultService {
     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>;
+    getWhitelistTokenInstruction(whitelister: PublicKey, tokenAddresses: PublicKey[]): Promise<TransactionInstruction>;
     createVault(params: {
         payer?: Address;
         vaultKeypair?: Keypair;
@@ -65,16 +66,23 @@ export declare class ZebecVaultService {
     executeProposal(params: {
         caller?: Address;
         proposal: Address;
+        partialSigners?: Signer[];
     }): Promise<TransactionPayload>;
     executeProposalDirect(params: {
         vault: Address;
         proposer?: Address;
         actions: TransactionInstruction[];
+        partialSigners?: Signer[];
+    }): Promise<TransactionPayload>;
+    whitelistTokens(params: {
+        whitelister?: Address;
+        tokenAddresses: Address[];
     }): Promise<TransactionPayload>;
     private _createTransactionPayload;
     getVaultsInfoOfUser(user?: Address): Promise<VaultInfo[]>;
     getAllVaultsInfo(): Promise<VaultInfo[]>;
     getProposalsInfoOfVault(vault: Address): Promise<ProposalInfo[]>;
+    getWhitelistInfo(): Promise<WhitelistInfo | null>;
     get programId(): PublicKey;
     get connection(): import("@solana/web3.js").Connection;
 }

package/dist/service.js

@@ -136,6 +136,16 @@ class ZebecVaultService {
             .remainingAccounts(remainingAccounts)
             .instruction();
     }
+    async getWhitelistTokenInstruction(whitelister, tokenAddresses) {
+        return this.program.methods
+            .whitelistToken({
+            tokenAddresses,
+        })
+            .accounts({
+            whitelister,
+        })
+            .instruction();
+    }
     async createVault(params) {
         const payer = params.payer ? (0, anchor_1.translateAddress)(params.payer) : this.provider.publicKey;
         if (!payer) {
@@ -267,9 +277,10 @@ class ZebecVaultService {
             });
             return acc;
         }, []);
+        const signers = params.partialSigners ? params.partialSigners : [];
         const ix = await this.getExecuteProposalInstruction(caller, proposal, remainingAccounts);
         console.log("ix:", JSON.stringify(ix.keys, null, 2));
-        return this._createTransactionPayload(caller, [ix]);
+        return this._createTransactionPayload(caller, [ix], signers);
     }
     async executeProposalDirect(params) {
         const proposer = params.proposer ? (0, anchor_1.translateAddress)(params.proposer) : this.provider.publicKey;
@@ -297,7 +308,17 @@ class ZebecVaultService {
             return acc;
         }, []);
         const ix = await this.getExecuteProposalDirectInstruction(vault, proposer, actions, remainingAccounts);
-        return this._createTransactionPayload(proposer, [ix]);
+        const signers = params.partialSigners ? params.partialSigners : [];
+        return this._createTransactionPayload(proposer, [ix], signers);
+    }
+    async whitelistTokens(params) {
+        const whitelister = params.whitelister ? (0, anchor_1.translateAddress)(params.whitelister) : this.provider.publicKey;
+        if (!whitelister) {
+            throw new Error("Either provide a whitelister or use AnchorProvider for provider in the service");
+        }
+        const tokens = params.tokenAddresses.map((address) => (0, anchor_1.translateAddress)(address));
+        const ix = await this.getWhitelistTokenInstruction(whitelister, tokens);
+        return this._createTransactionPayload(whitelister, [ix]);
     }
     async _createTransactionPayload(payerKey, instructions, signers, addressLookupTableAccounts) {
         const errorMap = new Map();
@@ -406,6 +427,17 @@ class ZebecVaultService {
         });
         return proposals;
     }
+    async getWhitelistInfo() {
+        const [whitelist] = (0, pda_1.deriveWhitelist)(this.programId);
+        const whitelistAccount = await this.program.account.whitelist.fetchNullable(whitelist, this.connection.commitment);
+        if (!whitelistAccount) {
+            return null;
+        }
+        return {
+            ...whitelistAccount,
+            whitelist,
+        };
+    }
     get programId() {
         return this.program.programId;
     }

package/dist/types.d.ts

@@ -33,3 +33,10 @@ export type VaultInfo = {
     createdDate: number;
     signerBump: number;
 };
+export type WhitelistInfo = {
+    whitelist: PublicKey;
+    admin: PublicKey;
+    whitelistedTokens: {
+        tokenAddress: PublicKey;
+    }[];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zebec-network/zebec-vault-sdk",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "An SDK for zebec vault solana program",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,6 +39,7 @@
     "@solana/web3.js": "^1.98.2",
     "@types/bn.js": "^5.2.0",
     "@zebec-network/solana-common": "^1.3.0",
+    "@zebec-network/zebec-stake-sdk": "^1.0.8",
     "bignumber.js": "^9.3.0",
     "buffer": "^6.0.3"
   }