hedge-web3 0.1.41 → 0.1.44

package/declarations/Constants.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const HEDGE_PROGRAM_ID = "HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ";
+export declare const HEDGE_PROGRAM_ID = "zooJaircVAoQ4e7EXRDocnsbB7UPYQ6J7bKyZEMh784";
 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/idl/vault.d.ts

@@ -1560,7 +1560,7 @@ export declare type Vault = {
             ];
         },
         {
-            "name": "setVaultTypeStatus";
+            "name": "updateVaultType";
             "accounts": [
                 {
                     "name": "payer";
@@ -1576,12 +1576,77 @@ export declare type Vault = {
                     "name": "vaultType";
                     "isMut": true;
                     "isSigner": false;
+                },
+                {
+                    "name": "oracleInfoAccount";
+                    "isMut": true;
+                    "isSigner": false;
                 }
             ];
             "args": [
                 {
-                    "name": "deprecated";
+                    "name": "config";
+                    "type": {
+                        "defined": "VaultTypeConfig";
+                    };
+                }
+            ];
+        },
+        {
+            "name": "fixVaultRedeemPointer";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "vaultSystemState";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [];
+        },
+        {
+            "name": "adminSetRedeemPointer";
+            "accounts": [
+                {
+                    "name": "payer";
+                    "isMut": true;
+                    "isSigner": true;
+                },
+                {
+                    "name": "vaultSystemState";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "vaultTypeAccount";
+                    "isMut": true;
+                    "isSigner": false;
+                }
+            ];
+            "args": [
+                {
+                    "name": "settingHead";
                     "type": "bool";
+                },
+                {
+                    "name": "pointerToSet";
+                    "type": {
+                        "option": "publicKey";
+                    };
                 }
             ];
         }
@@ -1779,7 +1844,7 @@ export declare type Vault = {
                 "kind": "struct";
                 "fields": [
                     {
-                        "name": "collateralType";
+                        "name": "vaultTypeName";
                         "type": "string";
                     },
                     {
@@ -1793,6 +1858,10 @@ export declare type Vault = {
                     {
                         "name": "oracleSwitchboard";
                         "type": "publicKey";
+                    },
+                    {
+                        "name": "vaultType";
+                        "type": "publicKey";
                     }
                 ];
             };
@@ -1903,7 +1972,7 @@ export declare type Vault = {
                         "type": {
                             "array": [
                                 "u8",
-                                12
+                                16
                             ];
                         };
                     },
@@ -2037,7 +2106,7 @@ export declare type Vault = {
                 "kind": "struct";
                 "fields": [
                     {
-                        "name": "collateralType";
+                        "name": "vaultTypeName";
                         "type": "string";
                     },
                     {
@@ -2121,6 +2190,14 @@ export declare type Vault = {
                     {
                         "name": "deprecated";
                         "type": "bool";
+                    },
+                    {
+                        "name": "totalFeesAccumulatedUsh";
+                        "type": "u128";
+                    },
+                    {
+                        "name": "totalFeesAccumulatedCollateral";
+                        "type": "u128";
                     }
                 ];
             };
@@ -2147,7 +2224,7 @@ export declare type Vault = {
                         "type": "u64";
                     },
                     {
-                        "name": "collateralType";
+                        "name": "vaultTypeName";
                         "type": "string";
                     },
                     {
@@ -2195,6 +2272,10 @@ export declare type Vault = {
                         "type": {
                             "option": "publicKey";
                         };
+                    },
+                    {
+                        "name": "vaultType";
+                        "type": "publicKey";
                     }
                 ];
             };
@@ -2243,6 +2324,56 @@ export declare type Vault = {
                 ];
             };
         },
+        {
+            "name": "VaultTypeConfig";
+            "type": {
+                "kind": "struct";
+                "fields": [
+                    {
+                        "name": "maxDebtExtended";
+                        "type": {
+                            "option": "u64";
+                        };
+                    },
+                    {
+                        "name": "minDebtPerVault";
+                        "type": {
+                            "option": "u64";
+                        };
+                    },
+                    {
+                        "name": "loanInitFee";
+                        "type": {
+                            "option": "u64";
+                        };
+                    },
+                    {
+                        "name": "oracleChainlink";
+                        "type": {
+                            "option": "publicKey";
+                        };
+                    },
+                    {
+                        "name": "oraclePyth";
+                        "type": {
+                            "option": "publicKey";
+                        };
+                    },
+                    {
+                        "name": "oracleSwitchboard";
+                        "type": {
+                            "option": "publicKey";
+                        };
+                    },
+                    {
+                        "name": "deprecated";
+                        "type": {
+                            "option": "bool";
+                        };
+                    }
+                ];
+            };
+        },
         {
             "name": "PositionState";
             "type": {
@@ -2558,13 +2689,28 @@ export declare type Vault = {
         },
         {
             "code": 6020;
-            "name": "RedeemingNonHighestCollateralRatioVault";
-            "msg": "Can only redeem highest collateral ratio vault in system.";
+            "name": "NotRedeemingLowestCollateralRatioVault";
+            "msg": "Can only redeem lowest collateral ratio vault in system.";
         },
         {
             "code": 6021;
             "name": "VaultTypeDeprecated";
             "msg": "Vaults of this collateral type are deprecated. No new vaults can be created and no new debt will be issued for this collateral type.";
+        },
+        {
+            "code": 6022;
+            "name": "UpdateLinkedListFailed";
+            "msg": "There was an error updating the list of vaults. Please make sure the transaction is fresh.";
+        },
+        {
+            "code": 6023;
+            "name": "InvalidSaltLength";
+            "msg": "Salt for new vaults must be of length 8";
+        },
+        {
+            "code": 6024;
+            "name": "UpdateVaultTypeBadMaxDebtExtended";
+            "msg": "New Max debt extended value is less than the current debt!";
         }
     ];
 };

package/declarations/index.d.ts

@@ -16,7 +16,7 @@ export * from './instructions/refreshOraclePrice';
 export * from './instructions/initHedgeFoundation';
 export * from './instructions/initHedgeFoundationTokens';
 export * from './instructions/setHalted';
-export * from './instructions/setVaultTypeStatus';
+export * from './instructions/updateVaultType';
 export * from './HedgeDecimal';
 export * from './Constants';
 export * from './state/VaultAccount';

package/declarations/instructions/liquidateVault.d.ts

@@ -2,4 +2,4 @@ import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
 import { Vault } from 'idl/vault';
 export declare function liquidateVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultPublicKey: PublicKey, overrideTime?: number): Promise<PublicKey>;
-export declare function liquidateVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerAssociatedTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, newEraPublicKey: PublicKey, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, collateralType: string, overrideTime?: number): Promise<TransactionInstruction>;
+export declare function liquidateVaultInstruction(program: Program<Vault>, payerPublicKey: PublicKey, payerAssociatedTokenAccount: PublicKey, vaultPublickey: PublicKey, vaultAssociatedTokenAccount: PublicKey, poolState: PublicKey, poolEra: PublicKey, poolAssociatedTokenAccount: PublicKey, historyPublicKey: PublicKey, newEraPublicKey: PublicKey, feePool: PublicKey, feePoolAssociatedTokenAccount: PublicKey, hedgeStakingPoolAssociatedUshTokenAccount: PublicKey, collateralMint: PublicKey, vaultTypeAssociatedTokenAccount: PublicKey, oldSmallerPublicKey: PublicKey, newSmallerPublicKey: PublicKey, newLargerPublicKey: PublicKey, vaultTypeAccount: PublicKey, overrideTime?: number): Promise<TransactionInstruction>;

package/declarations/instructions/updateVaultType.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="bn.js" />
+import { BN, Program, Provider } from '@project-serum/anchor';
+import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
+import { Vault } from 'idl/vault';
+export interface VaultTypeConfig {
+    maxDebtExtended?: BN;
+    minDebtPerVault?: BN;
+    loanInitFee?: BN;
+    oracleChainlink?: PublicKey;
+    oraclePyth?: PublicKey;
+    oracleSwitchboard?: PublicKey;
+    deprecated?: boolean;
+}
+export declare function updateVaultType(program: Program<Vault>, provider: Provider, payer: Signer, vaultTypeAccount: PublicKey, oracleInfoAccount: PublicKey, config: VaultTypeConfig): Promise<PublicKey>;
+export declare function updateVaultTypeStatusInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, vaultTypeAccount: PublicKey, oracleInfoAccount: PublicKey, vaultTypeConfig: VaultTypeConfig): Promise<TransactionInstruction>;

package/declarations/state/VaultAccount.d.ts

@@ -17,16 +17,18 @@ export declare class VaultAccount {
     denormalizedDebt: number;
     /** The ordered number of when this vault was created. */
     vaultNumber: number;
-    /** Debt redistribution snapshop */
+    /** Debt redistribution snapshot */
     debtProductSnapshotBytes: Decimal;
-    /** Collateral redistribution snapshop' */
+    /** Collateral redistribution snapshot' */
     collateralAccumulatorSnapshotBytes: Decimal;
-    /** The vault type eg 'SOL-150' */
-    collateralType: string;
-    /** Current State of the vautl ("Open", "Closed", "Liquidated") */
+    /** The vault type eg '2-SOL-150-0' */
+    vaultTypeName: string;
+    /** Current State of the vault ("Open", "Closed", "Liquidated") */
     vaultStatus: string;
     /** The public key of the next vault to redeem. */
     nextVaultToRedeem: PublicKey;
+    /** The public key of the vault type. */
+    vaultType: PublicKey;
     constructor(vault: any, publicKey: PublicKey);
     /**
      * Check if some `PublicKey` is the owner
@@ -57,7 +59,7 @@ export declare class VaultAccount {
     addDeposit(depositAmount: number): void;
     redeem(): void;
     liquidate(): void;
-    updateDebtAndCollateral(vaultTypeAccuntData: any): void;
+    updateDebtAndCollateral(vaultTypeAccountData: any): void;
     toString(highlight: PublicKey): string;
     /**
      * Creates a VaultAccount from a slice of data

package/declarations/state/VaultType.d.ts

@@ -0,0 +1,24 @@
+import { PublicKey } from '@solana/web3.js';
+import Decimal from 'decimal.js';
+export default class VaultType {
+    publicKey?: PublicKey;
+    name: string;
+    collateralMint: PublicKey;
+    collateralIndex: number;
+    recentPrice: Decimal;
+    priceLastUpdatedTimestamp: Decimal;
+    collateralHeld: Decimal;
+    denormalizedDebtExtended: Decimal;
+    debtRedistributionProduct: Decimal;
+    collateralRedistributionAccumulator: Decimal;
+    minCollateralRatio: Decimal;
+    loanInitFee: Decimal;
+    minDebtPerVault: Decimal;
+    maxDebtExtended: Decimal;
+    canBeRedeemed: boolean;
+    cumulativeRate: Decimal;
+    cumulativeRateLastUpdated: Decimal;
+    interestRatePerSecond: Decimal;
+    firstVaultToRedeem: PublicKey;
+    constructor(config: any, publicKey?: PublicKey);
+}

package/declarations/utils/Sender.d.ts

@@ -0,0 +1,2 @@
+import { Connection, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
+export declare function sendAndConfirmWithDebug(connection: Connection, transaction: Transaction, signers: Signer[]): Promise<TransactionSignature | void>;

package/declarations/utils/sendAndConfirmWithDebug.d.ts

@@ -0,0 +1,2 @@
+import { Connection, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
+export default function sendAndConfirmWithDebug(connection: Connection, transaction: Transaction, signers: Signer[]): Promise<TransactionSignature | void>;

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.getUshMintPublicKey = exports.getLiquidationPoolUshAccountPublicKey = 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 = 'HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ';
+exports.HEDGE_PROGRAM_ID = 'zooJaircVAoQ4e7EXRDocnsbB7UPYQ6J7bKyZEMh784';
 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/idl/vault.js

@@ -1563,7 +1563,7 @@ exports.IDL = {
             ]
         },
         {
-            "name": "setVaultTypeStatus",
+            "name": "updateVaultType",
             "accounts": [
                 {
                     "name": "payer",
@@ -1579,12 +1579,77 @@ exports.IDL = {
                     "name": "vaultType",
                     "isMut": true,
                     "isSigner": false
+                },
+                {
+                    "name": "oracleInfoAccount",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "config",
+                    "type": {
+                        "defined": "VaultTypeConfig"
+                    }
+                }
+            ]
+        },
+        {
+            "name": "fixVaultRedeemPointer",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "vaultSystemState",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultAccount",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
+        {
+            "name": "adminSetRedeemPointer",
+            "accounts": [
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "vaultSystemState",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "vaultTypeAccount",
+                    "isMut": true,
+                    "isSigner": false
                 }
             ],
             "args": [
                 {
-                    "name": "deprecated",
+                    "name": "settingHead",
                     "type": "bool"
+                },
+                {
+                    "name": "pointerToSet",
+                    "type": {
+                        "option": "publicKey"
+                    }
                 }
             ]
         }
@@ -1782,7 +1847,7 @@ exports.IDL = {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "collateralType",
+                        "name": "vaultTypeName",
                         "type": "string"
                     },
                     {
@@ -1796,6 +1861,10 @@ exports.IDL = {
                     {
                         "name": "oracleSwitchboard",
                         "type": "publicKey"
+                    },
+                    {
+                        "name": "vaultType",
+                        "type": "publicKey"
                     }
                 ]
             }
@@ -1906,7 +1975,7 @@ exports.IDL = {
                         "type": {
                             "array": [
                                 "u8",
-                                12
+                                16
                             ]
                         }
                     },
@@ -2040,7 +2109,7 @@ exports.IDL = {
                 "kind": "struct",
                 "fields": [
                     {
-                        "name": "collateralType",
+                        "name": "vaultTypeName",
                         "type": "string"
                     },
                     {
@@ -2124,6 +2193,14 @@ exports.IDL = {
                     {
                         "name": "deprecated",
                         "type": "bool"
+                    },
+                    {
+                        "name": "totalFeesAccumulatedUsh",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "totalFeesAccumulatedCollateral",
+                        "type": "u128"
                     }
                 ]
             }
@@ -2150,7 +2227,7 @@ exports.IDL = {
                         "type": "u64"
                     },
                     {
-                        "name": "collateralType",
+                        "name": "vaultTypeName",
                         "type": "string"
                     },
                     {
@@ -2198,6 +2275,10 @@ exports.IDL = {
                         "type": {
                             "option": "publicKey"
                         }
+                    },
+                    {
+                        "name": "vaultType",
+                        "type": "publicKey"
                     }
                 ]
             }
@@ -2246,6 +2327,56 @@ exports.IDL = {
                 ]
             }
         },
+        {
+            "name": "VaultTypeConfig",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "maxDebtExtended",
+                        "type": {
+                            "option": "u64"
+                        }
+                    },
+                    {
+                        "name": "minDebtPerVault",
+                        "type": {
+                            "option": "u64"
+                        }
+                    },
+                    {
+                        "name": "loanInitFee",
+                        "type": {
+                            "option": "u64"
+                        }
+                    },
+                    {
+                        "name": "oracleChainlink",
+                        "type": {
+                            "option": "publicKey"
+                        }
+                    },
+                    {
+                        "name": "oraclePyth",
+                        "type": {
+                            "option": "publicKey"
+                        }
+                    },
+                    {
+                        "name": "oracleSwitchboard",
+                        "type": {
+                            "option": "publicKey"
+                        }
+                    },
+                    {
+                        "name": "deprecated",
+                        "type": {
+                            "option": "bool"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "PositionState",
             "type": {
@@ -2561,13 +2692,28 @@ exports.IDL = {
         },
         {
             "code": 6020,
-            "name": "RedeemingNonHighestCollateralRatioVault",
-            "msg": "Can only redeem highest collateral ratio vault in system."
+            "name": "NotRedeemingLowestCollateralRatioVault",
+            "msg": "Can only redeem lowest collateral ratio vault in system."
         },
         {
             "code": 6021,
             "name": "VaultTypeDeprecated",
             "msg": "Vaults of this collateral type are deprecated. No new vaults can be created and no new debt will be issued for this collateral type."
+        },
+        {
+            "code": 6022,
+            "name": "UpdateLinkedListFailed",
+            "msg": "There was an error updating the list of vaults. Please make sure the transaction is fresh."
+        },
+        {
+            "code": 6023,
+            "name": "InvalidSaltLength",
+            "msg": "Salt for new vaults must be of length 8"
+        },
+        {
+            "code": 6024,
+            "name": "UpdateVaultTypeBadMaxDebtExtended",
+            "msg": "New Max debt extended value is less than the current debt!"
         }
     ]
 };

package/lib/index.js

@@ -28,7 +28,7 @@ __exportStar(require("./instructions/refreshOraclePrice"), exports);
 __exportStar(require("./instructions/initHedgeFoundation"), exports);
 __exportStar(require("./instructions/initHedgeFoundationTokens"), exports);
 __exportStar(require("./instructions/setHalted"), exports);
-__exportStar(require("./instructions/setVaultTypeStatus"), exports);
+__exportStar(require("./instructions/updateVaultType"), exports);
 __exportStar(require("./HedgeDecimal"), exports);
 __exportStar(require("./Constants"), exports);
 __exportStar(require("./state/VaultAccount"), exports);

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("new createStakingPoolInstruction");
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
         const [poolPublickey, poolBump] = yield (0, Constants_1.getPoolPublicKeyForMint)(mintPublicKey);