hedge-web3 0.2.27 → 0.2.31

package/lib/instructions/withdrawCompoundStakingPoolPosition.js

@@ -0,0 +1,64 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withdrawCompoundStakingPoolPositionInstruction = exports.withdrawCompoundStakingPoolPosition = void 0;
+const anchor_1 = require("@project-serum/anchor");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+const Errors_1 = require("../utils/Errors");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+function withdrawCompoundStakingPoolPosition(program, provider, payer, poolPositionPublicKey, stakedTokenMintPublicKey, claimAmount, overrideStartTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const [poolPublickey, poolBump] = yield (0, Constants_1.getCompoundPoolPublicKeyForMint)(program.programId, stakedTokenMintPublicKey);
+        const poolPosition = yield (0, Constants_1.getCompoundPoolPositionAddress)(program.programId, poolPublickey, payer.publicKey);
+        const payerAssociatedTokenAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, stakedTokenMintPublicKey, payer.publicKey);
+        const transaction = new web3_js_1.Transaction().add(yield withdrawCompoundStakingPoolPositionInstruction(program, payer.publicKey, poolPositionPublicKey, stakedTokenMintPublicKey, new anchor_1.BN(claimAmount), overrideStartTime));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        return payerAssociatedTokenAccount.address;
+    });
+}
+exports.withdrawCompoundStakingPoolPosition = withdrawCompoundStakingPoolPosition;
+function withdrawCompoundStakingPoolPositionInstruction(program, payerPublicKey, poolPositionPublicKey, stakedTokenMintPublicKey, claimAmount, overrideStartTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)(program.programId);
+        const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)(program.programId);
+        const hedgeMintPublickey = yield (0, Constants_1.getHedgeMintPublicKey)(program.programId);
+        const [poolPublickey, poolBump] = yield (0, Constants_1.getCompoundPoolPublicKeyForMint)(program.programId, stakedTokenMintPublicKey);
+        const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, stakedTokenMintPublicKey);
+        const poolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, poolPublickey, ushMintPublickey);
+        const payerAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, stakedTokenMintPublicKey);
+        const payerAssociatedHedgeAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, hedgeMintPublickey);
+        const payerAssociatedUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, payerPublicKey, ushMintPublickey);
+        const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(program.programId, vaultSystemStatePublicKey, hedgeMintPublickey);
+        return yield program.methods
+            .withdrawCompoundStakingPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
+        claimAmount //amount to be claimed
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            pool: poolPublickey,
+            poolPosition: poolPositionPublicKey,
+            poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+            payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
+            hedgeMint: hedgeMintPublickey,
+            stakedTokenMint: stakedTokenMintPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
+    });
+}
+exports.withdrawCompoundStakingPoolPositionInstruction = withdrawCompoundStakingPoolPositionInstruction;

package/lib/utils/getLinkedListAccounts.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const anchor_1 = require("@project-serum/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const underscore_1 = __importDefault(require("underscore"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const VaultAccount_1 = require("../state/VaultAccount");
@@ -33,8 +32,9 @@ const VaultType_1 = __importDefault(require("../state/VaultType"));
  * @param {boolean} redeem - True if vault is going to be redeemed fully
  * @param {boolean} liquidate - True if vault is going to be liquidated fully
  * @param {VaultAccount[]} cachedVaults - Optional list of cached vaults. Saves a request to the on-chain data.
+ * @param {VaultAccount} preLoadedVault - Optional vault to use as target vault. Overrides the need to load the vault from on-chain data.
  */
-function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, withdrawAmount, loanAmount, repayAmount, redeem, liquidate, cachedVaults) {
+function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, withdrawAmount, loanAmount, repayAmount, redeem, liquidate, cachedVaults, preLoadedVault) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultTypeRaw = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const vaultType = new VaultType_1.default(vaultTypeRaw, vaultTypeAccountPublicKey);
@@ -43,25 +43,9 @@ function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKe
         let oldSmallerPublicKey = vaultPublicKey;
         let newSmallerPublicKey = vaultPublicKey;
         let newLargerPublicKey = vaultPublicKey;
-        const thisVaultData = yield program.account.vault.fetch(vaultPublicKey)
-            .catch((e) => {
-            console.log('Error fetching vault account. Assuming it does not exist yet');
-            return {
-                vaultOwner: new web3_js_1.PublicKey('11111111111111111111111111111111'),
-                pdaSalt: 'foo',
-                deposited: new anchor_1.BN(0),
-                denormalizedDebt: new anchor_1.BN(0),
-                vaultNumber: new anchor_1.BN(0),
-                debtProductSnapshotBytes: new anchor_1.BN(1),
-                collateralAccumulatorSnapshotBytes: new anchor_1.BN(1),
-                vaultTypeName: vaultType.name,
-                nextVaultToRedeem: new web3_js_1.PublicKey('11111111111111111111111111111111'),
-                vaultStatus: { open: true },
-                vaultType: vaultTypeAccountPublicKey
-            };
-        });
-        // const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
-        const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
+        const thisVault = preLoadedVault
+            ? preLoadedVault
+            : new VaultAccount_1.VaultAccount(yield program.account.vault.fetch(vaultPublicKey), vaultPublicKey);
         // Load all the vaults
         let vaults;
         if (cachedVaults) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.27",
+  "version": "0.2.31",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -19,7 +19,7 @@
     "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",
     "@solana/spl-token": "^0.2.0",
-    "@solana/web3.js": "^1.37.0",
+    "@solana/web3.js": "^1.63.1",
     "@types/bn.js": "^5.1.0",
     "@types/underscore": "^1.11.4",
     "@types/uuid": "^8.3.4",
@@ -32,5 +32,8 @@
     "typescript": "^4.5.5",
     "underscore": "^1.13.2",
     "uuid": "^8.3.2"
+  },
+  "devDependencies": {
+    "@types/node-fetch": "^2.6.2"
   }
 }

package/src/Constants.ts

@@ -71,6 +71,21 @@ export async function getUserReferralAccountPublicKey(
   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
@@ -94,6 +109,21 @@ export async function getPoolPublicKeyForMint(
   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)