hedge-web3 0.1.46 → 0.2.0

package/src/idl/vault.ts

@@ -1177,6 +1177,11 @@ export type Vault = {
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "chainlinkProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -1829,10 +1834,6 @@ export type Vault = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "state",
-            "type": "u64"
-          },
           {
             "name": "era",
             "type": "publicKey"
@@ -1841,14 +1842,6 @@ export type Vault = {
             "name": "ownerAccount",
             "type": "publicKey"
           },
-          {
-            "name": "deposit",
-            "type": "u64"
-          },
-          {
-            "name": "closedUsh",
-            "type": "u64"
-          },
           {
             "name": "productSnapshotEntry",
             "type": "u128"
@@ -1879,6 +1872,14 @@ export type Vault = {
             "name": "hedgeRewardsSnapshotAccum",
             "type": "u128"
           },
+          {
+            "name": "deposit",
+            "type": "u64"
+          },
+          {
+            "name": "closedUsh",
+            "type": "u64"
+          },
           {
             "name": "timestampOpened",
             "type": "u64"
@@ -1886,6 +1887,12 @@ export type Vault = {
           {
             "name": "timestampClosed",
             "type": "u64"
+          },
+          {
+            "name": "state",
+            "type": {
+              "defined": "PositionState"
+            }
           }
         ]
       }
@@ -1896,8 +1903,8 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultTypeName",
-            "type": "string"
+            "name": "vaultType",
+            "type": "publicKey"
           },
           {
             "name": "oraclePyth",
@@ -1912,8 +1919,20 @@ export type Vault = {
             "type": "publicKey"
           },
           {
-            "name": "vaultType",
-            "type": "publicKey"
+            "name": "priorityPyth",
+            "type": "i8"
+          },
+          {
+            "name": "priorityChainlink",
+            "type": "i8"
+          },
+          {
+            "name": "prioritySwitchboard",
+            "type": "i8"
+          },
+          {
+            "name": "vaultTypeName",
+            "type": "string"
           }
         ]
       }
@@ -2117,7 +2136,7 @@ export type Vault = {
           },
           {
             "name": "totalUshSupply",
-            "type": "u64"
+            "type": "u128"
           },
           {
             "name": "totalVaults",
@@ -2157,10 +2176,6 @@ export type Vault = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "vaultTypeName",
-            "type": "string"
-          },
           {
             "name": "collateralMint",
             "type": "publicKey"
@@ -2233,6 +2248,22 @@ export type Vault = {
             "name": "interestRatePerSecond",
             "type": "u128"
           },
+          {
+            "name": "deprecated",
+            "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
+          },
+          {
+            "name": "vaultTypeName",
+            "type": "string"
+          },
           {
             "name": "firstVaultToRedeem",
             "type": {
@@ -2276,12 +2307,14 @@ export type Vault = {
             "type": "u64"
           },
           {
-            "name": "vaultTypeName",
-            "type": "string"
+            "name": "vaultStatus",
+            "type": {
+              "defined": "VaultStatus"
+            }
           },
           {
-            "name": "pdaSalt",
-            "type": "string"
+            "name": "vaultType",
+            "type": "publicKey"
           },
           {
             "name": "bump",
@@ -2305,12 +2338,6 @@ export type Vault = {
               "defined": "CurrencyType"
             }
           },
-          {
-            "name": "vaultStatus",
-            "type": {
-              "defined": "VaultStatus"
-            }
-          },
           {
             "name": "timeCreated",
             "type": "u64"
@@ -2319,15 +2346,19 @@ export type Vault = {
             "name": "timeLastInteraction",
             "type": "u64"
           },
+          {
+            "name": "vaultTypeName",
+            "type": "string"
+          },
+          {
+            "name": "pdaSalt",
+            "type": "string"
+          },
           {
             "name": "nextVaultToRedeem",
             "type": {
               "option": "publicKey"
             }
-          },
-          {
-            "name": "vaultType",
-            "type": "publicKey"
           }
         ]
       }
@@ -2417,6 +2448,24 @@ export type Vault = {
               "option": "publicKey"
             }
           },
+          {
+            "name": "priorityChainlink",
+            "type": {
+              "option": "i8"
+            }
+          },
+          {
+            "name": "priorityPyth",
+            "type": {
+              "option": "i8"
+            }
+          },
+          {
+            "name": "prioritySwitchboard",
+            "type": {
+              "option": "i8"
+            }
+          },
           {
             "name": "deprecated",
             "type": {
@@ -2761,8 +2810,33 @@ export type Vault = {
     },
     {
       "code": 6024,
+      "name": "InvalidNameLength",
+      "msg": "Name for new vault type must be length 16"
+    },
+    {
+      "code": 6025,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
+    },
+    {
+      "code": 6025,
+      "name": "UpdateVaultTypeNoEnabledOracles",
+      "msg": "No Enabled Oracles!"
+    },
+    {
+      "code": 6026,
+      "name": "UpdateVaultTypeDuplicateOraclePriorities",
+      "msg": "Duplicate Oracle Priorities"
+    },
+    {
+      "code": 6027,
+      "name": "UpdateVaultTypeInvalidOraclePriority",
+      "msg": "Invalid Oracle Priority"
+    },
+    {
+      "code": 6028,
+      "name": "OracleUpdateFailed",
+      "msg": "OracleUpdateFailed"
     }
   ]
 };
@@ -3946,6 +4020,11 @@ export const IDL: Vault = {
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "chainlinkProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -4598,10 +4677,6 @@ export const IDL: Vault = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "state",
-            "type": "u64"
-          },
           {
             "name": "era",
             "type": "publicKey"
@@ -4610,14 +4685,6 @@ export const IDL: Vault = {
             "name": "ownerAccount",
             "type": "publicKey"
           },
-          {
-            "name": "deposit",
-            "type": "u64"
-          },
-          {
-            "name": "closedUsh",
-            "type": "u64"
-          },
           {
             "name": "productSnapshotEntry",
             "type": "u128"
@@ -4648,6 +4715,14 @@ export const IDL: Vault = {
             "name": "hedgeRewardsSnapshotAccum",
             "type": "u128"
           },
+          {
+            "name": "deposit",
+            "type": "u64"
+          },
+          {
+            "name": "closedUsh",
+            "type": "u64"
+          },
           {
             "name": "timestampOpened",
             "type": "u64"
@@ -4655,6 +4730,12 @@ export const IDL: Vault = {
           {
             "name": "timestampClosed",
             "type": "u64"
+          },
+          {
+            "name": "state",
+            "type": {
+              "defined": "PositionState"
+            }
           }
         ]
       }
@@ -4665,8 +4746,8 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultTypeName",
-            "type": "string"
+            "name": "vaultType",
+            "type": "publicKey"
           },
           {
             "name": "oraclePyth",
@@ -4681,8 +4762,20 @@ export const IDL: Vault = {
             "type": "publicKey"
           },
           {
-            "name": "vaultType",
-            "type": "publicKey"
+            "name": "priorityPyth",
+            "type": "i8"
+          },
+          {
+            "name": "priorityChainlink",
+            "type": "i8"
+          },
+          {
+            "name": "prioritySwitchboard",
+            "type": "i8"
+          },
+          {
+            "name": "vaultTypeName",
+            "type": "string"
           }
         ]
       }
@@ -4886,7 +4979,7 @@ export const IDL: Vault = {
           },
           {
             "name": "totalUshSupply",
-            "type": "u64"
+            "type": "u128"
           },
           {
             "name": "totalVaults",
@@ -4926,10 +5019,6 @@ export const IDL: Vault = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "vaultTypeName",
-            "type": "string"
-          },
           {
             "name": "collateralMint",
             "type": "publicKey"
@@ -5002,6 +5091,22 @@ export const IDL: Vault = {
             "name": "interestRatePerSecond",
             "type": "u128"
           },
+          {
+            "name": "deprecated",
+            "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
+          },
+          {
+            "name": "vaultTypeName",
+            "type": "string"
+          },
           {
             "name": "firstVaultToRedeem",
             "type": {
@@ -5045,12 +5150,14 @@ export const IDL: Vault = {
             "type": "u64"
           },
           {
-            "name": "vaultTypeName",
-            "type": "string"
+            "name": "vaultStatus",
+            "type": {
+              "defined": "VaultStatus"
+            }
           },
           {
-            "name": "pdaSalt",
-            "type": "string"
+            "name": "vaultType",
+            "type": "publicKey"
           },
           {
             "name": "bump",
@@ -5074,12 +5181,6 @@ export const IDL: Vault = {
               "defined": "CurrencyType"
             }
           },
-          {
-            "name": "vaultStatus",
-            "type": {
-              "defined": "VaultStatus"
-            }
-          },
           {
             "name": "timeCreated",
             "type": "u64"
@@ -5088,15 +5189,19 @@ export const IDL: Vault = {
             "name": "timeLastInteraction",
             "type": "u64"
           },
+          {
+            "name": "vaultTypeName",
+            "type": "string"
+          },
+          {
+            "name": "pdaSalt",
+            "type": "string"
+          },
           {
             "name": "nextVaultToRedeem",
             "type": {
               "option": "publicKey"
             }
-          },
-          {
-            "name": "vaultType",
-            "type": "publicKey"
           }
         ]
       }
@@ -5186,6 +5291,24 @@ export const IDL: Vault = {
               "option": "publicKey"
             }
           },
+          {
+            "name": "priorityChainlink",
+            "type": {
+              "option": "i8"
+            }
+          },
+          {
+            "name": "priorityPyth",
+            "type": {
+              "option": "i8"
+            }
+          },
+          {
+            "name": "prioritySwitchboard",
+            "type": {
+              "option": "i8"
+            }
+          },
           {
             "name": "deprecated",
             "type": {
@@ -5530,8 +5653,33 @@ export const IDL: Vault = {
     },
     {
       "code": 6024,
+      "name": "InvalidNameLength",
+      "msg": "Name for new vault type must be length 16"
+    },
+    {
+      "code": 6025,
       "name": "UpdateVaultTypeBadMaxDebtExtended",
       "msg": "New Max debt extended value is less than the current debt!"
+    },
+    {
+      "code": 6025,
+      "name": "UpdateVaultTypeNoEnabledOracles",
+      "msg": "No Enabled Oracles!"
+    },
+    {
+      "code": 6026,
+      "name": "UpdateVaultTypeDuplicateOraclePriorities",
+      "msg": "Duplicate Oracle Priorities"
+    },
+    {
+      "code": 6027,
+      "name": "UpdateVaultTypeInvalidOraclePriority",
+      "msg": "Invalid Oracle Priority"
+    },
+    {
+      "code": 6028,
+      "name": "OracleUpdateFailed",
+      "msg": "OracleUpdateFailed"
     }
   ]
 };

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -16,7 +16,8 @@ import {
   getLiquidationPoolStatePublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function claimLiquidationPoolPosition(
   program: Program<Vault>,
@@ -48,7 +49,7 @@ export async function claimLiquidationPoolPosition(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 

package/src/instructions/claimStakingPoolPosition.ts

@@ -17,7 +17,8 @@ import {
   getPoolPublicKeyForMint,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function claimStakingPoolPosition(
   program: Program<Vault>,
@@ -58,7 +59,7 @@ export async function claimStakingPoolPosition(
       payerAssociatedTokenAccount.address
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return payerAssociatedTokenAccount.address
 }
 

package/src/instructions/closeLiquidationPoolPosition.ts

@@ -17,7 +17,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function closeLiquidationPoolPosition(
   program: Program<Vault>,
@@ -64,7 +65,7 @@ export async function closeLiquidationPoolPosition(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   return poolPosition
 }
 

package/src/instructions/createStakingPool.ts

@@ -16,7 +16,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function createStakingPool(
   program: Program<Vault>,
@@ -29,7 +30,7 @@ export async function createStakingPool(
   const transaction = new Transaction().add(
     await createStakingPoolInstruction(program, payer.publicKey, mintPublicKey, hedgeTokensToBeMinted, overrideStartTime)
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
   const [poolPublickey] = await getPoolPublicKeyForMint(mintPublicKey)
   return poolPublickey
 }
@@ -41,7 +42,6 @@ export async function createStakingPoolInstruction(
   hedgeTokensToBeMinted: number,
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
-  console.log("new createStakingPoolInstruction")
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const [poolPublickey, poolBump] = await getPoolPublicKeyForMint(mintPublicKey)

package/src/instructions/createVault.ts

@@ -23,7 +23,8 @@ import {
 
 import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function createVault(
   program: Program<Vault>,
@@ -106,7 +107,7 @@ export async function createVault(
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers).catch(parseAnchorErrors)
   return newVaultPublicKey
 }
 

package/src/instructions/depositLiquidationPool.ts

@@ -17,7 +17,8 @@ import {
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function depositLiquidationPool(
   program: Program<Vault>,
@@ -45,7 +46,7 @@ export async function depositLiquidationPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/depositStakingPool.ts

@@ -12,7 +12,8 @@ import {
 } from '@solana/web3.js'
 import { parseAnchorErrors } from '../utils/Errors'
 import { findAssociatedTokenAddress, getPoolPublicKeyForMint, getVaultSystemStatePublicKey } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 
 export async function depositStakingPool(
   program: Program<Vault>,
@@ -33,7 +34,7 @@ export async function depositStakingPool(
       overrideStartTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer, poolPosition]).catch(parseAnchorErrors)
   return poolPosition.publicKey
 }
 

package/src/instructions/depositVault.ts

@@ -19,7 +19,8 @@ import {
   getPoolPublicKeyForMint,
   getHedgeMintPublicKey,
 } from '../Constants'
-import { Vault } from 'idl/vault'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
 import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
 
 export async function depositVault(
@@ -64,7 +65,6 @@ export async function depositVault(
 
   const transaction = new Transaction()
   const signers = [payer, history]
-
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
@@ -125,7 +125,7 @@ export async function depositVault(
     )
   }
 
-  await sendAndConfirmTransaction(provider.connection, transaction, signers)
+  await sendAndConfirmWithDebug(provider.connection, transaction, signers)
   return vaultPublicKey
 }