hedge-web3 0.2.19 → 0.2.20

package/declarations/idl/vault.d.ts

@@ -3076,6 +3076,26 @@ export declare type Vault = {
                     "index": false;
                 }
             ];
+        },
+        {
+            "name": "VaultTransferEvent";
+            "fields": [
+                {
+                    "name": "vault";
+                    "type": "publicKey";
+                    "index": false;
+                },
+                {
+                    "name": "oldOwner";
+                    "type": "publicKey";
+                    "index": false;
+                },
+                {
+                    "name": "newOwner";
+                    "type": "publicKey";
+                    "index": false;
+                }
+            ];
         }
     ];
     "errors": [

package/declarations/instructions/transferVault.d.ts

@@ -0,0 +1,19 @@
+/// <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;
+    emergencyModeThreshold?: BN;
+    oracleChainlink?: PublicKey;
+    oraclePyth?: PublicKey;
+    oracleSwitchboard?: PublicKey;
+    priorityPyth?: number;
+    priorityChainlink?: number;
+    prioritySwitchboard?: number;
+    deprecated?: boolean;
+}
+export declare function transferVault(program: Program<Vault>, provider: Provider, payer: Signer, vaultTypeAccount: PublicKey, oracleInfoAccount: PublicKey, config: VaultTypeConfig): Promise<PublicKey>;
+export declare function transferVaultInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, vaultTypeAccount: PublicKey, oracleInfoAccount: PublicKey, vaultTypeConfig: VaultTypeConfig): Promise<TransactionInstruction>;

package/declarations/state/VaultAccount.d.ts

@@ -11,8 +11,7 @@ export declare class VaultAccount {
     publicKey: PublicKey;
     /** The public key of the vault owner. */
     vaultOwner: PublicKey;
-    /** The public key of the vault owner. */
-    pdaSalt: string;
+    /** The public key of the vault owner. */ pdaSalt: string;
     /** The deposited collateral of the vault (in SOL Lamports). */
     deposited: BN;
     /** The outstanding debt of the vault (in USH Lamports). Denormalized to time 0. */

package/lib/idl/vault.js

@@ -3079,6 +3079,26 @@ exports.IDL = {
                     "index": false
                 }
             ]
+        },
+        {
+            "name": "VaultTransferEvent",
+            "fields": [
+                {
+                    "name": "vault",
+                    "type": "publicKey",
+                    "index": false
+                },
+                {
+                    "name": "oldOwner",
+                    "type": "publicKey",
+                    "index": false
+                },
+                {
+                    "name": "newOwner",
+                    "type": "publicKey",
+                    "index": false
+                }
+            ]
         }
     ],
     "errors": [

package/lib/instructions/transferVault.js

@@ -0,0 +1,55 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transferVaultInstruction = exports.transferVault = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Constants_1 = require("../Constants");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
+function transferVault(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 transferVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, oracleInfoAccount, config));
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
+        return vaultSystemStatePublicKey;
+    });
+}
+exports.transferVault = transferVault;
+function transferVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, oracleInfoAccount, vaultTypeConfig) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    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,
+            emergencyModeThreshold: (_d = vaultTypeConfig.emergencyModeThreshold) !== null && _d !== void 0 ? _d : null,
+            oracleChainlink: (_e = vaultTypeConfig.oracleChainlink) !== null && _e !== void 0 ? _e : null,
+            oraclePyth: (_f = vaultTypeConfig.oraclePyth) !== null && _f !== void 0 ? _f : null,
+            oracleSwitchboard: (_g = vaultTypeConfig.oracleSwitchboard) !== null && _g !== void 0 ? _g : null,
+            deprecated: (_h = vaultTypeConfig.deprecated) !== null && _h !== void 0 ? _h : null,
+            priorityPyth: (_j = vaultTypeConfig.priorityPyth) !== null && _j !== void 0 ? _j : null,
+            priorityChainlink: (_k = vaultTypeConfig.priorityChainlink) !== null && _k !== void 0 ? _k : null,
+            prioritySwitchboard: (_l = vaultTypeConfig.prioritySwitchboard) !== null && _l !== void 0 ? _l : null,
+        };
+        return yield program.methods
+            .updateVaultType(config)
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultType: vaultTypeAccount,
+            oracleInfoAccount: oracleInfoAccount,
+        })
+            .instruction();
+    });
+}
+exports.transferVaultInstruction = transferVaultInstruction;

package/lib/state/VaultAccount.js

@@ -163,7 +163,9 @@ class VaultAccount {
             .mul(new decimal_js_1.default(this.denormalizedDebt.toString()))
             .floor()
             .toString());
-        const extraCollateralDeposited = new decimal_js_1.default(this.denormalizedDebt.toString()).mul(vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()).floor();
+        const extraCollateralDeposited = new decimal_js_1.default(this.denormalizedDebt.toString())
+            .mul(vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber())
+            .floor();
         this.deposited = this.deposited.add(new bn_js_1.default(extraCollateralDeposited.toString()));
         this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator;
         this.debtProductSnapshotBytes = vaultTypeAccountData.debtRedistributionProduct;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/idl/vault.ts

@@ -3076,6 +3076,26 @@ export type Vault = {
           "index": false
         }
       ]
+    },
+    {
+      "name": "VaultTransferEvent",
+      "fields": [
+        {
+          "name": "vault",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "oldOwner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "newOwner",
+          "type": "publicKey",
+          "index": false
+        }
+      ]
     }
   ],
   "errors": [
@@ -6335,6 +6355,26 @@ export const IDL: Vault = {
           "index": false
         }
       ]
+    },
+    {
+      "name": "VaultTransferEvent",
+      "fields": [
+        {
+          "name": "vault",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "oldOwner",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "newOwner",
+          "type": "publicKey",
+          "index": false
+        }
+      ]
     }
   ],
   "errors": [

package/src/instructions/transferVault.ts

@@ -0,0 +1,99 @@
+import { BN, Program, Provider } from '@project-serum/anchor'
+import {
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+  Signer,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  Transaction,
+  TransactionInstruction,
+} from '@solana/web3.js'
+import {
+  findAssociatedTokenAddress,
+  findVaultAddress,
+  getVaultTypeAccountPublicKey,
+  getUshMintPublicKey,
+  getVaultSystemStatePublicKey,
+  getPoolPublicKeyForMint,
+  getHedgeMintPublicKey,
+} from '../Constants'
+
+import { v4 as uuidv4 } from 'uuid'
+import { parseAnchorErrors } from '../utils/Errors'
+import sendAndConfirmWithDebug from '../utils/sendAndConfirmWithDebug'
+import { Vault } from '../idl/vault'
+
+export interface VaultTypeConfig {
+  maxDebtExtended?: BN
+  minDebtPerVault?: BN
+  loanInitFee?: BN
+  emergencyModeThreshold?: BN
+
+  oracleChainlink?: PublicKey
+  oraclePyth?: PublicKey
+  oracleSwitchboard?: PublicKey
+
+  priorityPyth?: number
+  priorityChainlink?: number
+  prioritySwitchboard?: number
+
+  deprecated?: boolean
+}
+
+export async function transferVault(
+  program: Program<Vault>,
+  provider: Provider,
+  payer: Signer,
+  vaultTypeAccount: PublicKey,
+  oracleInfoAccount: PublicKey,
+  config: VaultTypeConfig
+): Promise<PublicKey> {
+  const vaultSystemStatePublicKey = await getVaultSystemStatePublicKey()
+  const transaction = new Transaction().add(
+    await transferVaultInstruction(
+      program,
+      vaultSystemStatePublicKey,
+      payer.publicKey,
+      vaultTypeAccount,
+      oracleInfoAccount,
+      config
+    )
+  )
+
+  await sendAndConfirmWithDebug(provider.connection, transaction, [payer])
+  return vaultSystemStatePublicKey
+}
+
+export async function transferVaultInstruction(
+  program: Program<Vault>,
+  vaultSystemStatePublicKey: PublicKey,
+  payerPublicKey: PublicKey,
+  vaultTypeAccount: PublicKey,
+  oracleInfoAccount: PublicKey,
+  vaultTypeConfig: VaultTypeConfig
+): Promise<TransactionInstruction> {
+  const config = {
+    maxDebtExtended: vaultTypeConfig.maxDebtExtended ?? null,
+    minDebtPerVault: vaultTypeConfig.minDebtPerVault ?? null,
+    loanInitFee: vaultTypeConfig.loanInitFee ?? null,
+    emergencyModeThreshold: vaultTypeConfig.emergencyModeThreshold ?? null,
+    oracleChainlink: vaultTypeConfig.oracleChainlink ?? null,
+    oraclePyth: vaultTypeConfig.oraclePyth ?? null,
+    oracleSwitchboard: vaultTypeConfig.oracleSwitchboard ?? null,
+    deprecated: vaultTypeConfig.deprecated ?? null,
+    priorityPyth: vaultTypeConfig.priorityPyth ?? null,
+    priorityChainlink: vaultTypeConfig.priorityChainlink ?? null,
+    prioritySwitchboard: vaultTypeConfig.prioritySwitchboard ?? null,
+  }
+
+  return await program.methods
+    .updateVaultType(config)
+    .accounts({
+      payer: payerPublicKey,
+      vaultSystemState: vaultSystemStatePublicKey,
+      vaultType: vaultTypeAccount,
+      oracleInfoAccount: oracleInfoAccount,
+    })
+    .instruction()
+}

package/src/state/VaultAccount.ts

@@ -16,7 +16,7 @@ export class VaultAccount {
   /** The public key of the vault owner. */
   vaultOwner: PublicKey
 
-  /** The public key of the vault owner. */
+  /** The public key of the vault owner. */ // dont think this is correct? thoughts?
   pdaSalt: string
 
   /** The deposited collateral of the vault (in SOL Lamports). */
@@ -50,7 +50,7 @@ export class VaultAccount {
     this.publicKey = publicKey
     this.vaultOwner = vault.vaultOwner
     this.pdaSalt = vault.pdaSalt
-    
+
     this.deposited = vault.deposited
     this.denormalizedDebt = vault.denormalizedDebt
 
@@ -177,16 +177,15 @@ export class VaultAccount {
   public updateDebtAndCollateral(vaultTypeAccountData: VaultType) {
     this.denormalizedDebt = new BN(
       vaultTypeAccountData.debtRedistributionProduct
-      .div(this.debtProductSnapshotBytes)
-      .mul(new Decimal(this.denormalizedDebt.toString()))
-      .floor()
-      .toString()
+        .div(this.debtProductSnapshotBytes)
+        .mul(new Decimal(this.denormalizedDebt.toString()))
+        .floor()
+        .toString()
     )
 
-    const extraCollateralDeposited =
-      new Decimal(this.denormalizedDebt.toString()).mul(
-        vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
-      ).floor()
+    const extraCollateralDeposited = new Decimal(this.denormalizedDebt.toString())
+      .mul(vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber())
+      .floor()
     this.deposited = this.deposited.add(new BN(extraCollateralDeposited.toString()))
 
     this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator