hedge-web3 0.1.29 → 0.1.33

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

@@ -49,9 +49,7 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
             }));
             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, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, 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,
@@ -59,36 +57,36 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
                 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, 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,
-                oldSmallerVaultInfo: oldSmallerPublicKey,
-                newSmallerVaultInfo: newSmallerPublicKey,
-                newLargerVaultInfo: newLargerPublicKey,
-                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;

package/lib/instructions/liquidateVault.js

@@ -37,7 +37,7 @@ function liquidateVault(program, provider, payer, vaultPublicKey, overrideTime)
         const newEra = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction();
         transaction.add(yield liquidateVaultInstruction(program, payer.publicKey, payerAssociatedTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, liquidationPoolStatePublicKey, poolStateInfo.currentEra, poolAssociatedTokenAccount.address, history.publicKey, newEra.publicKey, hedgeStakingPoolPublicKey, feePoolAssociatedTokenAccount.address, hedgeStakingPoolAssociatedUshTokenAccount.address, collateralMint, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaultAccount.collateralType, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history, newEra], provider.opts);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history, newEra]);
         return vaultPublicKey;
     });
 }
@@ -48,38 +48,37 @@ function liquidateVaultInstruction(program, payerPublicKey, payerAssociatedToken
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const liquidationPoolUshAccountPublickey = yield (0, Constants_1.getLiquidationPoolUshAccountPublicKey)();
         const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
-        const payload = {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                collateralMint: collateralMint,
-                poolEra: poolEra,
-                vaultAccount: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                poolState: poolState,
-                poolAssociatedTokenAccount: poolAssociatedTokenAccount,
-                ushMint: ushMintPublickey,
-                history: historyPublicKey,
-                payer: payerPublicKey,
-                payerAssociatedTokenAccount: payerAssociatedTokenAccount,
-                feePool: feePool,
-                feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                liquidationPoolUshAccount: liquidationPoolUshAccountPublickey,
-                newEra: newEraPublicKey,
-                oldSmallerVaultInfo: oldSmallerPublicKey,
-                newSmallerVaultInfo: newSmallerPublicKey,
-                newLargerVaultInfo: newLargerPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-            },
-            signers: [],
-        };
-        return program.instruction.liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        payload);
+        return yield program.methods
+            .liquidateVault(new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            collateralMint: collateralMint,
+            poolEra: poolEra,
+            vaultAccount: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            poolState: poolState,
+            poolAssociatedTokenAccount: poolAssociatedTokenAccount,
+            ushMint: ushMintPublickey,
+            history: historyPublicKey,
+            payer: payerPublicKey,
+            payerAssociatedTokenAccount: payerAssociatedTokenAccount,
+            feePool: feePool,
+            feePoolAssociatedTokenAccount: feePoolAssociatedTokenAccount,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            liquidationPoolUshAccount: liquidationPoolUshAccountPublickey,
+            newEra: newEraPublicKey,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+        })
+            .instruction();
     });
 }
 exports.liquidateVaultInstruction = liquidateVaultInstruction;

package/lib/instructions/loanVault.js

@@ -27,7 +27,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, 0, loanAmount, false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }
@@ -39,28 +39,28 @@ function loanVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPub
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.instruction.loanVault(new anchor_1.BN(loanAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vaultAccount: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                history: historyPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMintPublickey,
-                vaultOwner: payerPublicKey,
-                ownerUshAccount: ownerUshAccount,
-                oldSmallerVaultInfo: oldSmallerPublicKey,
-                newSmallerVaultInfo: newSmallerPublicKey,
-                newLargerVaultInfo: newLargerPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-            },
-            signers: [],
-        });
+        return yield program.methods
+            .loanVault(new anchor_1.BN(loanAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vaultAccount: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            history: historyPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMintPublickey,
+            vaultOwner: payerPublicKey,
+            ownerUshAccount: ownerUshAccount,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.loanVaultInstruction = loanVaultInstruction;

package/lib/instructions/redeemVault.js

@@ -30,7 +30,7 @@ function redeemVault(program, provider, payer, vaultPublicKey, redeemAmount, tra
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, 0, 0, true, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield redeemVaultInstruction(program, payer.publicKey, payerUshAccount.address, payerTokenAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, redeemAmount, transactionOverrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }
@@ -42,29 +42,29 @@ function redeemVaultInstruction(program, payerPublicKey, payerUshAccount, destin
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.instruction.redeemVault(new anchor_1.BN(redeemAmount), new anchor_1.BN(transactionOverrideTime !== null && transactionOverrideTime !== void 0 ? transactionOverrideTime : (Date.now() / 1000)), // override start time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vault: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                history: historyPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMintPublickey,
-                payer: payerPublicKey,
-                payerUshAccount: payerUshAccount,
-                destinationTokenAccount: destinationTokenAccount,
-                oldSmallerVaultInfo: oldSmallerPublicKey,
-                newSmallerVaultInfo: newSmallerPublicKey,
-                newLargerVaultInfo: newLargerPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .redeemVault(new anchor_1.BN(redeemAmount), new anchor_1.BN(transactionOverrideTime !== null && transactionOverrideTime !== void 0 ? transactionOverrideTime : Date.now() / 1000) // override start time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vault: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            history: historyPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMintPublickey,
+            payer: payerPublicKey,
+            payerUshAccount: payerUshAccount,
+            destinationTokenAccount: destinationTokenAccount,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.redeemVaultInstruction = redeemVaultInstruction;

package/lib/instructions/refreshOraclePrice.js

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshOraclePriceInstruction = exports.refreshOraclePrice = void 0;
+exports.Cluster = exports.refreshOraclePriceInstruction = exports.refreshOraclePrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
 function refreshOraclePrice(program, provider, payer, collateralType, network, overridePrice, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const transaction = new web3_js_1.Transaction().add(yield refreshOraclePriceInstruction(program, collateralType, network, overridePrice, overrideTime));
-        return yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts);
+        return yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]);
     });
 }
 exports.refreshOraclePrice = refreshOraclePrice;
@@ -25,19 +25,19 @@ function refreshOraclePriceInstruction(program, collateralType, network, overrid
         const enc = new TextEncoder();
         const [oracleInfoAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
         const [vaultTypeAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], Constants_1.HEDGE_PROGRAM_PUBLICKEY);
-        return program.instruction.refreshOraclePrice(new anchor_1.BN(overridePrice !== null && overridePrice !== void 0 ? overridePrice : web3_js_1.LAMPORTS_PER_SOL * 150), // override usd/sol price
-        new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000) - 1), // override override time
-        {
-            accounts: {
-                oracleInfoAccount: oracleInfoAccount,
-                vaultTypeAccount: vaultTypeAccount,
-                oracleChainlink: chainlinkAccunts[network],
-                oraclePyth: pythAccounts[network],
-                oracleSwitchboard: switchboardAccounts[network],
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .refreshOraclePrice(new anchor_1.BN(overridePrice !== null && overridePrice !== void 0 ? overridePrice : web3_js_1.LAMPORTS_PER_SOL * 150), // override usd/sol price
+        new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000) - 1) // override override time
+        )
+            .accounts({
+            oracleInfoAccount: oracleInfoAccount,
+            vaultTypeAccount: vaultTypeAccount,
+            oracleChainlink: chainlinkAccunts[network],
+            oraclePyth: pythAccounts[network],
+            oracleSwitchboard: switchboardAccounts[network],
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.refreshOraclePriceInstruction = refreshOraclePriceInstruction;
@@ -46,20 +46,20 @@ var Cluster;
     Cluster["Testing"] = "Testing";
     Cluster["Devnet"] = "Devnet";
     Cluster["MainnetBeta"] = "MainnetBeta";
-})(Cluster || (Cluster = {}));
+})(Cluster = exports.Cluster || (exports.Cluster = {}));
 const pythAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
     Devnet: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
-    MainnetBeta: new web3_js_1.PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG')
+    MainnetBeta: new web3_js_1.PublicKey('H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG'),
 };
 const chainlinkAccunts = {
     Testing: web3_js_1.SystemProgram.programId,
     Devnet: new web3_js_1.PublicKey('FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'),
-    MainnetBeta: web3_js_1.SystemProgram.programId // CHAINLINK NOT ON MAINNET YET
+    MainnetBeta: web3_js_1.SystemProgram.programId, // CHAINLINK NOT ON MAINNET YET
 };
 const switchboardAccounts = {
     Testing: web3_js_1.SystemProgram.programId,
     // Devnet: new PublicKey('GvDMxPzN1sCj7L26YDK2HnMRXEQmQ2aemov8YBtPS7vR'),
     Devnet: new web3_js_1.PublicKey('DpoK8Zz69APV9ntjuY9C4LZCxANYMV56M2cbXEdkjxME'),
-    MainnetBeta: web3_js_1.SystemProgram.programId // Switchboard V2 NOT ON MAINNET YET
+    MainnetBeta: web3_js_1.SystemProgram.programId, // Switchboard V2 NOT ON MAINNET YET
 };

package/lib/instructions/repayVault.js

@@ -28,7 +28,7 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, 0, repayAmount * -1, false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield repayVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, repayAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }
@@ -40,28 +40,28 @@ function repayVaultInstruction(program, payerPublicKey, ownerUshAccount, vaultPu
         const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)();
         const [hedgeStakingPoolPublicKey] = yield (0, Constants_1.getPoolPublicKeyForMint)(hedgeMintPublickey);
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
-        return program.instruction.repayVault(new anchor_1.BN(repayAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vaultAccount: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-                history: historyPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMintPublickey,
-                vaultOwner: payerPublicKey,
-                oldSmallerVaultInfo: oldSmallerPublicKey,
-                newSmallerVaultInfo: newSmallerPublicKey,
-                newLargerVaultInfo: newLargerPublicKey,
-                ownerUshAccount: ownerUshAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-            },
-            signers: [],
-        });
+        return yield program.methods
+            .repayVault(new anchor_1.BN(repayAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vaultAccount: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
+            history: historyPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMintPublickey,
+            vaultOwner: payerPublicKey,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            ownerUshAccount: ownerUshAccount,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.repayVaultInstruction = repayVaultInstruction;