hedge-web3 0.2.20 → 0.2.21

package/declarations/idl/vault.d.ts

@@ -2798,6 +2798,12 @@ export declare type Vault = {
                             "option": "u64";
                         };
                     },
+                    {
+                        "name": "interestRatePerSecond";
+                        "type": {
+                            "option": "u128";
+                        };
+                    },
                     {
                         "name": "emergencyModeThreshold";
                         "type": {
@@ -3076,26 +3082,6 @@ 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/updateVaultType.d.ts

@@ -6,6 +6,7 @@ export interface VaultTypeConfig {
     maxDebtExtended?: BN;
     minDebtPerVault?: BN;
     loanInitFee?: BN;
+    interestRatePerSecond?: BN;
     emergencyModeThreshold?: BN;
     oracleChainlink?: PublicKey;
     oraclePyth?: PublicKey;

package/declarations/state/VaultAccount.d.ts

@@ -11,7 +11,8 @@ 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

@@ -2801,6 +2801,12 @@ exports.IDL = {
                             "option": "u64"
                         }
                     },
+                    {
+                        "name": "interestRatePerSecond",
+                        "type": {
+                            "option": "u128"
+                        }
+                    },
                     {
                         "name": "emergencyModeThreshold",
                         "type": {
@@ -3079,26 +3085,6 @@ 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/updateVaultType.js

@@ -26,20 +26,21 @@ function updateVaultType(program, provider, payer, vaultTypeAccount, oracleInfoA
 }
 exports.updateVaultType = updateVaultType;
 function updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, oracleInfoAccount, vaultTypeConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     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,
+            interestRatePerSecond: (_d = vaultTypeConfig.interestRatePerSecond) !== null && _d !== void 0 ? _d : null,
+            emergencyModeThreshold: (_e = vaultTypeConfig.emergencyModeThreshold) !== null && _e !== void 0 ? _e : null,
+            oracleChainlink: (_f = vaultTypeConfig.oracleChainlink) !== null && _f !== void 0 ? _f : null,
+            oraclePyth: (_g = vaultTypeConfig.oraclePyth) !== null && _g !== void 0 ? _g : null,
+            oracleSwitchboard: (_h = vaultTypeConfig.oracleSwitchboard) !== null && _h !== void 0 ? _h : null,
+            deprecated: (_j = vaultTypeConfig.deprecated) !== null && _j !== void 0 ? _j : null,
+            priorityPyth: (_k = vaultTypeConfig.priorityPyth) !== null && _k !== void 0 ? _k : null,
+            priorityChainlink: (_l = vaultTypeConfig.priorityChainlink) !== null && _l !== void 0 ? _l : null,
+            prioritySwitchboard: (_m = vaultTypeConfig.prioritySwitchboard) !== null && _m !== void 0 ? _m : null,
         };
         return yield program.methods
             .updateVaultType(config)

package/lib/state/VaultAccount.js

@@ -163,9 +163,7 @@ 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.20",
+  "version": "0.2.21",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/idl/vault.ts

@@ -2798,6 +2798,12 @@ export type Vault = {
               "option": "u64"
             }
           },
+          {
+            "name": "interestRatePerSecond",
+            "type": {
+              "option": "u128"
+            }
+          },
           {
             "name": "emergencyModeThreshold",
             "type": {
@@ -3076,26 +3082,6 @@ 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": [
@@ -6077,6 +6063,12 @@ export const IDL: Vault = {
               "option": "u64"
             }
           },
+          {
+            "name": "interestRatePerSecond",
+            "type": {
+              "option": "u128"
+            }
+          },
           {
             "name": "emergencyModeThreshold",
             "type": {
@@ -6355,26 +6347,6 @@ 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/updateVaultType.ts

@@ -28,6 +28,8 @@ export interface VaultTypeConfig {
   maxDebtExtended?: BN
   minDebtPerVault?: BN
   loanInitFee?: BN
+  interestRatePerSecond?: BN
+  
   emergencyModeThreshold?: BN
 
   oracleChainlink?: PublicKey
@@ -77,6 +79,7 @@ export async function updateVaultTypeStatusInstruction(
     maxDebtExtended: vaultTypeConfig.maxDebtExtended ?? null,
     minDebtPerVault: vaultTypeConfig.minDebtPerVault ?? null,
     loanInitFee: vaultTypeConfig.loanInitFee ?? null,
+    interestRatePerSecond: vaultTypeConfig.interestRatePerSecond ?? null,
     emergencyModeThreshold: vaultTypeConfig.emergencyModeThreshold ?? null,
     oracleChainlink: vaultTypeConfig.oracleChainlink ?? null,
     oraclePyth: vaultTypeConfig.oraclePyth ?? null,

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. */ // dont think this is correct? thoughts?
+  /** The public key of the vault owner. */
   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,15 +177,16 @@ 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

package/src/instructions/transferVault.ts

@@ -1,99 +0,0 @@
-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()
-}