hedge-web3 0.2.3 → 0.2.7

package/declarations/instructions/setVaultTypeStatus.d.ts

@@ -1,5 +1,4 @@
 import { Program, Provider } from '@project-serum/anchor';
 import { PublicKey, Signer, TransactionInstruction } from '@solana/web3.js';
-import { Vault } from 'idl/vault';
-export declare function setVaultTypeStatus(program: Program<Vault>, provider: Provider, payer: Signer, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<PublicKey>;
-export declare function setVaultTypeStatusInstruction(program: Program<Vault>, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<TransactionInstruction>;
+export declare function setVaultTypeStatus(program: Program, provider: Provider, payer: Signer, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<PublicKey>;
+export declare function setVaultTypeStatusInstruction(program: Program, vaultSystemStatePublicKey: PublicKey, payerPublicKey: PublicKey, vaultTypeAccount: PublicKey, deprecated: boolean): Promise<TransactionInstruction>;

package/lib/instructions/setVaultTypeStatus.js

@@ -17,21 +17,22 @@ function setVaultTypeStatus(program, provider, payer, vaultTypeAccount, deprecat
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const transaction = new web3_js_1.Transaction().add(yield setVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, deprecated));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer], provider === null || provider === void 0 ? void 0 : provider.opts).catch(Errors_1.parseAnchorErrors);
         return vaultSystemStatePublicKey;
     });
 }
 exports.setVaultTypeStatus = setVaultTypeStatus;
 function setVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, deprecated) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield program.methods
-            .setVaultTypeStatus(deprecated)
-            .accounts({
-            payer: payerPublicKey,
-            vaultSystemState: vaultSystemStatePublicKey,
-            vaultType: vaultTypeAccount,
-        })
-            .instruction();
+        const ix = program.instruction.setVaultTypeStatus(deprecated, {
+            accounts: {
+                payer: payerPublicKey,
+                vaultSystemState: vaultSystemStatePublicKey,
+                vaultType: vaultTypeAccount,
+            },
+            signers: []
+        });
+        return ix;
     });
 }
 exports.setVaultTypeStatusInstruction = setVaultTypeStatusInstruction;

package/lib/state/VaultAccount.js

@@ -32,7 +32,9 @@ const borsh = __importStar(require("@project-serum/borsh"));
  */
 class VaultAccount {
     constructor(vault, publicKey) {
-        var _a, _b, _c;
+        var _a, _b;
+        /** The ordered number of when this vault was created. */
+        this.vaultNumber = 0;
         /** Debt redistribution snapshot */
         this.debtProductSnapshotBytes = new decimal_js_1.default(0);
         /** Collateral redistribution snapshot' */
@@ -41,10 +43,12 @@ class VaultAccount {
         this.vaultStatus = '';
         this.publicKey = publicKey;
         this.vaultOwner = vault.vaultOwner;
-        this.vaultNumber = (_a = vault.vaultNumber) === null || _a === void 0 ? void 0 : _a.toNumber();
         this.pdaSalt = vault.pdaSalt;
-        this.deposited = (_b = vault.deposited) === null || _b === void 0 ? void 0 : _b.toNumber();
-        this.denormalizedDebt = (_c = vault.denormalizedDebt) === null || _c === void 0 ? void 0 : _c.toNumber();
+        this.deposited = (_a = vault.deposited) === null || _a === void 0 ? void 0 : _a.toNumber();
+        this.denormalizedDebt = (_b = vault.denormalizedDebt) === null || _b === void 0 ? void 0 : _b.toNumber();
+        if (vault.vaultNumber) {
+            this.vaultNumber = vault.vaultNumber.toNumber();
+        }
         if (vault.debtProductSnapshotBytes) {
             this.debtProductSnapshotBytes = (0, HedgeDecimal_1.DecimalFromU128)(vault.debtProductSnapshotBytes.toString());
         }
@@ -138,7 +142,7 @@ class VaultAccount {
         if (this.nextVaultToRedeem) {
             nextVault = this.nextVaultToRedeem.toString().substring(0, 6);
         }
-        return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
+        return `${this.publicKey.toString().substring(0, 6)}. Debt: ${this.denormalizedDebt} Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `;
     }
     /**
      * Creates a VaultAccount from a slice of data
@@ -153,7 +157,7 @@ class VaultAccount {
      * @returns a new VaultAccount
      */
     static FromMiniSlice(data, pubkey) {
-        const props = [borsh.u64('vaultNumber'), borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
+        const props = [borsh.u64('deposited'), borsh.u64('denormalizedDebt')];
         const miniVaultLayout = borsh.struct(props, 'minVaultLayout');
         const decodedData = miniVaultLayout.decode(data);
         return new VaultAccount(decodedData, pubkey);

package/lib/utils/getLinkedListAccounts.js

@@ -157,7 +157,7 @@ function sortVaults(a, b) {
     const aRatio = a.deposited / a.denormalizedDebt;
     const bRatio = b.deposited / b.denormalizedDebt;
     if (aRatio === bRatio) {
-        return b.vaultNumber - a.vaultNumber;
+        return a.publicKey.toString() > b.publicKey.toString() ? 1 : -1;
     }
     return aRatio - bRatio;
 }
@@ -189,8 +189,8 @@ function getMiniVaults(program, vaultTypePublicKey) {
             // Slice the data only to grab the 3 u64's of size 8 bytes each
             dataSlice: {
                 // See programs/hedge-vault/src/account_data/vault.rs for struct layout
-                offset: 8 + 32,
-                length: 24,
+                offset: 8 + 32 + 8,
+                length: 16,
             },
         });
         return allAccounts.map((vaultData) => {

package/package.json

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

package/src/state/VaultAccount.ts

@@ -26,7 +26,7 @@ export class VaultAccount {
   denormalizedDebt: number
 
   /** The ordered number of when this vault was created. */
-  vaultNumber: number
+  vaultNumber = 0
 
   /** Debt redistribution snapshot */
   debtProductSnapshotBytes = new Decimal(0)
@@ -49,10 +49,12 @@ export class VaultAccount {
   constructor(vault: any, publicKey: PublicKey) {
     this.publicKey = publicKey
     this.vaultOwner = vault.vaultOwner
-    this.vaultNumber = vault.vaultNumber?.toNumber()
     this.pdaSalt = vault.pdaSalt
     this.deposited = vault.deposited?.toNumber()
     this.denormalizedDebt = vault.denormalizedDebt?.toNumber()
+    if (vault.vaultNumber) {
+      this.vaultNumber = vault.vaultNumber.toNumber()
+    }
     if (vault.debtProductSnapshotBytes) {
       this.debtProductSnapshotBytes = DecimalFromU128(vault.debtProductSnapshotBytes.toString())
     }
@@ -163,7 +165,7 @@ export class VaultAccount {
       nextVault = this.nextVaultToRedeem.toString().substring(0, 6)
     }
 
-    return `Vault(${this.vaultNumber}): ${this.publicKey.toString().substring(0, 6)}. Debt: ${
+    return `${this.publicKey.toString().substring(0, 6)}. Debt: ${
       this.denormalizedDebt
     } Collat: ${this.deposited} Ratio: ${collateralRatio} ${arrow} `
   }
@@ -180,7 +182,7 @@ export class VaultAccount {
    * @returns a new VaultAccount
    */
   static FromMiniSlice(data: Buffer, pubkey: PublicKey) {
-    const props = [borsh.u64('vaultNumber'), borsh.u64('deposited'), borsh.u64('denormalizedDebt')]
+    const props = [borsh.u64('deposited'), borsh.u64('denormalizedDebt')]
     const miniVaultLayout = borsh.struct(props, 'minVaultLayout')
     const decodedData: any = miniVaultLayout.decode(data)
 

package/src/utils/getLinkedListAccounts.ts

@@ -183,7 +183,7 @@ function sortVaults(a: VaultAccount, b: VaultAccount) {
   const aRatio = a.deposited / a.denormalizedDebt
   const bRatio = b.deposited / b.denormalizedDebt
   if (aRatio === bRatio) {
-    return b.vaultNumber - a.vaultNumber
+    return a.publicKey.toString() > b.publicKey.toString() ? 1 : -1
   }
   return aRatio - bRatio
 }
@@ -215,8 +215,8 @@ async function getMiniVaults(program: Program<Vault>, vaultTypePublicKey: Public
     // Slice the data only to grab the 3 u64's of size 8 bytes each
     dataSlice: {
       // See programs/hedge-vault/src/account_data/vault.rs for struct layout
-      offset: 8 + 32,
-      length: 24,
+      offset: 8 + 32 + 8,
+      length: 16,
     },
   })