hedge-web3 0.1.35 → 0.1.38

package/declarations/idl/vault.d.ts

@@ -1802,18 +1802,6 @@ export declare type Vault = {
             "type": {
                 "kind": "struct";
                 "fields": [
-                    {
-                        "name": "owner";
-                        "type": "publicKey";
-                    },
-                    {
-                        "name": "pool";
-                        "type": "publicKey";
-                    },
-                    {
-                        "name": "deposited";
-                        "type": "u64";
-                    },
                     {
                         "name": "startHedgeRewardAccumulator";
                         "type": "u128";
@@ -1852,6 +1840,18 @@ export declare type Vault = {
                         "name": "closedRewardedTokens";
                         "type": "u64";
                     },
+                    {
+                        "name": "deposited";
+                        "type": "u64";
+                    },
+                    {
+                        "name": "owner";
+                        "type": "publicKey";
+                    },
+                    {
+                        "name": "pool";
+                        "type": "publicKey";
+                    },
                     {
                         "name": "state";
                         "type": {

package/lib/idl/vault.js

@@ -1805,18 +1805,6 @@ exports.IDL = {
             "type": {
                 "kind": "struct",
                 "fields": [
-                    {
-                        "name": "owner",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "pool",
-                        "type": "publicKey"
-                    },
-                    {
-                        "name": "deposited",
-                        "type": "u64"
-                    },
                     {
                         "name": "startHedgeRewardAccumulator",
                         "type": "u128"
@@ -1855,6 +1843,18 @@ exports.IDL = {
                         "name": "closedRewardedTokens",
                         "type": "u64"
                     },
+                    {
+                        "name": "deposited",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "owner",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "pool",
+                        "type": "publicKey"
+                    },
                     {
                         "name": "state",
                         "type": {

package/lib/instructions/claimLiquidationPoolPosition.js

@@ -28,7 +28,6 @@ function claimLiquidationPoolPosition(program, provider, poolPosition, payer, co
 exports.claimLiquidationPoolPosition = claimLiquidationPoolPosition;
 function claimLiquidationPoolPositionInstruction(program, vaultTypeAccount, collateralMint, poolPosition, payer, payerAssociatedTokenAccount, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log("inside function");
         const vaultSystemState = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const poolStatePublicKey = yield (0, Constants_1.getLiquidationPoolStatePublicKey)();
         const poolAssociatedTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(poolStatePublicKey, collateralMint);

package/lib/instructions/loanVault.js

@@ -15,7 +15,6 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
 const Constants_1 = require("../Constants");
-const Errors_1 = require("utils/Errors");
 function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -28,7 +27,7 @@ function loanVault(program, provider, payer, vaultPublicKey, loanAmount, overrid
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, 0, loanAmount, false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield loanVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount.address, history.publicKey, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, loanAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }

package/lib/utils/getLinkedListAccounts.js

@@ -70,10 +70,10 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             oldSmallerPublicKey = vaults[indexBefore - 1].publicKey;
         }
         // Pretty print all the vaults before the operation
-        // console.log('Sorted open vaults before')
-        // vaults.forEach((vault) => {
-        //   console.log(vault.toString(vaultPublicKey))
-        // })
+        console.log('Sorted open vaults before');
+        vaults.forEach((vault) => {
+            console.log(vault.toString(vaultPublicKey));
+        });
         // If it wasn't in the list, add it now
         if (indexBefore < 0) {
             vaults.push(thisVault);
@@ -98,10 +98,10 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         // Sort it again since we've changed one vault
         vaults = vaults.sort(sortVaults);
         // Pretty print the list again
-        // console.log('Sorted open vaults with new debt added')
-        // vaults.forEach((vault) => {
-        //   console.log(vault.toString(vaultPublicKey))
-        // })
+        console.log('Sorted open vaults with new debt added');
+        vaults.forEach((vault) => {
+            console.log(vault.toString(vaultPublicKey));
+        });
         // Search for the vaults new position
         let indexAfter = -1;
         vaults.forEach((vault, index) => {
@@ -110,8 +110,8 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             }
         });
         // Print where it moved from / to
-        // console.log('Index Before', indexBefore)
-        // console.log('Index After', indexAfter)
+        console.log('Index Before', indexBefore);
+        console.log('Index After', indexAfter);
         // Save references to the new left and right
         if (indexAfter > 0) {
             newSmallerPublicKey = vaults[indexAfter - 1].publicKey;
@@ -120,9 +120,9 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             newLargerPublicKey = vaults[indexAfter + 1].publicKey;
         }
         // Print out the new left/right
-        // console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
-        // console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
-        // console.log('newLargerPublicKey', newLargerPublicKey.toString())
+        console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString());
+        console.log('newSmallerPublicKey', newSmallerPublicKey.toString());
+        console.log('newLargerPublicKey', newLargerPublicKey.toString());
         return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults];
     });
 }

package/package.json

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

package/src/idl/vault.ts

@@ -1802,18 +1802,6 @@ export type Vault = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "owner",
-            "type": "publicKey"
-          },
-          {
-            "name": "pool",
-            "type": "publicKey"
-          },
-          {
-            "name": "deposited",
-            "type": "u64"
-          },
           {
             "name": "startHedgeRewardAccumulator",
             "type": "u128"
@@ -1852,6 +1840,18 @@ export type Vault = {
             "name": "closedRewardedTokens",
             "type": "u64"
           },
+          {
+            "name": "deposited",
+            "type": "u64"
+          },
+          {
+            "name": "owner",
+            "type": "publicKey"
+          },
+          {
+            "name": "pool",
+            "type": "publicKey"
+          },
           {
             "name": "state",
             "type": {
@@ -4373,18 +4373,6 @@ export const IDL: Vault = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "owner",
-            "type": "publicKey"
-          },
-          {
-            "name": "pool",
-            "type": "publicKey"
-          },
-          {
-            "name": "deposited",
-            "type": "u64"
-          },
           {
             "name": "startHedgeRewardAccumulator",
             "type": "u128"
@@ -4423,6 +4411,18 @@ export const IDL: Vault = {
             "name": "closedRewardedTokens",
             "type": "u64"
           },
+          {
+            "name": "deposited",
+            "type": "u64"
+          },
+          {
+            "name": "owner",
+            "type": "publicKey"
+          },
+          {
+            "name": "pool",
+            "type": "publicKey"
+          },
           {
             "name": "state",
             "type": {

package/src/instructions/claimLiquidationPoolPosition.ts

@@ -62,7 +62,6 @@ export async function claimLiquidationPoolPositionInstruction(
   overrideStartTime?: number
 ): Promise<TransactionInstruction> {
 
-  console.log("inside function")
   const vaultSystemState = await getVaultSystemStatePublicKey()
   const poolStatePublicKey = await getLiquidationPoolStatePublicKey()
   const poolAssociatedTokenAccount = await findAssociatedTokenAddress(poolStatePublicKey, collateralMint)

package/src/instructions/loanVault.ts

@@ -19,7 +19,6 @@ import {
   getVaultSystemStatePublicKey,
 } from '../Constants'
 import { Vault } from 'idl/vault'
-import { parseAnchorErrors } from 'utils/Errors'
 
 export async function loanVault(
   program: Program<Vault>,
@@ -85,7 +84,7 @@ export async function loanVault(
       overrideTime
     )
   )
-  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history]).catch(parseAnchorErrors)
+  await sendAndConfirmTransaction(provider.connection, transaction, [payer, history])
   return vaultPublicKey
 }
 

package/src/utils/getLinkedListAccounts.ts

@@ -78,10 +78,10 @@ export async function getLinkedListAccounts(
   }
 
   // Pretty print all the vaults before the operation
-  // console.log('Sorted open vaults before')
-  // vaults.forEach((vault) => {
-  //   console.log(vault.toString(vaultPublicKey))
-  // })
+  console.log('Sorted open vaults before')
+  vaults.forEach((vault) => {
+    console.log(vault.toString(vaultPublicKey))
+  })
 
   // If it wasn't in the list, add it now
   if (indexBefore < 0) {
@@ -112,10 +112,10 @@ export async function getLinkedListAccounts(
   vaults = vaults.sort(sortVaults)
 
   // Pretty print the list again
-  // console.log('Sorted open vaults with new debt added')
-  // vaults.forEach((vault) => {
-  //   console.log(vault.toString(vaultPublicKey))
-  // })
+  console.log('Sorted open vaults with new debt added')
+  vaults.forEach((vault) => {
+    console.log(vault.toString(vaultPublicKey))
+  })
 
   // Search for the vaults new position
   let indexAfter = -1
@@ -126,8 +126,8 @@ export async function getLinkedListAccounts(
   })
 
   // Print where it moved from / to
-  // console.log('Index Before', indexBefore)
-  // console.log('Index After', indexAfter)
+  console.log('Index Before', indexBefore)
+  console.log('Index After', indexAfter)
 
   // Save references to the new left and right
   if (indexAfter > 0) {
@@ -138,9 +138,9 @@ export async function getLinkedListAccounts(
   }
 
   // Print out the new left/right
-  // console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
-  // console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
-  // console.log('newLargerPublicKey', newLargerPublicKey.toString())
+  console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
+  console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
+  console.log('newLargerPublicKey', newLargerPublicKey.toString())
 
   return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults]
 }