hedge-web3 0.1.39 → 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/declarations/state/VaultAccount.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 /**
@@ -16,8 +17,11 @@ export declare class VaultAccount {
     denormalizedDebt: number;
     /** The ordered number of when this vault was created. */
     vaultNumber: number;
+    /** Debt redistribution snapshop */
     debtProductSnapshotBytes: Decimal;
+    /** Collateral redistribution snapshop' */
     collateralAccumulatorSnapshotBytes: Decimal;
+    /** The vault type eg 'SOL-150' */
     collateralType: string;
     /** Current State of the vautl ("Open", "Closed", "Liquidated") */
     vaultStatus: string;
@@ -55,4 +59,23 @@ export declare class VaultAccount {
     liquidate(): void;
     updateDebtAndCollateral(vaultTypeAccuntData: any): void;
     toString(highlight: PublicKey): string;
+    /**
+     * Creates a VaultAccount from a slice of data
+     *
+     * It only contains
+     * - Denormalized Debt
+     * - Deposit
+     * - Vault Number
+     *
+     * This can be used to do off-chain sort with very little data.
+     *
+     * @returns a new VaultAccount
+     */
+    static FromMiniSlice(data: Buffer, pubkey: PublicKey): VaultAccount;
+    /**
+     * Encode a string for doing byte comparison on solana
+     *
+     * @returns Buffer of the encoded string
+     */
+    static getBufferForString(string: string): Buffer;
 }

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/state/VaultAccount.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,22 +26,36 @@ exports.VaultAccount = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const HedgeDecimal_1 = require("../HedgeDecimal");
+const borsh = __importStar(require("@project-serum/borsh"));
 /**
  * A class that represents an on-chian vault.
  */
 class VaultAccount {
     constructor(vault, publicKey) {
+        var _a, _b, _c;
+        /** Debt redistribution snapshop */
+        this.debtProductSnapshotBytes = new decimal_js_1.default(0);
+        /** Collateral redistribution snapshop' */
+        this.collateralAccumulatorSnapshotBytes = new decimal_js_1.default(0);
+        /** Current State of the vautl ("Open", "Closed", "Liquidated") */
+        this.vaultStatus = '';
         this.publicKey = publicKey;
         this.vaultOwner = vault.vaultOwner;
-        this.vaultNumber = vault.vaultNumber.toNumber();
+        this.vaultNumber = (_a = vault.vaultNumber) === null || _a === void 0 ? void 0 : _a.toNumber();
         this.pdaSalt = vault.pdaSalt;
-        this.deposited = vault.deposited.toNumber();
-        this.denormalizedDebt = vault.denormalizedDebt.toNumber();
-        this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
-        this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.collateralAccumulatorSnapshotBytes.toString());
+        this.deposited = (_b = vault.deposited) === null || _b === void 0 ? void 0 : _b.toNumber();
+        this.denormalizedDebt = (_c = vault.denormalizedDebt) === null || _c === void 0 ? void 0 : _c.toNumber();
+        if (vault.debtProductSnapshotBytes) {
+            this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
+        }
+        if (vault.collateralAccumulatorSnapshotBytes) {
+            this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.collateralAccumulatorSnapshotBytes.toString());
+        }
         this.collateralType = vault.collateralType;
         this.nextVaultToRedeem = vault.nextVaultToRedeem;
-        this.vaultStatus = Object.keys(vault.vaultStatus)[0];
+        if (vault.vaultStatus) {
+            this.vaultStatus = Object.keys(vault.vaultStatus)[0];
+        }
     }
     /**
      * Check if some `PublicKey` is the owner
@@ -102,9 +135,40 @@ class VaultAccount {
         if (this.nextVaultToRedeem) {
             nextVault = this.nextVaultToRedeem.toString().substring(0, 6);
         }
-        return `Vault(${this.vaultNumber}): ${this.publicKey
-            .toString()
-            .substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `;
+        return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `;
+    }
+    /**
+     * Creates a VaultAccount from a slice of data
+     *
+     * It only contains
+     * - Denormalized Debt
+     * - Deposit
+     * - Vault Number
+     *
+     * This can be used to do off-chain sort with very little data.
+     *
+     * @returns a new VaultAccount
+     */
+    static FromMiniSlice(data, pubkey) {
+        const props = [borsh.u64('vaultNumber'), borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
+        const miniVaultLayout = borsh.struct(props, 'minVaultLayout');
+        const decodedData = miniVaultLayout.decode(data);
+        return new VaultAccount(decodedData, pubkey);
+    }
+    /**
+     * Encode a string for doing byte comparison on solana
+     *
+     * @returns Buffer of the encoded string
+     */
+    static getBufferForString(string) {
+        const stringLayout = borsh.struct([borsh.str('name')], 'justStringLayout');
+        let buffer = Buffer.alloc(50);
+        stringLayout.encode({ name: string }, buffer);
+        // Trim empty space at end of buffer
+        while (buffer.at(buffer.length - 1) == 0) {
+            buffer = buffer.slice(0, buffer.length - 1);
+        }
+        return buffer;
     }
 }
 exports.VaultAccount = VaultAccount;

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;