hedge-web3 0.1.19 → 0.1.23

package/declarations/Constants.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const HEDGE_PROGRAM_ID = "h6GZ7ZMB6Jwmj3k4mQZY1bfXMGREEWH47uJHbKvE6nd";
+export declare const HEDGE_PROGRAM_ID = "h14ydGHkAt6vpBaxX461fgxGYsZjaf2K8Fqwm7Cn3ik";
 export declare const HEDGE_PROGRAM_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_SOL_USD_ID = "FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf";
 export declare const CHAINLINK_SOL_USD_PUBLICKEY: PublicKey;

package/declarations/index.d.ts

@@ -1,6 +1,7 @@
 export * from './instructions/createStakingPool';
 export * from './instructions/depositStakingPool';
 export * from './instructions/withdrawStakingPool';
+export * from './instructions/claimStakingPoolPosition';
 export * from './instructions/depositLiquidationPool';
 export * from './instructions/closeLiquidationPoolPosition';
 export * from './instructions/claimLiquidationPoolPosition';

package/declarations/instructions/claimStakingPoolPosition.d.ts

@@ -0,0 +1,4 @@
+import { Program, Provider } from '@project-serum/anchor';
+import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
+export declare function claimStakingPoolPosition(program: Program, provider: Provider, poolPosition: PublicKey, payer: Signer, collateralType: string): Promise<PublicKey>;
+export declare function claimStakingPoolPositionInstruction(program: Program, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, stakedTokenMint: PublicKey, vaultTypeAccount: PublicKey, collateralMint: PublicKey, poolPosition: PublicKey, payer: PublicKey, payerAssociatedTokenAccount: PublicKey): Promise<TransactionInstruction>;

package/declarations/instructions/closeLiquidationPoolPosition.d.ts

@@ -1,4 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 export declare function closeLiquidationPoolPosition(program: Program, provider: Provider, poolPosition: PublicKey, payer: Signer, overrideStartTime?: number): Promise<PublicKey>;
-export declare function closeLiquidationPoolPositionInstruction(program: Program, vaultSystemState: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolPosition: PublicKey, poolUsdhAccount: PublicKey, payerPublicKey: PublicKey, payerUsdhAccount: PublicKey, hedgeMint: PublicKey, payerAssociatedHedgeAccount: PublicKey, communityAssociatedHedgeTokenAccount: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;
+export declare function closeLiquidationPoolPositionInstruction(program: Program, poolEra: PublicKey, poolPosition: PublicKey, payerPublicKey: PublicKey, payerUsdhAccount: PublicKey, payerAssociatedHedgeAccount: PublicKey, communityAssociatedHedgeTokenAccount: PublicKey, overrideStartTime?: number): Promise<TransactionInstruction>;

package/declarations/state/StakingPool.d.ts

@@ -10,6 +10,6 @@ export declare class StakingPool {
     totalHedgeReward: number;
     hedgeRewardAccumulator: Decimal;
     usdhFeeAccumulator: Decimal;
-    solFeeAccumulator: Decimal;
+    collateralFeeAccumulator: [Decimal];
     constructor(poolInfo: any, publicKey: PublicKey);
 }

package/declarations/state/VaultHistoryEvent.d.ts

@@ -7,8 +7,8 @@ export declare class VaultHistoryEvent {
     usdSolPrice: Decimal;
     usdhDebtBefore: number;
     usdhDebtAfter: number;
-    solBalanceBefore: number;
-    solBalanceAfter: number;
+    collateralBalanceBefore: number;
+    collateralBalanceAfter: number;
     minCollateralRatioBefore: Decimal;
     minCollateralRatioAfter: Decimal;
     vaultStateBefore: PublicKey;

package/lib/Constants.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAssociatedTokenAddress = exports.findVaultAddress = exports.getVaultTypeOracleAccountPublicKey = exports.getVaultTypeAccountPublicKey = exports.getPoolPublicKeyForMint = exports.getHedgeMintPublicKey = exports.getVaultSystemStatePublicKey = exports.getUsdhMintPublicKey = exports.getLiquidationPoolUsdhAccountPublicKey = exports.getLiquidationPoolStatePublicKey = exports.CHAINLINK_SOL_USD_PUBLICKEY = exports.CHAINLINK_SOL_USD_ID = exports.HEDGE_PROGRAM_PUBLICKEY = exports.HEDGE_PROGRAM_ID = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-exports.HEDGE_PROGRAM_ID = 'h6GZ7ZMB6Jwmj3k4mQZY1bfXMGREEWH47uJHbKvE6nd';
+exports.HEDGE_PROGRAM_ID = 'h14ydGHkAt6vpBaxX461fgxGYsZjaf2K8Fqwm7Cn3ik';
 exports.HEDGE_PROGRAM_PUBLICKEY = new web3_js_1.PublicKey(exports.HEDGE_PROGRAM_ID);
 exports.CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf';
 exports.CHAINLINK_SOL_USD_PUBLICKEY = new web3_js_1.PublicKey(exports.CHAINLINK_SOL_USD_ID);

package/lib/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./instructions/createStakingPool"), exports);
 __exportStar(require("./instructions/depositStakingPool"), exports);
 __exportStar(require("./instructions/withdrawStakingPool"), exports);
+__exportStar(require("./instructions/claimStakingPoolPosition"), exports);
 __exportStar(require("./instructions/depositLiquidationPool"), exports);
 __exportStar(require("./instructions/closeLiquidationPoolPosition"), exports);
 __exportStar(require("./instructions/claimLiquidationPoolPosition"), exports);

package/lib/instructions/claimStakingPoolPosition.js

@@ -0,0 +1,55 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.claimStakingPoolPositionInstruction = exports.claimStakingPoolPosition = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const Errors_1 = require("../utils/Errors");
+const Constants_1 = require("../Constants");
+function claimStakingPoolPosition(program, provider, poolPosition, payer, collateralType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const vaultTypeAccount = yield (0, Constants_1.getVaultTypeAccountPublicKey)(collateralType);
+        const vaultTypeAccountInfo = yield program.account.vaultType.fetch(vaultTypeAccount);
+        const collateralMint = vaultTypeAccountInfo.collateralMint;
+        const stakedTokenMint = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const [feePool] = yield (0, Constants_1.getPoolPublicKeyForMint)(stakedTokenMint);
+        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);
+        return payerAssociatedTokenAccount.address;
+    });
+}
+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: []
+        });
+    });
+}
+exports.claimStakingPoolPositionInstruction = claimStakingPoolPositionInstruction;

package/lib/instructions/closeLiquidationPoolPosition.js

@@ -19,26 +19,29 @@ function closeLiquidationPoolPosition(program, provider, poolPosition, payer, ov
     return __awaiter(this, void 0, void 0, function* () {
         const usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
         const payerUsdhAccount = yield (0, spl_token_1.getOrCreateAssociatedTokenAccount)(provider.connection, payer, usdhMintPublickey, payer.publicKey);
-        const poolState = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const liquidationPositionAccount = yield program.account.liquidationPosition.fetch(poolPosition);
         const poolEra = liquidationPositionAccount.era;
-        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
-        const poolUsdhAccount = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
         const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
         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, vaultSystemStatePublicKey, poolState, poolEra, poolPosition, poolUsdhAccount, payer.publicKey, payerUsdhAccount.address, hedgeMint, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, overrideStartTime));
+        const transaction = new web3_js_1.Transaction().add(yield closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payer.publicKey, payerUsdhAccount.address, payerAssociatedHedgeAccount.address, communityAssociatedHedgeTokenAccount.address, overrideStartTime));
         yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider.opts).catch(Errors_1.parseAnchorErrors);
         return poolPosition;
     });
 }
 exports.closeLiquidationPoolPosition = closeLiquidationPoolPosition;
-function closeLiquidationPoolPositionInstruction(program, vaultSystemState, poolState, poolEra, poolPosition, poolUsdhAccount, payerPublicKey, payerUsdhAccount, hedgeMint, payerAssociatedHedgeAccount, communityAssociatedHedgeTokenAccount, overrideStartTime) {
+function closeLiquidationPoolPositionInstruction(program, poolEra, poolPosition, payerPublicKey, payerUsdhAccount, payerAssociatedHedgeAccount, communityAssociatedHedgeTokenAccount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        return program.instruction.closeLiquidationPoolPosition(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Date.now() / 1000), // override current time
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const usdhMint = yield (0, Constants_1.getUsdhMintPublicKey)();
+        const hedgeMint = yield (0, Constants_1.getHedgeMintPublicKey)();
+        const poolUsdhAccount = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
+        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: vaultSystemState,
+                vaultSystemState: vaultSystemStatePublicKey,
                 poolState: poolState,
                 poolEra: poolEra,
                 poolPosition: poolPosition,
@@ -46,6 +49,7 @@ function closeLiquidationPoolPositionInstruction(program, vaultSystemState, pool
                 payer: payerPublicKey,
                 ownerUsdhAccount: payerUsdhAccount,
                 hedgeMint: hedgeMint,
+                usdhMint: usdhMint,
                 payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
                 communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
                 associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,

package/lib/instructions/createStakingPool.js

@@ -26,12 +26,13 @@ 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 usdhMintPublickey = yield (0, Constants_1.getUsdhMintPublicKey)();
         const [poolPublickey, poolBump, poolSeedPhrase] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);
         const poolAssociatedStakedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, mintPublicKey);
         const poolAssociatedUsdhTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolPublickey, usdhMintPublickey);
-        return program.instruction.createStakingPool(poolBump, poolSeedPhrase, new anchor_1.BN(hedgeTokensToBeMinted), new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Date.now() / 1000), {
+        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,

package/lib/instructions/createVault.js

@@ -114,8 +114,8 @@ function buildCreateVaultTransaction(program, collateralType, depositAmount, ove
                 destination: payerPublicKey,
                 owner: payerPublicKey,
             }));
+            transaction.partialSign(wrappedSolAccount);
         }
-        transaction.partialSign(wrappedSolAccount);
         transaction.partialSign(history);
         console.log("transaction", transaction);
         return [transaction, signers, newVaultPublicKey];

package/lib/instructions/depositLiquidationPool.js

@@ -33,7 +33,7 @@ function depositLiquidationPoolInstruction(program, payerPublicKey, payerUsdhAcc
         const poolUSDHAccount = yield (0, Constants_1.getLiquidationPoolUsdhAccountPublicKey)();
         const usdhMint = yield (0, Constants_1.getUsdhMintPublicKey)();
         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 : Date.now() / 1000), // override current time
+        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,

package/lib/instructions/depositStakingPool.js

@@ -30,7 +30,7 @@ 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 : Date.now() / 1000), // override current time
+        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,

package/lib/instructions/refreshOraclePrice.js

@@ -26,7 +26,7 @@ function refreshOraclePriceInstruction(program, collateralType, network, overrid
         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)), // override override time
+        new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000) - 1), // override override time
         {
             accounts: {
                 oracleInfoAccount: oracleInfoAccount,

package/lib/instructions/withdrawStakingPool.js

@@ -36,7 +36,7 @@ function withdrawStakingPoolInstruction(program, payerPublicKey, poolPositionPub
         const payerAssociatedHedgeAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
         const payerAssociatedUsdhAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, usdhMintPublickey);
         const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
-        return program.instruction.withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Date.now() / 1000), // override current time
+        return program.instruction.withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
         {
             accounts: {
                 payer: payerPublicKey,

package/lib/state/LiquidationPosition.js

@@ -20,7 +20,8 @@ class LiquidationPosition {
         this.sumSnapshotsEntry = poolPositionInfo.sumSnapshotsEntry.map((sum) => { return (0, HedgeDecimal_1.DecimalFromU128)(sum); });
         this.sumSnapshotsClosed = poolPositionInfo.sumSnapshotsClosed.map((sum) => { return (0, HedgeDecimal_1.DecimalFromU128)(sum); });
         this.hedgeRewardsSnapshot = (0, HedgeDecimal_1.DecimalFromU128)(poolPositionInfo.hedgeRewardsSnapshotAccum);
-        this.open = poolPositionInfo.state.open !== undefined;
+        this.open = poolPositionInfo.state === 1;
+        console.log("poolPositionInfo.state, poolPositionInfo.state");
     }
     getUsdhAvailable(era) {
         return (era.product.div(this.productSnapshotEntry)).mul(new decimal_js_1.default(this.deposit));

package/lib/state/StakingPool.js

@@ -15,7 +15,7 @@ class StakingPool {
         this.totalHedgeReward = poolInfo.totalHedgeReward.toNumber();
         this.hedgeRewardAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.hedgeRewardAccumulator);
         this.usdhFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.usdhFeeAccumulator);
-        this.solFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.solFeeAccumulator);
+        this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum) => { return (0, HedgeDecimal_1.DecimalFromU128)(sum); });
         // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
     }
 }

package/lib/state/VaultHistoryEvent.js

@@ -10,8 +10,8 @@ class VaultHistoryEvent {
         this.usdSolPrice = (0, HedgeDecimal_1.DecimalFromU128)(account.usdSolPrice.toString());
         this.usdhDebtBefore = account.usdhDebtBefore.toNumber();
         this.usdhDebtAfter = account.usdhDebtAfter.toNumber();
-        this.solBalanceBefore = account.solBalanceBefore.toNumber();
-        this.solBalanceAfter = account.solBalanceAfter.toNumber();
+        this.collateralBalanceBefore = account.collateralBalanceBefore.toNumber();
+        this.collateralBalanceAfter = account.collateralBalanceAfter.toNumber();
         this.minCollateralRatioBefore = (0, HedgeDecimal_1.DecimalFromU128)(account.minCollateralRatioBefore);
         this.minCollateralRatioAfter = (0, HedgeDecimal_1.DecimalFromU128)(account.minCollateralRatioAfter);
         this.vaultStateBefore = account.vaultStateBefore;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.19",
+  "version": "0.1.23",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
+  "types": "declarations/index.d.ts",
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",

package/src/Constants.ts

@@ -1,7 +1,7 @@
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'h6GZ7ZMB6Jwmj3k4mQZY1bfXMGREEWH47uJHbKvE6nd'
+export const HEDGE_PROGRAM_ID = 'h14ydGHkAt6vpBaxX461fgxGYsZjaf2K8Fqwm7Cn3ik'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'

package/src/index.ts

@@ -2,6 +2,7 @@
 export * from './instructions/createStakingPool'
 export * from './instructions/depositStakingPool'
 export * from './instructions/withdrawStakingPool'
+export * from './instructions/claimStakingPoolPosition'
 export * from './instructions/depositLiquidationPool'
 export * from './instructions/closeLiquidationPoolPosition'
 export * from './instructions/claimLiquidationPoolPosition'

package/src/instructions/claimStakingPoolPosition.ts

@@ -0,0 +1,76 @@
+import { Program, Provider } from '@project-serum/anchor'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getOrCreateAssociatedTokenAccount, TOKEN_PROGRAM_ID } from '@solana/spl-token'
+import { PublicKey, sendAndConfirmTransaction, Signer, SystemProgram, SYSVAR_RENT_PUBKEY, Transaction, TransactionInstruction } from '@solana/web3.js'
+import { parseAnchorErrors } from '../utils/Errors'
+import { getHedgeMintPublicKey, findAssociatedTokenAddress, getVaultTypeAccountPublicKey, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
+
+export async function claimStakingPoolPosition(
+  program: Program,
+  provider: Provider,
+  poolPosition: PublicKey,
+  payer: Signer,
+  collateralType: string,
+): Promise<PublicKey> {
+  const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccount)
+  const collateralMint = vaultTypeAccountInfo.collateralMint
+  const stakedTokenMint = await getHedgeMintPublicKey()
+  const [feePool] = await getPoolPublicKeyForMint(stakedTokenMint)
+  const feePoolAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, collateralMint, feePool, true)
+  const payerAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
+    provider.connection,
+    payer,
+    collateralMint,
+    payer.publicKey
+  )
+
+  const transaction = new Transaction().add(
+    await claimStakingPoolPositionInstruction(
+      program,
+      feePool,
+      feePoolAssociatedTokenAccount.address,
+      stakedTokenMint,
+      vaultTypeAccount,
+      collateralMint,
+      poolPosition,
+      payer.publicKey,
+      payerAssociatedTokenAccount.address
+    )
+  )
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer], provider.opts).catch(parseAnchorErrors)
+  return payerAssociatedTokenAccount.address
+}
+
+export async function claimStakingPoolPositionInstruction(
+  program: Program,
+  feePool: PublicKey,
+  feePoolAssociatedTokenAccount: PublicKey,
+  stakedTokenMint: PublicKey,
+  vaultTypeAccount: PublicKey,
+  collateralMint: PublicKey,
+  poolPosition: PublicKey,
+  payer: PublicKey,
+  payerAssociatedTokenAccount: PublicKey
+): Promise<TransactionInstruction> {
+  const vaultSystemState = await 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: ASSOCIATED_TOKEN_PROGRAM_ID,
+        systemProgram: SystemProgram.programId,
+        tokenProgram: TOKEN_PROGRAM_ID,
+        rent: SYSVAR_RENT_PUBKEY
+      },
+      signers: []
+    })
+}

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -13,13 +13,10 @@ export async function closeLiquidationPoolPosition (
 ): Promise<PublicKey> {
   const usdhMintPublickey = await getUsdhMintPublicKey()
   const payerUsdhAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, usdhMintPublickey, payer.publicKey)
-
-  const poolState = await getLiquidationPoolStatePublicKey()
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const liquidationPositionAccount = await program.account.liquidationPosition.fetch(poolPosition)
   const poolEra = liquidationPositionAccount.era
 
-  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-  const poolUsdhAccount = await getLiquidationPoolUsdhAccountPublicKey()
   const hedgeMint = await getHedgeMintPublicKey()
   const payerAssociatedHedgeAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, hedgeMint, payer.publicKey)
   const communityAssociatedHedgeTokenAccount = await getOrCreateAssociatedTokenAccount(provider.connection, payer, hedgeMint, vaultSystemStatePublicKey, true)
@@ -27,14 +24,10 @@ export async function closeLiquidationPoolPosition (
   const transaction = new Transaction().add(
     await closeLiquidationPoolPositionInstruction(
       program,
-      vaultSystemStatePublicKey,
-      poolState,
       poolEra,
       poolPosition,
-      poolUsdhAccount,
       payer.publicKey,
       payerUsdhAccount.address,
-      hedgeMint,
       payerAssociatedHedgeAccount.address,
       communityAssociatedHedgeTokenAccount.address,
       overrideStartTime
@@ -46,23 +39,26 @@ export async function closeLiquidationPoolPosition (
 
 export async function closeLiquidationPoolPositionInstruction (
   program: Program,
-  vaultSystemState: PublicKey,
-  poolState: PublicKey,
   poolEra: PublicKey,
   poolPosition: PublicKey,
-  poolUsdhAccount: PublicKey,
   payerPublicKey: PublicKey,
   payerUsdhAccount: PublicKey,
-  hedgeMint: PublicKey,
   payerAssociatedHedgeAccount: PublicKey,
   communityAssociatedHedgeTokenAccount: PublicKey,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
+
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const usdhMint = await getUsdhMintPublicKey()
+  const hedgeMint = await getHedgeMintPublicKey()
+  const poolUsdhAccount = await getLiquidationPoolUsdhAccountPublicKey()
+  const poolState = await getLiquidationPoolStatePublicKey()
+
   return program.instruction.closeLiquidationPoolPosition(
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
-        vaultSystemState: vaultSystemState,
+        vaultSystemState: vaultSystemStatePublicKey,
         poolState: poolState,
         poolEra: poolEra,
         poolPosition: poolPosition,
@@ -70,6 +66,7 @@ export async function closeLiquidationPoolPositionInstruction (
         payer: payerPublicKey,
         ownerUsdhAccount: payerUsdhAccount,
         hedgeMint: hedgeMint,
+        usdhMint: usdhMint,
         payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
         communityAssociatedHedgeTokenAccount: communityAssociatedHedgeTokenAccount,
         associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,

package/src/instructions/createStakingPool.ts

@@ -33,6 +33,7 @@ export async function createStakingPoolInstruction (
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
+  console.log("createStakingPoolInstruction program ID", program.programId.toString())
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const usdhMintPublickey = await getUsdhMintPublicKey()
   const [poolPublickey, poolBump, poolSeedPhrase] = await getPoolPublicKeyForMint(mintPublicKey)
@@ -44,7 +45,7 @@ export async function createStakingPoolInstruction (
     poolBump,
     poolSeedPhrase,
     new BN(hedgeTokensToBeMinted),
-    new BN(overrideStartTime ?? Date.now() / 1000),
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)),
     {
       accounts: {
         signer: payerPublicKey,

package/src/instructions/createVault.ts

@@ -241,8 +241,9 @@ export async function buildCreateVaultTransaction(
         owner: payerPublicKey,
       })
     );
+    transaction.partialSign(wrappedSolAccount)
   }
-  transaction.partialSign(wrappedSolAccount)
+  
   transaction.partialSign(history)
   console.log("transaction", transaction)
 

package/src/instructions/depositLiquidationPool.ts

@@ -47,7 +47,7 @@ export async function depositLiquidationPoolInstruction (
 
   return program.instruction.depositLiquidationPool(
     new BN(depositAmount),
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         vaultSystemState: vaultSystemState,

package/src/instructions/depositStakingPool.ts

@@ -42,7 +42,7 @@ export async function depositStakingPoolInstruction (
 
   return program.instruction.depositStakingPool(
     new BN(depositAmount),
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         payer: payerPublicKey,

package/src/instructions/refreshOraclePrice.ts

@@ -36,7 +36,7 @@ export async function refreshOraclePriceInstruction (
 
   return program.instruction.refreshOraclePrice(
     new BN(overridePrice ?? LAMPORTS_PER_SOL * 150), // override usd/sol price
-    new BN(overrideTime ?? Math.floor(Date.now() / 1000)), // override override time
+    new BN(overrideTime ?? Math.floor(Date.now() / 1000)-1), // override override time
     {
       accounts: {
         oracleInfoAccount: oracleInfoAccount,

package/src/instructions/withdrawStakingPool.ts

@@ -45,7 +45,7 @@ export async function withdrawStakingPoolInstruction (
   const communityHedgeTokenAccount = await findAssociatedTokenAddress(vaultSystemStatePublicKey, hedgeMintPublickey)
 
   return program.instruction.withdrawStakingPool(
-    new BN(overrideStartTime ?? Date.now() / 1000), // override current time
+    new BN(overrideStartTime ?? Math.floor(Date.now() / 1000)), // override current time
     {
       accounts: {
         payer: payerPublicKey,

package/src/state/LiquidationPosition.ts

@@ -36,7 +36,8 @@ export class LiquidationPosition {
     this.sumSnapshotsEntry = poolPositionInfo.sumSnapshotsEntry.map((sum: any) => { return DecimalFromU128(sum) })
     this.sumSnapshotsClosed = poolPositionInfo.sumSnapshotsClosed.map((sum: any) => { return DecimalFromU128(sum) })
     this.hedgeRewardsSnapshot = DecimalFromU128(poolPositionInfo.hedgeRewardsSnapshotAccum)
-    this.open = poolPositionInfo.state.open !== undefined
+    this.open = poolPositionInfo.state === 1
+    console.log("poolPositionInfo.state, poolPositionInfo.state")
   }
 
   public getUsdhAvailable (era: LiquidationPoolEra): Decimal {

package/src/state/StakingPool.ts

@@ -13,7 +13,7 @@ export class StakingPool {
 
   hedgeRewardAccumulator: Decimal
   usdhFeeAccumulator: Decimal
-  solFeeAccumulator: Decimal
+  collateralFeeAccumulator: [Decimal]
 
   constructor (public poolInfo: any, publicKey: PublicKey) {
     this.publicKey = publicKey
@@ -27,7 +27,7 @@ export class StakingPool {
 
     this.hedgeRewardAccumulator = DecimalFromU128(poolInfo.hedgeRewardAccumulator)
     this.usdhFeeAccumulator = DecimalFromU128(poolInfo.usdhFeeAccumulator)
-    this.solFeeAccumulator = DecimalFromU128(poolInfo.solFeeAccumulator)
+    this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum: any) => { return DecimalFromU128(sum) })
     // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
   }
 

package/src/state/VaultHistoryEvent.ts

@@ -9,8 +9,8 @@ export class VaultHistoryEvent {
   usdSolPrice: Decimal
   usdhDebtBefore: number
   usdhDebtAfter: number
-  solBalanceBefore: number
-  solBalanceAfter: number
+  collateralBalanceBefore: number
+  collateralBalanceAfter: number
   minCollateralRatioBefore: Decimal
   minCollateralRatioAfter: Decimal
   vaultStateBefore: PublicKey
@@ -26,8 +26,8 @@ export class VaultHistoryEvent {
 
     this.usdhDebtBefore = account.usdhDebtBefore.toNumber()
     this.usdhDebtAfter = account.usdhDebtAfter.toNumber()
-    this.solBalanceBefore = account.solBalanceBefore.toNumber()
-    this.solBalanceAfter = account.solBalanceAfter.toNumber()
+    this.collateralBalanceBefore = account.collateralBalanceBefore.toNumber()
+    this.collateralBalanceAfter = account.collateralBalanceAfter.toNumber()
     this.minCollateralRatioBefore = DecimalFromU128(account.minCollateralRatioBefore)
     this.minCollateralRatioAfter = DecimalFromU128(account.minCollateralRatioAfter)
     this.vaultStateBefore = account.vaultStateBefore