hedge-web3 0.3.0 → 0.3.2

package/lib/instructions/createVault.js

@@ -16,13 +16,14 @@ exports.createVault = createVault;
 exports.buildCreateVaultTransaction = buildCreateVaultTransaction;
 exports.createVaultInstruction = createVaultInstruction;
 const anchor_1 = require("@coral-xyz/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 HedgeConstants_1 = require("../HedgeConstants");
 const uuid_1 = require("uuid");
 const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+const spl_token_2 = require("@solana/spl-token");
+const spl_token_3 = require("@solana/spl-token");
 function createVault(program, provider, payer, collateralType, depositAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, HedgeConstants_1.getUshMintPublicKey)(program.programId);
@@ -38,7 +39,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() === spl_token_1.NATIVE_MINT.toString();
         const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId));
         const feePoolAssociatedUshTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, hedgeStakingPoolPublicKey, ushMintPublickey);
         if (isWrappedSol) {
@@ -48,22 +49,14 @@ function createVault(program, provider, payer, collateralType, depositAmount, ov
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
                 space: 165,
-            }), serum_1.TokenInstructions.initializeAccount({
-                account: wrappedSolAccount.publicKey,
-                mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payer.publicKey,
-            }));
+            }), (0, spl_token_2.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, payer.publicKey));
             signers.push(wrappedSolAccount);
         }
         transaction.add(yield createVaultInstruction(program, salt, payer.publicKey, isWrappedSol ? wrappedSolAccount.publicKey : payerTokenAccount, newVaultPublicKey, vaultAssociatedTokenAccount, hedgeStakingPoolPublicKey, feePoolAssociatedUshTokenAccount, vaultTypeAccountPublicKey, vaultTypeAccountInfo.collateralMint, history.publicKey, ushMintPublickey, new anchor_1.BN(depositAmount), overrideTime));
         if (isWrappedSol) {
-            transaction.add(serum_1.TokenInstructions.closeAccount({
-                source: wrappedSolAccount.publicKey,
-                destination: payer.publicKey,
-                owner: payer.publicKey,
-            }));
+            transaction.add((0, spl_token_3.createCloseAccountInstruction)(wrappedSolAccount.publicKey, payer.publicKey, payer.publicKey));
         }
-        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
+        const result = yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers).catch(Errors_1.parseAnchorErrors);
         return newVaultPublicKey;
     });
 }
@@ -77,7 +70,8 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
         const { blockhash, lastValidBlockHeight } = yield program.provider.connection.getLatestBlockhash();
         const transaction = new web3_js_1.Transaction({
             feePayer: payerPublicKey,
-            recentBlockhash: blockhash,
+            blockhash: blockhash,
+            lastValidBlockHeight: lastValidBlockHeight,
         });
         const signers = [history];
         const wrappedSolAccount = web3_js_1.Keypair.generate();
@@ -87,7 +81,7 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
         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() === spl_token_1.NATIVE_MINT.toString();
         const payerTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, vaultTypeAccountInfo.collateralMint);
         const vaultAssociatedTokenAccount = yield (0, HedgeConstants_1.findAssociatedTokenAddress)(program.programId, newVaultPublicKey, vaultTypeAccountInfo.collateralMint);
         const [hedgeStakingPoolPublicKey] = yield (0, HedgeConstants_1.getPoolPublicKeyForMint)(program.programId, yield (0, HedgeConstants_1.getHedgeMintPublicKey)(program.programId));
@@ -101,21 +95,13 @@ function buildCreateVaultTransaction(program, payerPublicKey, collateralType, de
                 newAccountPubkey: wrappedSolAccount.publicKey,
                 programId: spl_token_1.TOKEN_PROGRAM_ID,
                 space: 165,
-            }), serum_1.TokenInstructions.initializeAccount({
-                account: wrappedSolAccount.publicKey,
-                mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payerPublicKey,
-            }));
+            }), (0, spl_token_2.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, payerPublicKey));
             signers.push(wrappedSolAccount);
         }
         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, new anchor_1.BN(depositAmount), overrideTime));
         if (isWrappedSol) {
-            transaction.add(serum_1.TokenInstructions.closeAccount({
-                source: wrappedSolAccount.publicKey,
-                destination: payerPublicKey,
-                owner: payerPublicKey,
-            }));
+            transaction.add((0, spl_token_3.createCloseAccountInstruction)(wrappedSolAccount.publicKey, payerPublicKey, payerPublicKey));
             transaction.partialSign(wrappedSolAccount);
         }
         transaction.partialSign(history);
@@ -127,20 +113,20 @@ function createVaultInstruction(program, salt, payerPublicKey, payerTokenAccount
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         return yield 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
+            .createVault(salt, new anchor_1.BN(depositAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override time
         )
             .accounts({
             vaultSystemState: vaultSystemStatePublicKey,
             vaultTypeAccount: vaultTypeAccount,
             vault: vaultPublicKey,
             vaultAssociatedTokenAccount: vaultAssociatedTokenAccount,
-            feePool: feePool,
-            feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
+            // feePool: feePool,
+            // feePoolAssociatedUshTokenAccount: feePoolAssociatedUshTokenAccount,
             history: historyPublicKey,
             payer: payerPublicKey,
             payerTokenAccount: payerTokenAccountPublicKey,
             collateralMint: collateralMint,
-            ushMint: ushMintPublickey,
+            // ushMint: ushMintPublickey,
             systemProgram: web3_js_1.SystemProgram.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,

package/lib/instructions/depositVault.js

@@ -15,8 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.depositVault = depositVault;
 exports.depositVaultInstruction = depositVaultInstruction;
 const anchor_1 = require("@coral-xyz/anchor");
-const serum_1 = require("@project-serum/serum");
-const token_instructions_1 = require("@project-serum/serum/lib/token-instructions");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const HedgeConstants_1 = require("../HedgeConstants");
@@ -40,29 +38,21 @@ function depositVault(program, provider, payer, vaultPublicKey, depositAmount, o
         const transaction = new web3_js_1.Transaction();
         const signers = [payer, history];
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, vaultAccount.vaultType, vaultPublicKey, new anchor_1.BN(depositAmount), new anchor_1.BN(0), new anchor_1.BN(0), new anchor_1.BN(0), false, false);
-        if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
+        if (vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
             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,
-            }), serum_1.TokenInstructions.initializeAccount({
-                account: wrappedSolAccount.publicKey,
-                mint: serum_1.TokenInstructions.WRAPPED_SOL_MINT,
-                owner: payer.publicKey,
-            }));
+            }), (0, spl_token_1.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, payer.publicKey));
             signers.push(wrappedSolAccount);
         }
-        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()
+        transaction.add(yield depositVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString()
             ? wrappedSolAccount.publicKey
             : payerTokenAccount, vaultPublicKey, vaultAssociatedCollateralAccountPublicKey, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, vaultTypeAccountInfo.collateralMint, ushMintPublickey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(depositAmount), overrideTime));
-        if (vaultTypeAccountInfo.collateralMint.toString() === token_instructions_1.WRAPPED_SOL_MINT.toString()) {
-            transaction.add(serum_1.TokenInstructions.closeAccount({
-                source: wrappedSolAccount.publicKey,
-                destination: payer.publicKey,
-                owner: payer.publicKey,
-            }));
+        if (vaultTypeAccountInfo.collateralMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
+            transaction.add((0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, payer.publicKey, payer.publicKey, []));
         }
         yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, signers);
         return vaultPublicKey;

package/lib/instructions/initHedgeFoundation.js

@@ -21,9 +21,21 @@ const Errors_1 = require("../utils/Errors");
 const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function initHedgeFoundation(program, provider, payer) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log('Initializing Hedge Foundation...');
         const poolEra = web3_js_1.Keypair.generate();
-        const transaction = new web3_js_1.Transaction().add(yield initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey));
-        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolEra]).catch(Errors_1.parseAnchorErrors);
+        console.log('Generated poolEra:', poolEra.publicKey.toBase58());
+        const transaction = new web3_js_1.Transaction();
+        transaction.feePayer = payer.publicKey;
+        transaction.add(yield initHedgeFoundationInstruction(program, poolEra.publicKey, payer.publicKey));
+        console.log('Created transaction with initHedgeFoundationInstruction');
+        console.log('Payer public key:', payer.publicKey.toBase58());
+        console.log('Sending transaction...');
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, poolEra])
+            .catch(err => {
+            console.error('Failed to initialize Hedge Foundation:', err);
+            throw (0, Errors_1.parseAnchorErrors)(err);
+        });
+        console.log('Successfully initialized Hedge Foundation');
         return payer.publicKey;
     });
 }

package/lib/instructions/loanVault.js

@@ -39,7 +39,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         }
         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, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, new anchor_1.BN(loanAmount), referralAccountPublicKey, overrideTime));
-        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history], 300000);
         return vaultPublicKey;
     });
 }

package/lib/instructions/redeemVault.js

@@ -16,7 +16,6 @@ exports.redeemVault = redeemVault;
 exports.redeemVaultInstruction = redeemVaultInstruction;
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
-// import { TokenInstructions } from '@project-serum/serum'
 const web3_js_1 = require("@solana/web3.js");
 const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");

package/lib/instructions/refreshOraclePrice.js

@@ -22,7 +22,7 @@ const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfi
 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, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
+        return yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer], 800000);
     });
 }
 function refreshOraclePriceInstruction(program, collateralType, network, overridePrice, overrideTime) {

package/lib/instructions/withdrawVault.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawVault = withdrawVault;
 exports.withdrawVaultInstruction = withdrawVaultInstruction;
 const anchor_1 = require("@coral-xyz/anchor");
-const serum_1 = require("@project-serum/serum");
 const spl_token_1 = require("@solana/spl-token");
+const spl_token_2 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const HedgeConstants_1 = require("../HedgeConstants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
@@ -29,7 +29,7 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         const history = web3_js_1.Keypair.generate();
         const vaultSystemStatePublicKey = yield (0, HedgeConstants_1.getVaultSystemStatePublicKey)(program.programId);
         const vaultAccount = yield program.account.vault.fetch(vaultPublicKey);
-        const vaultAssociatedCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, serum_1.TokenInstructions.WRAPPED_SOL_MINT, vaultPublicKey, true);
+        const vaultAssociatedCollateralAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, spl_token_2.NATIVE_MINT, vaultPublicKey, true);
         const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultAccount.vaultType);
         const vaultTypeAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, vaultAccount.vaultType, true);
         const destinationTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, vaultTypeAccountInfo.collateralMint, payer.publicKey);

package/lib/state/VaultAccount.js

@@ -40,7 +40,7 @@ exports.VaultAccount = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const HedgeDecimal_1 = require("../HedgeDecimal");
-const borsh = __importStar(require("@project-serum/borsh"));
+const borsh = __importStar(require("@coral-xyz/borsh"));
 const bn_js_1 = __importDefault(require("bn.js"));
 /**
  * A class that represents an on-chian vault.

package/lib/utils/sendAndConfirmWithDebug.js

@@ -10,26 +10,62 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = sendAndConfirmWithDebug;
-function sendAndConfirmWithDebug(connection, transaction, signers) {
+const web3_js_1 = require("@solana/web3.js");
+function sendAndConfirmWithDebug(connection, transaction, signers, computeUnits) {
     return __awaiter(this, void 0, void 0, function* () {
-        return connection
-            .sendTransaction(transaction, signers)
-            .then((signature) => {
-            return connection
-                .confirmTransaction(signature)
-                .then((signatureContext) => {
+        try {
+            // Get the latest blockhash before sending
+            const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash();
+            // Set blockhash AND feePayer BEFORE converting to VersionedTransaction
+            if (transaction instanceof web3_js_1.Transaction) {
+                // Add compute unit instruction FIRST if requested
+                if (computeUnits) {
+                    const computeIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: computeUnits });
+                    transaction.instructions.unshift(computeIx);
+                }
+                transaction.recentBlockhash = blockhash;
+                // Ensure feePayer is explicitly set on legacy transaction
+                if (!transaction.feePayer) {
+                    transaction.feePayer = signers[0].publicKey;
+                }
+            }
+            else if (computeUnits) {
+                throw new Error('Compute units must be added before creating VersionedTransaction');
+            }
+            // Convert legacy Transaction to VersionedTransaction if needed
+            const versionedTx = transaction instanceof web3_js_1.Transaction
+                ? new web3_js_1.VersionedTransaction(transaction.compileMessage())
+                : transaction;
+            // For VersionedTransaction, verify blockhash is set
+            if (!(transaction instanceof web3_js_1.Transaction) && !versionedTx.message.recentBlockhash) {
+                throw new Error('Versioned transaction requires recent blockhash');
+            }
+            // Sign the transaction if signers are provided
+            if (signers.length > 0) {
+                versionedTx.sign(signers);
+            }
+            // Send the transaction
+            const signature = yield connection.sendTransaction(versionedTx);
+            // Confirm using the newer confirmation strategy
+            const confirmationStrategy = {
+                signature,
+                blockhash,
+                lastValidBlockHeight
+            };
+            try {
+                yield connection.confirmTransaction(confirmationStrategy);
                 return signature;
-            })
-                .catch((error) => {
+            }
+            catch (error) {
                 console.log('There was an error confirming the transaction', error);
                 console.trace();
                 throw error;
-            });
-        })
-            .catch((error) => {
+            }
+        }
+        catch (error) {
             console.log('There was an error sending the transaction', error);
             console.trace();
             throw error;
-        });
+        }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/HedgeConstants.ts

@@ -146,7 +146,7 @@ export async function findAssociatedTokenAddress(
   tokenMintAddress: PublicKey
 ): Promise<PublicKey> {
   return (
-    await PublicKey.findProgramAddressSync(
+    PublicKey.findProgramAddressSync(
       [walletAddress.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), tokenMintAddress.toBuffer()],
       ASSOCIATED_TOKEN_PROGRAM_ID
     )