hedge-web3 0.1.18 → 0.1.21

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 = "h8i3RfCeswxUSEwXCi5hjnvMfcdY6ZGr44dLKEKL8b3";
 export declare const HEDGE_PROGRAM_PUBLICKEY: PublicKey;
 export declare const CHAINLINK_SOL_USD_ID = "FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf";
 export declare const CHAINLINK_SOL_USD_PUBLICKEY: PublicKey;
@@ -10,5 +10,6 @@ export declare function getVaultSystemStatePublicKey(): Promise<PublicKey>;
 export declare function getHedgeMintPublicKey(): Promise<PublicKey>;
 export declare function getPoolPublicKeyForMint(mintPublicKey: PublicKey): Promise<[PublicKey, number, string]>;
 export declare function getVaultTypeAccountPublicKey(collateralType: string): Promise<PublicKey>;
+export declare function getVaultTypeOracleAccountPublicKey(collateralType: string): Promise<PublicKey>;
 export declare function findVaultAddress(vaultSalt: string): Promise<PublicKey>;
 export declare function findAssociatedTokenAddress(walletAddress: PublicKey, tokenMintAddress: PublicKey): Promise<PublicKey>;

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/lib/Constants.js

@@ -9,10 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAssociatedTokenAddress = exports.findVaultAddress = 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;
+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 = 'h8i3RfCeswxUSEwXCi5hjnvMfcdY6ZGr44dLKEKL8b3';
 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);
@@ -67,6 +67,13 @@ function getVaultTypeAccountPublicKey(collateralType) {
     });
 }
 exports.getVaultTypeAccountPublicKey = getVaultTypeAccountPublicKey;
+function getVaultTypeOracleAccountPublicKey(collateralType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const [vaultTypeOracleAccount] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], exports.HEDGE_PROGRAM_PUBLICKEY);
+        return vaultTypeOracleAccount;
+    });
+}
+exports.getVaultTypeOracleAccountPublicKey = getVaultTypeOracleAccountPublicKey;
 function findVaultAddress(vaultSalt) {
     return __awaiter(this, void 0, void 0, function* () {
         const [vaultAddress] = yield web3_js_1.PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], exports.HEDGE_PROGRAM_PUBLICKEY);

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* () {
+        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 : 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,6 +26,7 @@ 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);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "scripts": {

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 = 'h8i3RfCeswxUSEwXCi5hjnvMfcdY6ZGr44dLKEKL8b3'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID = 'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
@@ -43,6 +43,10 @@ export async function getVaultTypeAccountPublicKey (collateralType: string): Pro
   const [vaultTypeAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('State')], HEDGE_PROGRAM_PUBLICKEY)
   return vaultTypeAccount
 }
+export async function getVaultTypeOracleAccountPublicKey (collateralType: string): Promise<PublicKey> {
+  const [vaultTypeOracleAccount] = await PublicKey.findProgramAddress([enc.encode(collateralType), enc.encode('Oracle')], HEDGE_PROGRAM_PUBLICKEY)
+  return vaultTypeOracleAccount
+}
 export async function findVaultAddress (vaultSalt: string): Promise<PublicKey> {
   const [vaultAddress] = await PublicKey.findProgramAddress([enc.encode('Vault'), enc.encode(vaultSalt)], HEDGE_PROGRAM_PUBLICKEY)
   return vaultAddress

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
     {
       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)

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 {