hedge-web3 0.1.40 → 0.1.43

package/lib/utils/getLinkedListAccounts.js

@@ -14,11 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const underscore_1 = __importDefault(require("underscore"));
+const Constants_1 = require("../Constants");
 const HedgeDecimal_1 = require("../HedgeDecimal");
 const VaultAccount_1 = require("../state/VaultAccount");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const bs58_1 = __importDefault(require("bs58"));
 function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, loanAmount, redeem, liquidate, cachedVaults) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log('Getting getLinkedListAccounts');
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         // Default for null is the vault itself, so set them all to this vault
         let oldSmallerPublicKey = vaultPublicKey;
@@ -32,29 +35,33 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             vaults = cachedVaults;
         }
         else {
-            let allVaults = cachedVaults
-                ? cachedVaults
-                : (yield program.account.vault
-                    .all([
-                // {
-                //   memcmp: { bytes: bs58.encode(inputCollateralType), offset: 8 + 32 + 8 },
-                // },
-                ])
-                    .catch((error) => {
-                    console.log('error', error);
-                })) || [];
-            // Load them into our account objects
-            vaults = allVaults.map((vault) => {
-                return new VaultAccount_1.VaultAccount(vault.account, vault.publicKey);
-            });
+            // let allVaults = cachedVaults
+            //   ? cachedVaults
+            //   : (await program.account.vault
+            //       .all([
+            //         {
+            //           memcmp: { bytes: vaultTypeAccount.collateralType, offset: 8 + 32 + 8 },
+            //         },
+            //       ])
+            //       .catch((error) => {
+            //         console.log('error', error)
+            //       })) || []
+            // // Load them into our account objects
+            // vaults = allVaults.map((vault) => {
+            //   return new VaultAccount(vault.account, vault.publicKey)
+            // })
+            vaults = yield getMiniVaults(program, vaultTypeAccount.collateralType);
         }
-        // Filter out the account that are not the same vault type
-        vaults = underscore_1.default.filter(vaults, (vault) => {
-            return vault.collateralType === vaultTypeAccount.collateralType;
-        });
+        console.log('Vault count found:', vaults.length);
+        console.log('First Vault', vaults[0]);
         // Filter out the accounts that are not open
+        // TODO filter on vault status. Or we enable people to "close out" empty vaults 
+        // vaults = _.filter(vaults, (vault) => {
+        //   return vault.vaultStatus === 'open'
+        // })
+        // Remove any vaults with no debt or collateral
         vaults = underscore_1.default.filter(vaults, (vault) => {
-            return vault.vaultStatus === 'open';
+            return vault.denormalizedDebt > 0 && vault.deposited > 0;
         });
         // Sort them
         vaults.sort(sortVaults);
@@ -71,28 +78,31 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         }
         // Pretty print all the vaults before the operation
         // console.log('Sorted open vaults BEFORE at index:', indexBefore)
-        let correctOrderBefore = true;
-        for (let i = 0; i < vaults.length; i++) {
-            if (i < vaults.length - 1) {
-                // Verify i points to i+1
-                if (vaults[i].nextVaultToRedeem.toString() !== vaults[i + 1].publicKey.toString()) {
-                    correctOrderBefore = false;
-                    console.log("A vault was found OUT OF ORDER!!", vaults[i]);
-                }
-            }
-        }
-        if (correctOrderBefore) {
-            console.log(`Verfied the on-chain order of vault type:`, vaultTypeAccount.collateralType);
-        }
-        else {
-            throw new Error("On-Chian vaults not in order!");
-        }
+        // let correctOrderBefore = true
+        // for (let i = 0; i < vaults.length; i++) {
+        //   if (i < vaults.length - 1) {
+        //     // Verify i points to i+1
+        //     if (vaults[i].nextVaultToRedeem.toString() !== vaults[i + 1].publicKey.toString()) {
+        //       correctOrderBefore = false
+        //       console.log('A vault was found OUT OF ORDER!!', vaults[i])
+        //     }
+        //   }
+        // }
+        // if (correctOrderBefore) {
+        //   console.log(`Verfied the on-chain order of vault type:`, vaultTypeAccount.collateralType)
+        // } else {
+        //   throw new Error('On-Chian vaults not in order!')
+        // }
         // If it wasn't in the list, add it now
         if (indexBefore < 0) {
             // console.log('Was not in the list before. Adding now.')
             vaults.push(thisVault);
             indexBefore = vaults.length - 1;
         }
+        else {
+            // Copy in the vault so we have the full data (needed to run updateDebtAndCollateral)
+            vaults[indexBefore] = thisVault;
+        }
         // Now that we know it's def in the list, iterate the list and update
         // this vault with the opeation we're going to apply
         const newNormalizedDebt = new decimal_js_1.default(loanAmount);
@@ -131,8 +141,8 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         //   })
         // )
         // Print where it moved from / to
-        // console.log('Index Before', indexBefore)
-        // console.log('Index After', indexAfter)
+        console.log('Index Before', indexBefore);
+        console.log('Index After', indexAfter);
         // Save references to the new left and right
         if (indexAfter > 0) {
             newSmallerPublicKey = vaults[indexAfter - 1].publicKey;
@@ -158,3 +168,33 @@ function sortVaults(a, b) {
     }
     return aRatio - bRatio;
 }
+function getMiniVaults(program, collateralType) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const filters = [
+            // Filter for Vault Accounts
+            {
+                // @ts-ignore
+                memcmp: program.account.vault.coder.accounts.memcmp(program.account.vault._idlAccount.name),
+            },
+            // Filter for Vaults with this collateral type
+            {
+                memcmp: {
+                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(collateralType)),
+                    offset: 8 + 32 + 24,
+                },
+            },
+        ];
+        const allAccounts = yield program.provider.connection.getProgramAccounts(Constants_1.HEDGE_PROGRAM_PUBLICKEY, {
+            filters: filters,
+            // Slice the data only to grab the 3 u64's of size 8 bytes each
+            dataSlice: {
+                // See programs/hedge-vault/src/account_data/vault.rs for struct layout
+                offset: 8 + 32,
+                length: 24,
+            },
+        });
+        return allAccounts.map(vaultData => {
+            return VaultAccount_1.VaultAccount.FromMiniSlice(vaultData.account.data, vaultData.pubkey);
+        });
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.40",
+  "version": "0.1.43",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -14,7 +14,7 @@
   "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
   "dependencies": {
-    "@project-serum/anchor": "^0.24.2",
+    "@project-serum/anchor": "0.24.2",
     "@project-serum/serum": "^0.13.61",
     "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",
@@ -24,6 +24,7 @@
     "@types/underscore": "^1.11.4",
     "@types/uuid": "^8.3.4",
     "bn.js": "^5.2.0",
+    "bs58": "^5.0.0",
     "decimal.js": "^10.3.1",
     "rollup": "^2.62.0",
     "ts-standard": "^11.0.0",

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"
+          }
         }
       ]
     }
@@ -1903,7 +1968,7 @@ export type Vault = {
             "type": {
               "array": [
                 "u8",
-                12
+                16
               ]
             }
           },
@@ -2243,6 +2308,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": {
@@ -2565,6 +2680,16 @@ export type Vault = {
       "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": "UpdateVaultTypeBadMaxDebtExtended",
+      "msg": "New Max debt extended value is less than the current debt!"
     }
   ]
 };
@@ -4131,7 +4256,7 @@ export const IDL: Vault = {
       ]
     },
     {
-      "name": "setVaultTypeStatus",
+      "name": "updateVaultType",
       "accounts": [
         {
           "name": "payer",
@@ -4147,12 +4272,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"
+          }
         }
       ]
     }
@@ -4474,7 +4664,7 @@ export const IDL: Vault = {
             "type": {
               "array": [
                 "u8",
-                12
+                16
               ]
             }
           },
@@ -4814,6 +5004,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": {
@@ -5136,6 +5376,16 @@ export const IDL: Vault = {
       "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": "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/{setVaultTypeStatus.ts → updateVaultType.ts}

@@ -23,36 +23,67 @@ import { v4 as uuidv4 } from 'uuid'
 import { parseAnchorErrors } from '../utils/Errors'
 import { Vault } from 'idl/vault'
 
-export async function setVaultTypeStatus(
+export interface VaultTypeConfig {
+  maxDebtExtended?: BN
+  minDebtPerVault?: BN
+  loanInitFee?: BN
+
+  oracleChainlink?: PublicKey
+  oraclePyth?: PublicKey
+  oracleSwitchboard?: PublicKey
+
+  deprecated?: boolean
+}
+
+export async function updateVaultType(
   program: Program<Vault>,
   provider: Provider,
   payer: Signer,
   vaultTypeAccount: PublicKey,
-  deprecated: boolean
+  oracleInfoAccount: PublicKey,
+  config: VaultTypeConfig
 ): Promise<PublicKey> {
   const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
-
   const transaction = new Transaction().add(
-    await setVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, deprecated)
+    await updateVaultTypeStatusInstruction(
+      program,
+      vaultSystemStatePublicKey,
+      payer.publicKey,
+      vaultTypeAccount,
+      oracleInfoAccount,
+      config
+    )
   )
 
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer]).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer])
   return vaultSystemStatePublicKey
 }
 
-export async function setVaultTypeStatusInstruction(
+export async function updateVaultTypeStatusInstruction(
   program: Program<Vault>,
   vaultSystemStatePublicKey: PublicKey,
   payerPublicKey: PublicKey,
   vaultTypeAccount: PublicKey,
-  deprecated: boolean
+  oracleInfoAccount: PublicKey,
+  vaultTypeConfig: VaultTypeConfig
 ): Promise<TransactionInstruction> {
+  const config = {
+    maxDebtExtended: vaultTypeConfig.maxDebtExtended ?? null,
+    minDebtPerVault: vaultTypeConfig.minDebtPerVault ?? null,
+    loanInitFee: vaultTypeConfig.loanInitFee ?? null,
+    oracleChainlink: vaultTypeConfig.oracleChainlink ?? null,
+    oraclePyth: vaultTypeConfig.oraclePyth ?? null,
+    oracleSwitchboard: vaultTypeConfig.oracleSwitchboard ?? null,
+    deprecated: vaultTypeConfig.deprecated ?? null,
+  }
+
   return await program.methods
-    .setVaultTypeStatus(deprecated)
+    .updateVaultType(config)
     .accounts({
       payer: payerPublicKey,
       vaultSystemState: vaultSystemStatePublicKey,
       vaultType: vaultTypeAccount,
+      oracleInfoAccount: oracleInfoAccount,
     })
     .instruction()
 }