hedge-web3 0.1.38 → 0.1.39

package/declarations/state/VaultAccount.d.ts

@@ -21,6 +21,8 @@ export declare class VaultAccount {
     collateralType: string;
     /** Current State of the vautl ("Open", "Closed", "Liquidated") */
     vaultStatus: string;
+    /** The public key of the next vault to redeem. */
+    nextVaultToRedeem: PublicKey;
     constructor(vault: any, publicKey: PublicKey);
     /**
      * Check if some `PublicKey` is the owner

package/lib/state/VaultAccount.js

@@ -21,6 +21,7 @@ class VaultAccount {
         this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
         this.collateralAccumulatorSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.collateralAccumulatorSnapshotBytes.toString());
         this.collateralType = vault.collateralType;
+        this.nextVaultToRedeem = vault.nextVaultToRedeem;
         this.vaultStatus = Object.keys(vault.vaultStatus)[0];
     }
     /**
@@ -60,7 +61,8 @@ class VaultAccount {
     }
     addDebt(newNormalizedDebt, vaultTypeCompoundedInterest) {
         const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest);
-        this.denormalizedDebt += denormalizedNewDebt.toNumber();
+        this.denormalizedDebt = denormalizedNewDebt.add(new decimal_js_1.default(this.denormalizedDebt)).floor().toNumber();
+        // this.denormalizedDebt = parseFloat(this.denormalizedDebt.toFixed(0))
     }
     addDeposit(depositAmount) {
         this.deposited += depositAmount;
@@ -81,7 +83,6 @@ class VaultAccount {
         this.denormalizedDebt = debtProductCurrent
             .div(this.debtProductSnapshotBytes)
             .mul(new decimal_js_1.default(this.denormalizedDebt))
-            // .add(new Decimal(vaultTypeAccuntData.debtRedistributionError))
             .toNumber();
         const extraCollateralDeposited = this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber();
         this.deposited += extraCollateralDeposited;
@@ -91,15 +92,19 @@ class VaultAccount {
     toString(highlight) {
         let arrow = '';
         if (this.publicKey.toString() === highlight.toString()) {
-            arrow = ' <----';
+            arrow = ' <----!!';
         }
         let collateralRatio = 'Infinite';
         if (this.denormalizedDebt > 0) {
-            collateralRatio = (this.deposited / this.denormalizedDebt).toFixed(8);
+            collateralRatio = new decimal_js_1.default(this.deposited).div(new decimal_js_1.default(this.denormalizedDebt)).toString();
+        }
+        let nextVault = 'None';
+        if (this.nextVaultToRedeem) {
+            nextVault = this.nextVaultToRedeem.toString().substring(0, 6);
         }
         return `Vault(${this.vaultNumber}): ${this.publicKey
             .toString()
-            .substring(0, 6)}. Debt: ${this.inUsd()} Collat: ${collateralRatio} ${arrow}`;
+            .substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `;
     }
 }
 exports.VaultAccount = VaultAccount;

package/lib/utils/getLinkedListAccounts.js

@@ -70,12 +70,26 @@ 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 at index:', indexBefore);
+        let correctOrderBefore = true;
+        for (let i = 0; i < vaults.length; i++) {
+            if (i < vaults.length - 1) {
+                // Verify i points to i+1
+                if (vaults[i].nextVaultToRedeem.toString() !== vaults[i + 1].publicKey.toString()) {
+                    correctOrderBefore = false;
+                    console.log("A vault was found OUT OF ORDER!!", vaults[i]);
+                }
+            }
+        }
+        if (correctOrderBefore) {
+            console.log(`Verfied the on-chain order of `, correctOrderBefore);
+        }
+        else {
+            throw new Error("On-Chian vaults not in order!");
+        }
         // If it wasn't in the list, add it now
         if (indexBefore < 0) {
+            // console.log('Was not in the list before. Adding now.')
             vaults.push(thisVault);
             indexBefore = vaults.length - 1;
         }
@@ -98,10 +112,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 at index: ', indexAfter)
+        // console.log(vaults.map((vault) => {
+        //   return vault.toString(vaultPublicKey)
+        // }))
         // Search for the vaults new position
         let indexAfter = -1;
         vaults.forEach((vault, index) => {
@@ -109,9 +123,16 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
                 indexAfter = index;
             }
         });
+        // New list with vault
+        // console.log('New list with vault now at index:', indexAfter)
+        // console.log(
+        //   vaults.map((vault) => {
+        //     return vault.toString(vaultPublicKey)
+        //   })
+        // )
         // 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 +141,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.38",
+  "version": "0.1.39",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",

package/src/state/VaultAccount.ts

@@ -33,6 +33,9 @@ export class VaultAccount {
   /** Current State of the vautl ("Open", "Closed", "Liquidated") */
   vaultStatus: string
 
+  /** The public key of the next vault to redeem. */
+  nextVaultToRedeem: PublicKey
+
   constructor(vault: any, publicKey: PublicKey) {
     this.publicKey = publicKey
     this.vaultOwner = vault.vaultOwner
@@ -43,6 +46,7 @@ export class VaultAccount {
     this.debtProductSnapshotBytes = DecimalFromU128(vault.debtProductSnapshotBytes.toString())
     this.collateralAccumulatorSnapshotBytes = DecimalFromU128(vault.collateralAccumulatorSnapshotBytes.toString())
     this.collateralType = vault.collateralType
+    this.nextVaultToRedeem = vault.nextVaultToRedeem
 
     this.vaultStatus = Object.keys(vault.vaultStatus)[0]
   }
@@ -88,7 +92,8 @@ export class VaultAccount {
 
   public addDebt(newNormalizedDebt: Decimal, vaultTypeCompoundedInterest: Decimal) {
     const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest)
-    this.denormalizedDebt += denormalizedNewDebt.toNumber()
+    this.denormalizedDebt = denormalizedNewDebt.add(new Decimal(this.denormalizedDebt)).floor().toNumber()
+    // this.denormalizedDebt = parseFloat(this.denormalizedDebt.toFixed(0))
   }
   public addDeposit(depositAmount: number) {
     this.deposited += depositAmount
@@ -113,9 +118,8 @@ export class VaultAccount {
     this.denormalizedDebt = debtProductCurrent
       .div(this.debtProductSnapshotBytes)
       .mul(new Decimal(this.denormalizedDebt))
-      // .add(new Decimal(vaultTypeAccuntData.debtRedistributionError))
       .toNumber()
-
+    
     const extraCollateralDeposited =
       this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber()
     this.deposited += extraCollateralDeposited
@@ -127,14 +131,20 @@ export class VaultAccount {
   public toString(highlight: PublicKey): string {
     let arrow = ''
     if (this.publicKey.toString() === highlight.toString()) {
-      arrow = ' <----'
+      arrow = ' <----!!'
     }
     let collateralRatio = 'Infinite'
     if (this.denormalizedDebt > 0) {
-      collateralRatio = (this.deposited / this.denormalizedDebt).toFixed(8)
+      collateralRatio = new Decimal(this.deposited).div(new Decimal(this.denormalizedDebt)).toString()
     }
+
+    let nextVault = 'None'
+    if (this.nextVaultToRedeem) {
+      nextVault = this.nextVaultToRedeem.toString().substring(0, 6)
+    }
+
     return `Vault(${this.vaultNumber}): ${this.publicKey
       .toString()
-      .substring(0, 6)}. Debt: ${this.inUsd()} Collat: ${collateralRatio} ${arrow}`
+      .substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} NextVault: ${nextVault} ${arrow} `
   }
 }

package/src/utils/getLinkedListAccounts.ts

@@ -78,13 +78,26 @@ 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 at index:', indexBefore)
+  let correctOrderBefore = true
+  for (let i = 0; i < vaults.length; i++) {
+    if (i < vaults.length - 1) {
+      // Verify i points to i+1
+      if (vaults[i].nextVaultToRedeem.toString() !== vaults[i+1].publicKey.toString()){
+        correctOrderBefore = false
+        console.log("A vault was found OUT OF ORDER!!", vaults[i])
+      }
+    }
+  }
+  if (correctOrderBefore){
+    console.log(`Verfied the on-chain order of `, correctOrderBefore)
+  } else {
+    throw new Error("On-Chian vaults not in order!");
+  }
 
   // If it wasn't in the list, add it now
   if (indexBefore < 0) {
+    // console.log('Was not in the list before. Adding now.')
     vaults.push(thisVault)
     indexBefore = vaults.length - 1
   }
@@ -112,10 +125,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 at index: ', indexAfter)
+  // console.log(vaults.map((vault) => {
+  //   return vault.toString(vaultPublicKey)
+  // }))
 
   // Search for the vaults new position
   let indexAfter = -1
@@ -125,9 +138,17 @@ export async function getLinkedListAccounts(
     }
   })
 
+  // New list with vault
+  // console.log('New list with vault now at index:', indexAfter)
+  // console.log(
+  //   vaults.map((vault) => {
+  //     return vault.toString(vaultPublicKey)
+  //   })
+  // )
+
   // 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 +159,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]
 }