hedge-web3 0.2.33 → 0.3.2

package/lib/utils/sendAndConfirmWithDebug.js

@@ -9,27 +9,63 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-function sendAndConfirmWithDebug(connection, transaction, signers) {
+exports.default = sendAndConfirmWithDebug;
+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;
-        });
+        }
     });
 }
-exports.default = sendAndConfirmWithDebug;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.33",
+  "version": "0.3.2",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -14,26 +14,27 @@
   "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
   "dependencies": {
-    "@project-serum/anchor": "0.24.2",
-    "@project-serum/serum": "^0.13.61",
+    "@coral-xyz/anchor": "^0.29.0",
     "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",
-    "@solana/spl-token": "^0.2.0",
-    "@solana/web3.js": "^1.63.1",
+    "@solana/spl-token": "^0.3.9",
+    "@solana/spl-token-metadata": "^0.1.6",
+    "@solana/web3.js": "^1.90.0",
     "@types/bn.js": "^5.1.0",
     "@types/underscore": "^1.11.4",
     "@types/uuid": "^8.3.4",
     "bn.js": "^5.2.0",
     "bs58": "^5.0.0",
     "decimal.js": "^10.3.1",
+    "i": "^0.3.7",
+    "npm": "^10.9.2",
     "rollup": "^2.62.0",
     "ts-standard": "^11.0.0",
-    "typedoc": "^0.22.10",
-    "typescript": "^4.5.5",
+    "typedoc": "^0.27.6",
     "underscore": "^1.13.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@types/node-fetch": "^2.6.2"
+    "typescript": "^5.7.3"
   }
 }

package/src/{Constants.ts → HedgeConstants.ts}

@@ -11,7 +11,7 @@ const enc = new TextEncoder()
  * @returns The Liquidation pool public key
  */
 export async function getLiquidationPoolStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolStateV1')], hedgeProgramId)
+  const [poolPublicKey] = await PublicKey.findProgramAddressSync([enc.encode('LiquidationPoolStateV1')], hedgeProgramId)
   return poolPublicKey
 }
 /**
@@ -19,7 +19,7 @@ export async function getLiquidationPoolStatePublicKey(hedgeProgramId: PublicKey
  * @returns The liquidation pool ush account public key
  */
 export async function getLiquidationPoolUshAccountPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
-  const [poolPublicKey] = await PublicKey.findProgramAddress([enc.encode('LiquidationPoolUSHAccountV1')], hedgeProgramId)
+  const [poolPublicKey] = await PublicKey.findProgramAddressSync([enc.encode('LiquidationPoolUSHAccountV1')], hedgeProgramId)
   return poolPublicKey
 }
 /**
@@ -27,7 +27,7 @@ export async function getLiquidationPoolUshAccountPublicKey(hedgeProgramId: Publ
  * @returns The USH mint public key
  */
 export async function getUshMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
-  const [findMintPublicKey] = await PublicKey.findProgramAddress([enc.encode('UshMintV1')], hedgeProgramId)
+  const [findMintPublicKey] = await PublicKey.findProgramAddressSync([enc.encode('UshMintV1')], hedgeProgramId)
   return findMintPublicKey
 }
 /**
@@ -35,7 +35,7 @@ export async function getUshMintPublicKey(hedgeProgramId: PublicKey): Promise<Pu
  * @returns The Vault System State public key
  */
 export async function getVaultSystemStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('VaultSystemStateV1')], hedgeProgramId)
+  const [publicKey] = await PublicKey.findProgramAddressSync([enc.encode('VaultSystemStateV1')], hedgeProgramId)
   return publicKey
 }
 
@@ -44,7 +44,7 @@ export async function getVaultSystemStatePublicKey(hedgeProgramId: PublicKey): P
  * @returns The Referral State public key
  */
 export async function getReferralStatePublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('ReferralStateV1')], hedgeProgramId)
+  const [publicKey] = await PublicKey.findProgramAddressSync([enc.encode('ReferralStateV1')], hedgeProgramId)
   return publicKey
 }
 
@@ -54,7 +54,7 @@ export async function getReferralStatePublicKey(hedgeProgramId: PublicKey): Prom
  */
 export async function getReferralAccountPublicKey(hedgeProgramId: PublicKey, ownerPublicKey: PublicKey): Promise<PublicKey> {
   const strToEncode = ownerPublicKey.toBuffer() //.substring(0, 28)
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('refer_acct'), strToEncode], hedgeProgramId)
+  const [publicKey] = await PublicKey.findProgramAddressSync([enc.encode('refer_acct'), strToEncode], hedgeProgramId)
   return publicKey
 }
 
@@ -67,31 +67,16 @@ export async function getUserReferralAccountPublicKey(
   ownerPublicKey: PublicKey
 ): Promise<PublicKey> {
   const strToEncode = ownerPublicKey.toBuffer() //.substring(0, 28)
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('user_ref'), strToEncode], hedgeProgramId)
+  const [publicKey] = await PublicKey.findProgramAddressSync([enc.encode('user_ref'), strToEncode], hedgeProgramId)
   return publicKey
 }
 
-/**
- *
- * @returns The compound pool position address for the given user
- */
-export async function getCompoundPoolPositionAddress(
-  hedgeProgramId: PublicKey,
-  poolPublicKey: PublicKey,
-  ownerPublicKey: PublicKey
-): Promise<PublicKey> {
-  const strToEncode = poolPublicKey.toBuffer()
-  const strToEncode2 = ownerPublicKey.toBuffer()
-  const [compoundPoolPosition] = await PublicKey.findProgramAddress([strToEncode, strToEncode2], hedgeProgramId)
-  return compoundPoolPosition
-}
-
 /**
  *
  * @returns The HDG mint public key
  */
 export async function getHedgeMintPublicKey(hedgeProgramId: PublicKey): Promise<PublicKey> {
-  const [publicKey] = await PublicKey.findProgramAddress([enc.encode('HEDGEMintV1')], hedgeProgramId)
+  const [publicKey] = await PublicKey.findProgramAddressSync([enc.encode('HEDGEMintV1')], hedgeProgramId)
   return publicKey
 }
 /**
@@ -105,32 +90,17 @@ export async function getPoolPublicKeyForMint(
   mintPublicKey: PublicKey
 ): Promise<[PublicKey, number, string]> {
   const strToEncode = mintPublicKey.toString().substring(0, 12)
-  const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode(strToEncode)], hedgeProgramId)
+  const [publicKey, bump] = await PublicKey.findProgramAddressSync([enc.encode(strToEncode)], hedgeProgramId)
   return [publicKey, bump, strToEncode]
 }
 
-/**
- * Get the public key for any compound staking pool
- *
- * @param mintPublicKey Staked collateral mint public key
- * @returns the public key for that compound staking pool
- */
-export async function getCompoundPoolPublicKeyForMint(
-  hedgeProgramId: PublicKey,
-  mintPublicKey: PublicKey
-): Promise<[PublicKey, number]> {
-  const strToEncode = mintPublicKey.toBuffer()
-  const [publicKey, bump] = await PublicKey.findProgramAddress([enc.encode('CompoundPoolV1'), strToEncode], hedgeProgramId)
-  return [publicKey, bump]
-}
-
 /**
  *
  * @param collateralType String name of the collateral type (must be 16 chars)
  * @returns The public key for that Vault Type account
  */
 export async function getVaultTypeAccountPublicKey(hedgeProgramId: PublicKey, collateralType: string): Promise<PublicKey> {
-  const [vaultTypeAccount] = await PublicKey.findProgramAddress(
+  const [vaultTypeAccount] = await PublicKey.findProgramAddressSync(
     [enc.encode(collateralType), enc.encode('State')],
     hedgeProgramId
   )
@@ -146,7 +116,7 @@ export async function getVaultTypeOracleAccountPublicKey(
   hedgeProgramId: PublicKey,
   collateralType: string
 ): Promise<PublicKey> {
-  const [vaultTypeOracleAccount] = await PublicKey.findProgramAddress(
+  const [vaultTypeOracleAccount] = await PublicKey.findProgramAddressSync(
     [enc.encode(collateralType), enc.encode('Oracle')],
     hedgeProgramId
   )
@@ -160,7 +130,7 @@ export async function getVaultTypeOracleAccountPublicKey(
  * @returns The public key for that Vault Type oracle info
  */
 export async function findVaultAddress(hedgeProgramId: PublicKey, vaultSalt: string): Promise<PublicKey> {
-  const [vaultAddress] = await PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], hedgeProgramId)
+  const [vaultAddress] = await PublicKey.findProgramAddressSync([enc.encode('Vault'), enc.encode(vaultSalt)], hedgeProgramId)
   return vaultAddress
 }
 
@@ -176,7 +146,7 @@ export async function findAssociatedTokenAddress(
   tokenMintAddress: PublicKey
 ): Promise<PublicKey> {
   return (
-    await PublicKey.findProgramAddress(
+    PublicKey.findProgramAddressSync(
       [walletAddress.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), tokenMintAddress.toBuffer()],
       ASSOCIATED_TOKEN_PROGRAM_ID
     )