hedge-web3 0.1.41 → 0.1.42

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": "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";
+                    };
                 }
             ];
         }
@@ -2243,6 +2308,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": {
@@ -2565,6 +2680,16 @@ export declare 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!";
         }
     ];
 };

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/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/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"
+                    }
                 }
             ]
         }
@@ -2246,6 +2311,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": {
@@ -2568,6 +2683,16 @@ exports.IDL = {
             "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/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/updateVaultType.js

@@ -0,0 +1,47 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateVaultTypeStatusInstruction = exports.updateVaultType = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+function updateVaultType(program, provider, payer, vaultTypeAccount, oracleInfoAccount, config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
+        const transaction = new web3_js_1.Transaction().add(yield updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, oracleInfoAccount, config));
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]);
+        return vaultSystemStatePublicKey;
+    });
+}
+exports.updateVaultType = updateVaultType;
+function updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, oracleInfoAccount, vaultTypeConfig) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return __awaiter(this, void 0, void 0, function* () {
+        const config = {
+            maxDebtExtended: (_a = vaultTypeConfig.maxDebtExtended) !== null && _a !== void 0 ? _a : null,
+            minDebtPerVault: (_b = vaultTypeConfig.minDebtPerVault) !== null && _b !== void 0 ? _b : null,
+            loanInitFee: (_c = vaultTypeConfig.loanInitFee) !== null && _c !== void 0 ? _c : null,
+            oracleChainlink: (_d = vaultTypeConfig.oracleChainlink) !== null && _d !== void 0 ? _d : null,
+            oraclePyth: (_e = vaultTypeConfig.oraclePyth) !== null && _e !== void 0 ? _e : null,
+            oracleSwitchboard: (_f = vaultTypeConfig.oracleSwitchboard) !== null && _f !== void 0 ? _f : null,
+            deprecated: (_g = vaultTypeConfig.deprecated) !== null && _g !== void 0 ? _g : null,
+        };
+        return yield program.methods
+            .updateVaultType(config)
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultType: vaultTypeAccount,
+            oracleInfoAccount: oracleInfoAccount,
+        })
+            .instruction();
+    });
+}
+exports.updateVaultTypeStatusInstruction = updateVaultTypeStatusInstruction;

package/lib/utils/Errors.js

@@ -5,6 +5,7 @@ const anchor_1 = require("@project-serum/anchor");
 const vault_1 = require("../idl/vault");
 function parseAnchorErrors(error) {
     const idlErrors = (0, anchor_1.parseIdlErrors)(vault_1.IDL);
+    console.log(error);
     const parsedError = anchor_1.ProgramError.parse(error, idlErrors);
     if (parsedError !== null) {
         throw parsedError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "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",

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"
+          }
         }
       ]
     }
@@ -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"
+          }
         }
       ]
     }
@@ -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()
 }

package/src/utils/Errors.ts

@@ -3,6 +3,7 @@ import { IDL } from '../idl/vault'
 
 export function parseAnchorErrors (error: any): void {
   const idlErrors = parseIdlErrors(IDL)
+  console.log(error)
   const parsedError = ProgramError.parse(error, idlErrors)
   if (parsedError !== null) {
     throw parsedError