hedge-web3 0.1.41 → 0.1.44

package/src/idl/vault.ts

@@ -1560,7 +1560,7 @@ export type Vault = {
       ]
     },
     {
-      "name": "setVaultTypeStatus",
+      "name": "updateVaultType",
       "accounts": [
         {
           "name": "payer",
@@ -1576,12 +1576,77 @@ export type Vault = {
           "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"
+          }
         }
       ]
     }
@@ -1779,7 +1844,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -1793,6 +1858,10 @@ export type Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -1903,7 +1972,7 @@ export type Vault = {
             "type": {
               "array": [
                 "u8",
-                12
+                16
               ]
             }
           },
@@ -2037,7 +2106,7 @@ export type Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -2121,6 +2190,14 @@ export type Vault = {
           {
             "name": "deprecated",
             "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
           }
         ]
       }
@@ -2147,7 +2224,7 @@ export type Vault = {
             "type": "u64"
           },
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -2195,6 +2272,10 @@ export type Vault = {
             "type": {
               "option": "publicKey"
             }
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -2243,6 +2324,56 @@ export 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 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!"
     }
   ]
 };
@@ -4131,7 +4277,7 @@ export const IDL: Vault = {
       ]
     },
     {
-      "name": "setVaultTypeStatus",
+      "name": "updateVaultType",
       "accounts": [
         {
           "name": "payer",
@@ -4147,12 +4293,77 @@ export const IDL: Vault = {
           "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"
+          }
         }
       ]
     }
@@ -4350,7 +4561,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4364,6 +4575,10 @@ export const IDL: Vault = {
           {
             "name": "oracleSwitchboard",
             "type": "publicKey"
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -4474,7 +4689,7 @@ export const IDL: Vault = {
             "type": {
               "array": [
                 "u8",
-                12
+                16
               ]
             }
           },
@@ -4608,7 +4823,7 @@ export const IDL: Vault = {
         "kind": "struct",
         "fields": [
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4692,6 +4907,14 @@ export const IDL: Vault = {
           {
             "name": "deprecated",
             "type": "bool"
+          },
+          {
+            "name": "totalFeesAccumulatedUsh",
+            "type": "u128"
+          },
+          {
+            "name": "totalFeesAccumulatedCollateral",
+            "type": "u128"
           }
         ]
       }
@@ -4718,7 +4941,7 @@ export const IDL: Vault = {
             "type": "u64"
           },
           {
-            "name": "collateralType",
+            "name": "vaultTypeName",
             "type": "string"
           },
           {
@@ -4766,6 +4989,10 @@ export const IDL: Vault = {
             "type": {
               "option": "publicKey"
             }
+          },
+          {
+            "name": "vaultType",
+            "type": "publicKey"
           }
         ]
       }
@@ -4814,6 +5041,56 @@ export const IDL: 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": {
@@ -5129,13 +5406,28 @@ export const IDL: 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/src/index.ts

@@ -17,7 +17,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'

package/src/instructions/createStakingPool.ts

@@ -41,6 +41,7 @@ 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/depositVault.ts

@@ -20,6 +20,7 @@ import {
   getHedgeMintPublicKey,
 } from '../Constants'
 import { Vault } from 'idl/vault'
+import { WRAPPED_SOL_MINT } from '@project-serum/serum/lib/token-instructions'
 
 export async function depositVault(
   program: Program<Vault>,
@@ -35,13 +36,12 @@ export async function depositVault(
   await getOrCreateAssociatedTokenAccount(provider.connection, payer, ushMintPublickey, payer.publicKey)
 
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccountInfo.collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
 
@@ -68,7 +68,7 @@ export async function depositVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     depositAmount,
     0,
@@ -76,7 +76,7 @@ export async function depositVault(
     false
   )
 
-  if (vaultAccount.collateralType === 'SOL') {
+  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
     transaction.add(
       SystemProgram.createAccount({
         fromPubkey: payer.publicKey,
@@ -98,11 +98,11 @@ export async function depositVault(
       program,
       vaultSystemStatePublicKey,
       payer.publicKey,
-      vaultAccount.collateralType === 'SOL' ? wrappedSolAccount.publicKey : payerTokenAccount,
+      vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString() ? wrappedSolAccount.publicKey : payerTokenAccount,
       vaultPublicKey,
       vaultAssociatedCollateralAccountPublicKey,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       hedgeStakingPoolPublicKey,
       hedgeStakingPoolAssociatedUshTokenAccount,
@@ -115,7 +115,7 @@ export async function depositVault(
       overrideTime
     )
   )
-  if (vaultAccount.collateralType === 'SOL') {
+  if (vaultTypeAccountInfo.collateralMint.toString() === WRAPPED_SOL_MINT.toString()) {
     transaction.add(
       TokenInstructions.closeAccount({
         source: wrappedSolAccount.publicKey,

package/src/instructions/liquidateVault.ts

@@ -31,8 +31,7 @@ export async function liquidateVault(
 ): Promise<PublicKey> {
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
 
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccountInfo = await program.account.vaultType.fetch(vaultAccount.vaultType)
   const collateralMint = vaultTypeAccountInfo.collateralMint
 
   const hedgeMintPublickey = await getHedgeMintPublicKey()
@@ -73,7 +72,7 @@ export async function liquidateVault(
     provider.connection,
     payer,
     collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
   const hedgeStakingPoolAssociatedUshTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -87,7 +86,7 @@ export async function liquidateVault(
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     0,
@@ -119,7 +118,7 @@ export async function liquidateVault(
       oldSmallerPublicKey,
       newSmallerPublicKey,
       newLargerPublicKey,
-      vaultAccount.collateralType,
+      vaultAccount.vaultType,
       overrideTime
     )
   )
@@ -146,13 +145,12 @@ export async function liquidateVaultInstruction(
   oldSmallerPublicKey: PublicKey,
   newSmallerPublicKey: PublicKey,
   newLargerPublicKey: PublicKey,
-  collateralType: string,
+  vaultTypeAccount: PublicKey,
   overrideTime?: number
 ): Promise<TransactionInstruction> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
   const ushMintPublickey = await getUshMintPublicKey()
   const liquidationPoolUshAccountPublickey = await getLiquidationPoolUshAccountPublicKey()
-  const vaultTypeAccount = await getVaultTypeAccountPublicKey(collateralType)
 
   return await program.methods
     .liquidateVault(

package/src/instructions/loanVault.ts

@@ -17,8 +17,13 @@ import {
   getVaultTypeAccountPublicKey,
   getUshMintPublicKey,
   getVaultSystemStatePublicKey,
+  HEDGE_PROGRAM_PUBLICKEY,
 } from '../Constants'
 import { Vault } from 'idl/vault'
+import { parseAnchorErrors } from '../utils/Errors'
+import { VaultAccount } from '../state/VaultAccount'
+
+const fs = require('fs');
 
 export async function loanVault(
   program: Program<Vault>,
@@ -36,15 +41,14 @@ export async function loanVault(
     ushMintPublickey,
     payer.publicKey
   )
-
   const vaultAccount = await program.account.vault.fetch(vaultPublicKey)
-  const vaultTypeAccountPublicKey = await getVaultTypeAccountPublicKey(vaultAccount.collateralType)
-  const vaultTypeAccount = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
+  const vaultTypeAccount = await program.account.vaultType.fetch(vaultAccount.vaultType)
+
   const vaultTypeAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
     provider.connection,
     payer,
     vaultTypeAccount.collateralMint,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     true
   )
   const vaultAssociatedTokenAccount = await getOrCreateAssociatedTokenAccount(
@@ -54,11 +58,10 @@ export async function loanVault(
     vaultPublicKey,
     true
   )
-
   const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = await getLinkedListAccounts(
     program,
     provider,
-    vaultTypeAccountPublicKey,
+    vaultAccount.vaultType,
     vaultPublicKey,
     0,
     loanAmount,
@@ -75,7 +78,7 @@ export async function loanVault(
       vaultPublicKey,
       vaultAssociatedTokenAccount.address,
       history.publicKey,
-      vaultTypeAccountPublicKey,
+      vaultAccount.vaultType,
       vaultTypeAssociatedTokenAccount.address,
       oldSmallerPublicKey,
       newSmallerPublicKey,
@@ -84,7 +87,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history]).catch(parseAnchorErrors)
   return vaultPublicKey
 }