hedge-web3 0.1.27 → 0.1.31

package/lib/instructions/claimStakingPoolPosition.js

@@ -24,7 +24,7 @@ function claimStakingPoolPosition(program, provider, poolPosition, payer, collat
         const feePoolAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, feePool, true);
         const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, collateralMint, payer.publicKey);
         const transaction = new web3_js_1.Transaction().add(yield claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount.address, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer.publicKey, payerAssociatedTokenAccount.address));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return payerAssociatedTokenAccount.address;
     });
 }
@@ -32,24 +32,24 @@ exports.claimStakingPoolPosition = claimStakingPoolPosition;
 function claimStakingPoolPositionInstruction(program, feePool, feePoolAssociatedTokenAccount, stakedTokenMint, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        return program.instruction.claimStakingPoolPosition({
-            accounts: {
-                vaultSystemState: vaultSystemState,
-                feePool: feePool,
-                stakedTokenMint: stakedTokenMint,
-                feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
-                vaultTypeAccount: vaultTypeAccount,
-                collateralMint: collateralMint,
-                poolPosition: poolPosition,
-                payer: payer,
-                payerAssociatedTokenAccount: payerAssociatedTokenAccount,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY
-            },
-            signers: []
-        });
+        return yield program.methods
+            .claimStakingPoolPosition()
+            .accounts({
+            vaultSystemState: vaultSystemState,
+            feePool: feePool,
+            stakedTokenMint: stakedTokenMint,
+            feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
+            vaultTypeAccount: vaultTypeAccount,
+            collateralMint: collateralMint,
+            poolPosition: poolPosition,
+            payer: payer,
+            payerAssociatedTokenAccount: payerAssociatedTokenAccount,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
     });
 }
 exports.claimStakingPoolPositionInstruction = claimStakingPoolPositionInstruction;

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -26,7 +26,7 @@ function closeLiquidationPoolPosition(program, provider, poolPosition, payer, ov
         const payerAssociatedHedgeAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, payer.publicKey);
         const communityAssociatedHedgeTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true);
         const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUshAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, overrideStartTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return poolPosition;
     });
 }
@@ -38,27 +38,27 @@ function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition,
         const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
         const poolUshAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
         const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
-        return program.instruction.closeLiquidationPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                poolState: poolState,
-                poolEra: poolEra,
-                poolPosition: poolPosition,
-                poolUshAccount: poolUshAccount,
-                payer: payerPublicKey,
-                ownerUshAccount: payerUshAccount,
-                hedgeMint: hedgeMint,
-                ushMint: ushMint,
-                payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
-                communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY
-            },
-            signers: []
-        });
+        return yield program.methods
+            .closeLiquidationPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            poolState: poolState,
+            poolEra: poolEra,
+            poolPosition: poolPosition,
+            poolUshAccount: poolUshAccount,
+            payer: payerPublicKey,
+            ownerUshAccount: payerUshAccount,
+            hedgeMint: hedgeMint,
+            ushMint: ushMint,
+            payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
+            communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
     });
 }
 exports.closeLiquidationPoolPositionInstruction = closeLiquidationPoolPositionInstruction;

package/lib/instructions/createStakingPool.js

@@ -18,7 +18,7 @@ const Constants_1 = require("../Constants");
 function createStakingPool(program, provider, payer, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const transaction = new web3_js_1.Transaction().add(yield createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         const [poolPublickey] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
         return poolPublickey;
     });
@@ -26,28 +26,27 @@ function createStakingPool(program, provider, payer, mintPublicKey, hedgeTokensT
 exports.createStakingPool = createStakingPool;
 function createStakingPoolInstruction(program, payerPublicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log("createStakingPoolInstruction program ID", program.programId.toString());
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const [poolPublickey, poolBump, poolSeedPhrase] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
+        const [poolPublickey, poolBump] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
         const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, mintPublicKey);
         const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, ushMintPublickey);
-        return program.instruction.createStakingPool(poolBump, poolSeedPhrase, new anchor_1.BN(hedgeTokensToBeMinted), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), {
-            accounts: {
-                signer: payerPublicKey,
-                vaultSystemState: vaultSystemStatePublicKey,
-                pool: poolPublickey,
-                stakedTokenMintInfo: mintPublicKey,
-                ushMint: ushMintPublickey,
-                poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-                poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .createStakingPool(poolBump, new anchor_1.BN(hedgeTokensToBeMinted), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)))
+            .accounts({
+            signer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            pool: poolPublickey,
+            stakedTokenMintInfo: mintPublicKey,
+            ushMint: ushMintPublickey,
+            poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+            poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.createStakingPoolInstruction = createStakingPoolInstruction;

package/lib/instructions/createVault.js

@@ -32,8 +32,7 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
         const wrappedSolAccount = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
-        const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() ===
-            serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
+        const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
         const feePoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         if (isWrappedSol) {
@@ -58,16 +57,15 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
                 owner: payer.publicKey,
             }));
         }
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, signers, provider === null || provider === void 0 ? void 0 : provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
         return newVaultPublicKey;
     });
 }
 exports.createVault = createVault;
-function buildCreateVaultTransaction(program, collateralType, depositAmount, overrideTime) {
+function buildCreateVaultTransaction(program, payerPublicKey, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log("HEDGE SDK: buildCreateVaultTransaction");
+        console.log('HEDGE SDK: buildCreateVaultTransaction');
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
-        const payerPublicKey = program.provider.wallet.publicKey;
         const salt = (0, uuid_1.v4)().substring(0, 8);
         const newVaultPublicKey = yield (0, Constants_1.findVaultAddress)(salt);
         const history = web3_js_1.Keypair.generate();
@@ -84,8 +82,7 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
         console.log('Lookup vaultTypeAccountPublicKey', vaultTypeAccountPublicKey.toString());
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         console.log('Lookup vaultTypeAccountInfo', vaultTypeAccountInfo);
-        const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() ===
-            serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
+        const isWrappedSol = vaultTypeAccountInfo.collateralMint.toString() === serum_1.TokenInstructions.WRAPPED_SOL_MINT.toString();
         const payerTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, vaultTypeAccountInfo.collateralMint);
         const vaultAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(yield (0, Constants_1.getHedgeMintPublicKey)());
@@ -106,7 +103,7 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
             }));
             signers.push(wrappedSolAccount);
         }
-        console.log("hedgeStakingPoolPublicKey", hedgeStakingPoolPublicKey.toString());
+        console.log('hedgeStakingPoolPublicKey', hedgeStakingPoolPublicKey.toString());
         transaction.add(yield createVaultInstruction(program, salt, payerPublicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, depositAmount, overrideTime));
         if (isWrappedSol) {
             transaction.add(serum_1.TokenInstructions.closeAccount({
@@ -117,7 +114,7 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
             transaction.partialSign(wrappedSolAccount);
         }
         transaction.partialSign(history);
-        console.log("transaction", transaction);
+        console.log('transaction', transaction);
         return [transaction, signers, newVaultPublicKey];
     });
 }
@@ -125,27 +122,27 @@ exports.buildCreateVaultTransaction = buildCreateVaultTransaction;
 function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccountPublicKey, vaultPublicKey, vaultAssociatedTokenAccount, feePool, feePoolAssociatedUshTokenAccount, vaultTypeAccount, collateralMint, historyPublicKey, ushMintPublickey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const ix = program.instruction.createVault(salt, new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vault: vaultPublicKey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                feePool: feePool,
-                feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
-                history: historyPublicKey,
-                payer: payerPublicKey,
-                payerTokenAccount: payerTokenAccountPublicKey,
-                collateralMint: collateralMint,
-                ushMint: ushMintPublickey,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-            },
-            signers: [],
-        });
+        const ix = program.methods
+            .createVault(salt, new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vault: vaultPublicKey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            feePool: feePool,
+            feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
+            history: historyPublicKey,
+            payer: payerPublicKey,
+            payerTokenAccount: payerTokenAccountPublicKey,
+            collateralMint: collateralMint,
+            ushMint: ushMintPublickey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
         return ix;
     });
 }

package/lib/instructions/depositLiquidationPool.js

@@ -21,7 +21,7 @@ function depositLiquidationPool(program, provider, payer, depositAmount, overrid
         const payerUshAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, ushMintPublickey, payer.publicKey);
         const poolPosition = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield depositLiquidationPoolInstruction(program, payer.publicKey, payerUshAccount.address, poolPosition.publicKey, depositAmount, overrideStartTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolPosition], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolPosition]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }
@@ -33,23 +33,22 @@ function depositLiquidationPoolInstruction(program, payerPublicKey, payerUshAcco
         const poolUSHAccount = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
         const ushMint = yield (0, Constants_1.getUshMintPublicKey)();
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        return program.instruction.depositLiquidationPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemState,
-                poolState: liquidationPoolStatePublicKey,
-                poolEra: liquidationPoolState.currentEra,
-                poolPosition: poolPositionPublicKey,
-                poolUshAccount: poolUSHAccount,
-                ushMint: ushMint,
-                payer: payerPublicKey,
-                ownerUshAccount: payerUshAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY
-            },
-            signers: []
-        });
+        return yield program.methods
+            .depositLiquidationPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemState,
+            poolState: liquidationPoolStatePublicKey,
+            poolUshAccount: poolUSHAccount,
+            poolEra: liquidationPoolState.currentEra,
+            poolPosition: poolPositionPublicKey,
+            ushMint: ushMint,
+            payer: payerPublicKey,
+            ownerUshAccount: payerUshAccount,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.depositLiquidationPoolInstruction = depositLiquidationPoolInstruction;

package/lib/instructions/depositStakingPool.js

@@ -19,7 +19,7 @@ function depositStakingPool(program, provider, payer, mintPublicKey, depositAmou
     return __awaiter(this, void 0, void 0, function* () {
         const poolPosition = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield depositStakingPoolInstruction(program, payer.publicKey, poolPosition.publicKey, mintPublicKey, depositAmount, overrideStartTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolPosition], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolPosition]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }
@@ -30,23 +30,21 @@ function depositStakingPoolInstruction(program, payerPublicKey, poolPositionPubl
         const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, stakedTokenMintPublicKey);
         const payersArbitraryTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, stakedTokenMintPublicKey);
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        return program.instruction.depositStakingPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
-        {
-            accounts: {
-                payer: payerPublicKey,
-                vaultSystemState: vaultSystemState,
-                pool: poolPublickey,
-                poolPosition: poolPositionPublicKey,
-                stakedTokenMintInfo: stakedTokenMintPublicKey,
-                poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-                payerAssociatedStakedTokenAccount: payersArbitraryTokenAccount,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .depositStakingPool(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemState,
+            pool: poolPublickey,
+            poolPosition: poolPositionPublicKey,
+            stakedTokenMintInfo: stakedTokenMintPublicKey,
+            poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+            payerAssociatedStakedTokenAccount: payersArbitraryTokenAccount,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.depositStakingPoolInstruction = depositStakingPoolInstruction;

package/lib/instructions/depositVault.js

@@ -14,6 +14,7 @@ const anchor_1 = require("@project-serum/anchor");
 const serum_1 = require("@project-serum/serum");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
+const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
 function depositVault(program, provider, payer, vaultPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -33,55 +34,59 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
+        const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, 0, false, false);
         if (vaultAccount.collateralType === 'SOL') {
             transaction.add(web3_js_1.SystemProgram.createAccount({
                 fromPubkey: payer.publicKey,
                 lamports: depositAmount + 2.04e6,
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
-                space: 165
+                space: 165,
             }), serum_1.TokenInstructions.initializeAccount({
                 account: wrappedSolAccount.publicKey,
                 mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payer.publicKey
+                owner: payer.publicKey,
             }));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, depositAmount, overrideTime));
+        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime));
         if (vaultAccount.collateralType === 'SOL') {
             transaction.add(serum_1.TokenInstructions.closeAccount({
                 source: wrappedSolAccount.publicKey,
                 destination: payer.publicKey,
-                owner: payer.publicKey
+                owner: payer.publicKey,
             }));
         }
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, signers, provider.opts);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, signers);
         return vaultPublicKey;
     });
 }
 exports.depositVault = depositVault;
-function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner, vaultOwnerTokenAccount, vaultPublicKey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, ushMintPublickey, depositAmount, overrideTime) {
+function depositVaultInstruction(program, vaultSystemStatePublicKey, vaultOwner, vaultOwnerTokenAccount, vaultPublicKey, vaultAssociatedTokenAccount, historyPublicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        return program.instruction.depositVault(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccountPublicKey,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                collateralTokenMint: collateralMint,
-                vault: vaultPublicKey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                history: historyPublicKey,
-                vaultOwner: vaultOwner,
-                vaultOwnerTokenAccount: vaultOwnerTokenAccount,
-                ushMint: ushMintPublickey,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
-            },
-            signers: []
-        });
+        return yield program.methods
+            .depositVault(new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccountPublicKey,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            collateralTokenMint: collateralMint,
+            vault: vaultPublicKey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            history: historyPublicKey,
+            vaultOwner: vaultOwner,
+            vaultOwnerTokenAccount: vaultOwnerTokenAccount,
+            ushMint: ushMintPublickey,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        })
+            .instruction();
     });
 }
 exports.depositVaultInstruction = depositVaultInstruction;

package/lib/instructions/initHedgeFoundation.js

@@ -18,7 +18,7 @@ function initHedgeFoundation(program, provider, payer) {
     return __awaiter(this, void 0, void 0, function* () {
         const poolEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolEra], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, poolEra]).catch(Errors_1.parseAnchorErrors);
         return payer.publicKey;
     });
 }
@@ -32,24 +32,22 @@ function initHedgeFoundationInstruction(program, poolEraPublicKey, payerPublicKe
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
         const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
-        return program.instruction.initHedgeFoundation({
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                poolState: poolStatePublickey,
-                poolEra: poolEraPublicKey,
-                poolUshAccount: poolUshTokenAccount,
-                founder: payerPublicKey,
-                ushMint: ushMintPublickey,
-                hedgeMint: hedgeMintPublickey,
-                founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
-                communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .initHedgeFoundation()
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            poolState: poolStatePublickey,
+            poolEra: poolEraPublicKey,
+            poolUshAccount: poolUshTokenAccount,
+            founder: payerPublicKey,
+            ushMint: ushMintPublickey,
+            hedgeMint: hedgeMintPublickey,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.initHedgeFoundationInstruction = initHedgeFoundationInstruction;

package/lib/instructions/initHedgeFoundationTokens.js

@@ -18,7 +18,7 @@ function initHedgeFoundationTokens(program, provider, payer) {
     return __awaiter(this, void 0, void 0, function* () {
         const poolEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield initHedgeFoundationTokensInstruction(program, payer.publicKey));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return payer.publicKey;
     });
 }
@@ -29,20 +29,20 @@ function initHedgeFoundationTokensInstruction(program, payerPublicKey) {
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const founderHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
         const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
-        return program.instruction.initHedgeFoundationTokens({
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                founder: payerPublicKey,
-                hedgeMint: hedgeMintPublickey,
-                founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
-                communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .initHedgeFoundationTokens()
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            founder: payerPublicKey,
+            hedgeMint: hedgeMintPublickey,
+            founderAssociatedHedgeTokenAccount: founderHedgeTokenAccount,
+            communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.initHedgeFoundationTokensInstruction = initHedgeFoundationTokensInstruction;