hedge-web3 0.2.27 → 0.2.28

package/declarations/utils/getLinkedListAccounts.d.ts

@@ -16,5 +16,6 @@ import { VaultAccount } from '../state/VaultAccount';
  * @param {boolean} redeem - True if vault is going to be redeemed fully
  * @param {boolean} liquidate - True if vault is going to be liquidated fully
  * @param {VaultAccount[]} cachedVaults - Optional list of cached vaults. Saves a request to the on-chain data.
+ * @param {VaultAccount} preLoadedVault - Optional vault to use as target vault. Overrides the need to load the vault from on-chain data.
  */
-export declare function getLinkedListAccounts(program: Program<Vault>, vaultTypeAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, depositAmount: BN, withdrawAmount: BN, loanAmount: BN, repayAmount: BN, redeem: boolean, liquidate: boolean, cachedVaults?: VaultAccount[]): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]>;
+export declare function getLinkedListAccounts(program: Program<Vault>, vaultTypeAccountPublicKey: PublicKey, vaultPublicKey: PublicKey, depositAmount: BN, withdrawAmount: BN, loanAmount: BN, repayAmount: BN, redeem: boolean, liquidate: boolean, cachedVaults?: VaultAccount[], preLoadedVault?: VaultAccount): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]>;

package/lib/utils/getLinkedListAccounts.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const anchor_1 = require("@project-serum/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const underscore_1 = __importDefault(require("underscore"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const VaultAccount_1 = require("../state/VaultAccount");
@@ -33,8 +32,9 @@ const VaultType_1 = __importDefault(require("../state/VaultType"));
  * @param {boolean} redeem - True if vault is going to be redeemed fully
  * @param {boolean} liquidate - True if vault is going to be liquidated fully
  * @param {VaultAccount[]} cachedVaults - Optional list of cached vaults. Saves a request to the on-chain data.
+ * @param {VaultAccount} preLoadedVault - Optional vault to use as target vault. Overrides the need to load the vault from on-chain data.
  */
-function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, withdrawAmount, loanAmount, repayAmount, redeem, liquidate, cachedVaults) {
+function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, withdrawAmount, loanAmount, repayAmount, redeem, liquidate, cachedVaults, preLoadedVault) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultTypeRaw = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         const vaultType = new VaultType_1.default(vaultTypeRaw, vaultTypeAccountPublicKey);
@@ -43,25 +43,9 @@ function getLinkedListAccounts(program, vaultTypeAccountPublicKey, vaultPublicKe
         let oldSmallerPublicKey = vaultPublicKey;
         let newSmallerPublicKey = vaultPublicKey;
         let newLargerPublicKey = vaultPublicKey;
-        const thisVaultData = yield program.account.vault.fetch(vaultPublicKey)
-            .catch((e) => {
-            console.log('Error fetching vault account. Assuming it does not exist yet');
-            return {
-                vaultOwner: new web3_js_1.PublicKey('11111111111111111111111111111111'),
-                pdaSalt: 'foo',
-                deposited: new anchor_1.BN(0),
-                denormalizedDebt: new anchor_1.BN(0),
-                vaultNumber: new anchor_1.BN(0),
-                debtProductSnapshotBytes: new anchor_1.BN(1),
-                collateralAccumulatorSnapshotBytes: new anchor_1.BN(1),
-                vaultTypeName: vaultType.name,
-                nextVaultToRedeem: new web3_js_1.PublicKey('11111111111111111111111111111111'),
-                vaultStatus: { open: true },
-                vaultType: vaultTypeAccountPublicKey
-            };
-        });
-        // const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
-        const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
+        const thisVault = preLoadedVault
+            ? preLoadedVault
+            : new VaultAccount_1.VaultAccount(yield program.account.vault.fetch(vaultPublicKey), vaultPublicKey);
         // Load all the vaults
         let vaults;
         if (cachedVaults) {

package/package.json

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

package/src/utils/getLinkedListAccounts.ts

@@ -22,6 +22,7 @@ import VaultType from '../state/VaultType'
  * @param {boolean} redeem - True if vault is going to be redeemed fully
  * @param {boolean} liquidate - True if vault is going to be liquidated fully
  * @param {VaultAccount[]} cachedVaults - Optional list of cached vaults. Saves a request to the on-chain data.
+ * @param {VaultAccount} preLoadedVault - Optional vault to use as target vault. Overrides the need to load the vault from on-chain data.
  */
 export async function getLinkedListAccounts(
   program: Program<Vault>,
@@ -33,7 +34,8 @@ export async function getLinkedListAccounts(
   repayAmount: BN,
   redeem: boolean,
   liquidate: boolean,
-  cachedVaults?: VaultAccount[]
+  cachedVaults?: VaultAccount[],
+  preLoadedVault?: VaultAccount
 ): Promise<[PublicKey, PublicKey, PublicKey, VaultAccount[]]> {
   const vaultTypeRaw = await program.account.vaultType.fetch(vaultTypeAccountPublicKey)
   const vaultType = new VaultType(vaultTypeRaw, vaultTypeAccountPublicKey)
@@ -45,25 +47,9 @@ export async function getLinkedListAccounts(
   let newSmallerPublicKey = vaultPublicKey
   let newLargerPublicKey = vaultPublicKey
 
-  const thisVaultData = await program.account.vault.fetch(vaultPublicKey)
-  .catch((e) => {
-    console.log('Error fetching vault account. Assuming it does not exist yet')
-    return {
-      vaultOwner: new PublicKey('11111111111111111111111111111111'),
-      pdaSalt: 'foo',
-      deposited: new BN(0),
-      denormalizedDebt: new BN(0),
-      vaultNumber: new BN(0),
-      debtProductSnapshotBytes: new BN(1),
-      collateralAccumulatorSnapshotBytes: new BN(1),
-      vaultTypeName: vaultType.name,
-      nextVaultToRedeem: new PublicKey('11111111111111111111111111111111'),
-      vaultStatus: {open: true},
-      vaultType: vaultTypeAccountPublicKey
-    }
-  })
-  // const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
-  const thisVault = new VaultAccount(thisVaultData, vaultPublicKey)
+  const thisVault = preLoadedVault
+    ? preLoadedVault
+    : new VaultAccount(await program.account.vault.fetch(vaultPublicKey), vaultPublicKey)
 
   // Load all the vaults
   let vaults