hedge-web3 0.1.46 → 0.2.0

package/lib/instructions/repayVault.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repayVaultInstruction = exports.repayVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
@@ -15,6 +18,7 @@ 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 sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -27,7 +31,7 @@ function repayVault(program, provider, payer, vaultPublicKey, repayAmount, overr
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, 0, repayAmount * -1, false, false);
         const history = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield repayVaultInstruction(program, payer.publicKey, payerUshAccount.address, vaultPublicKey, vaultAssociatedTokenAccount, history.publicKey, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, repayAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }

package/lib/instructions/setHalted.js

@@ -8,16 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setHaltedInstruction = exports.setHalted = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
 const Errors_1 = require("../utils/Errors");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function setHalted(program, provider, payer, halted) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const transaction = new web3_js_1.Transaction().add(yield setHaltedInstruction(program, vaultSystemStatePublicKey, payer.publicKey, halted));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return vaultSystemStatePublicKey;
     });
 }

package/lib/instructions/updateVaultType.js

@@ -8,21 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateVaultTypeStatusInstruction = exports.updateVaultType = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function updateVaultType(program, provider, payer, vaultTypeAccount, oracleInfoAccount, config) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultSystemStatePublicKey = yield (0, Constants_1.getVaultSystemStatePublicKey)();
         const transaction = new web3_js_1.Transaction().add(yield updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payer.publicKey, vaultTypeAccount, oracleInfoAccount, config));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]);
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]);
         return vaultSystemStatePublicKey;
     });
 }
 exports.updateVaultType = updateVaultType;
 function updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, payerPublicKey, vaultTypeAccount, oracleInfoAccount, vaultTypeConfig) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __awaiter(this, void 0, void 0, function* () {
         const config = {
             maxDebtExtended: (_a = vaultTypeConfig.maxDebtExtended) !== null && _a !== void 0 ? _a : null,
@@ -32,6 +36,9 @@ function updateVaultTypeStatusInstruction(program, vaultSystemStatePublicKey, pa
             oraclePyth: (_e = vaultTypeConfig.oraclePyth) !== null && _e !== void 0 ? _e : null,
             oracleSwitchboard: (_f = vaultTypeConfig.oracleSwitchboard) !== null && _f !== void 0 ? _f : null,
             deprecated: (_g = vaultTypeConfig.deprecated) !== null && _g !== void 0 ? _g : null,
+            priorityPyth: (_h = vaultTypeConfig.priorityPyth) !== null && _h !== void 0 ? _h : null,
+            priorityChainlink: (_j = vaultTypeConfig.priorityChainlink) !== null && _j !== void 0 ? _j : null,
+            prioritySwitchboard: (_k = vaultTypeConfig.prioritySwitchboard) !== null && _k !== void 0 ? _k : null,
         };
         return yield program.methods
             .updateVaultType(config)

package/lib/instructions/withdrawStakingPool.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawStakingPoolInstruction = exports.withdrawStakingPool = void 0;
 const anchor_1 = require("@project-serum/anchor");
@@ -15,11 +18,12 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const Errors_1 = require("../utils/Errors");
 const Constants_1 = require("../Constants");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function withdrawStakingPool(program, provider, payer, poolPositionPublicKey, stakedTokenMintPublicKey, overrideStartTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const poolPosition = web3_js_1.Keypair.generate();
         const transaction = new web3_js_1.Transaction().add(yield withdrawStakingPoolInstruction(program, payer.publicKey, poolPositionPublicKey, stakedTokenMintPublicKey, overrideStartTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }

package/lib/instructions/withdrawVault.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawVaultInstruction = exports.withdrawVault = void 0;
 const anchor_1 = require("@project-serum/anchor");
@@ -16,6 +19,7 @@ const serum_1 = require("@project-serum/serum");
 const web3_js_1 = require("@solana/web3.js");
 const Constants_1 = require("../Constants");
 const getLinkedListAccounts_1 = require("../utils/getLinkedListAccounts");
+const sendAndConfirmWithDebug_1 = __importDefault(require("../utils/sendAndConfirmWithDebug"));
 function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
         const ushMintPublickey = yield (0, Constants_1.getUshMintPublicKey)();
@@ -32,7 +36,7 @@ function withdrawVault(program, provider, payer, vaultPublicKey, withdrawAmount,
         const hedgeStakingPoolAssociatedUshTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(hedgeStakingPoolPublicKey, ushMintPublickey);
         const [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey] = yield (0, getLinkedListAccounts_1.getLinkedListAccounts)(program, provider, vaultAccount.vaultType, vaultPublicKey, withdrawAmount * -1, 0, false, false);
         const transaction = new web3_js_1.Transaction().add(yield withdrawVaultInstruction(program, vaultSystemStatePublicKey, payer.publicKey, destinationTokenAccount.address, vaultPublicKey, vaultAssociatedCollateralAccount.address, vaultAccount.vaultType, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
+        yield (0, sendAndConfirmWithDebug_1.default)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }

package/lib/state/VaultAccount.js

@@ -93,10 +93,14 @@ class VaultAccount {
             .toString()
             .substring(this.publicKey.toString().length - 6)}`;
     }
-    addDebt(newNormalizedDebt, vaultTypeCompoundedInterest) {
-        const denormalizedNewDebt = newNormalizedDebt.div(vaultTypeCompoundedInterest);
+    addDebt(additionalDebt, vaultTypeAccount) {
+        let loanFee = new decimal_js_1.default(0);
+        if (additionalDebt.isPositive()) {
+            loanFee = vaultTypeAccount.loanInitFee.mul(additionalDebt);
+        }
+        const totalNormalizedLoan = additionalDebt.add(loanFee);
+        const denormalizedNewDebt = totalNormalizedLoan.div(new decimal_js_1.default(vaultTypeAccount.cumulativeRate.toString()));
         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;
@@ -112,16 +116,14 @@ class VaultAccount {
         this.vaultStatus = 'liquidated';
     }
     updateDebtAndCollateral(vaultTypeAccountData) {
-        const debtProductCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccountData.debtRedistributionProduct);
-        const collateralAccumulatorCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccountData.collateralRedistributionAccumulator);
-        this.denormalizedDebt = debtProductCurrent
+        this.denormalizedDebt = vaultTypeAccountData.debtRedistributionProduct
             .div(this.debtProductSnapshotBytes)
             .mul(new decimal_js_1.default(this.denormalizedDebt))
             .toNumber();
-        const extraCollateralDeposited = this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber();
+        const extraCollateralDeposited = this.denormalizedDebt * vaultTypeAccountData.collateralRedistributionAccumulator.sub(this.collateralAccumulatorSnapshotBytes).toNumber();
         this.deposited += extraCollateralDeposited;
-        this.collateralAccumulatorSnapshotBytes = collateralAccumulatorCurrent;
-        this.debtProductSnapshotBytes = debtProductCurrent;
+        this.collateralAccumulatorSnapshotBytes = vaultTypeAccountData.collateralRedistributionAccumulator;
+        this.debtProductSnapshotBytes = vaultTypeAccountData.debtRedistributionProduct;
     }
     toString(highlight) {
         let arrow = '';

package/lib/utils/getLinkedListAccounts.js

@@ -15,20 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedListAccounts = void 0;
 const underscore_1 = __importDefault(require("underscore"));
 const Constants_1 = require("../Constants");
-const HedgeDecimal_1 = require("../HedgeDecimal");
 const VaultAccount_1 = require("../state/VaultAccount");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const bs58_1 = __importDefault(require("bs58"));
+const VaultType_1 = __importDefault(require("../state/VaultType"));
 function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, loanAmount, redeem, liquidate, cachedVaults) {
     return __awaiter(this, void 0, void 0, function* () {
-        // console.log('Getting getLinkedListAccounts')
-        const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultTypeRaw = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
+        const vaultType = new VaultType_1.default(vaultTypeRaw, vaultTypeAccountPublicKey);
+        const DEBUG = false;
         // Default for null is the vault itself, so set them all to this vault
         let oldSmallerPublicKey = vaultPublicKey;
         let newSmallerPublicKey = vaultPublicKey;
         let newLargerPublicKey = vaultPublicKey;
         const thisVaultData = yield program.account.vault.fetch(vaultPublicKey);
-        const accountInfo = yield program.provider.connection.getAccountInfo(vaultPublicKey);
+        // const accountInfo =  await program.provider.connection.getAccountInfo(vaultPublicKey)
         const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
         // Load all the vaults
         let vaults;
@@ -36,27 +37,14 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
             vaults = cachedVaults;
         }
         else {
-            // let allVaults = cachedVaults
-            //   ? cachedVaults
-            //   : (await program.account.vault
-            //       .all([
-            //         {
-            //           memcmp: { bytes: vaultTypeAccount.collateralType, offset: 8 + 32 + 8 },
-            //         },
-            //       ])
-            //       .catch((error) => {
-            //         console.log('error', error)
-            //       })) || []
-            // // Load them into our account objects
-            // vaults = allVaults.map((vault) => {
-            //   return new VaultAccount(vault.account, vault.publicKey)
-            // })
-            vaults = yield getMiniVaults(program, vaultTypeAccount.vaultTypeName);
+            vaults = yield getMiniVaults(program, vaultTypeAccountPublicKey);
+        }
+        if (DEBUG) {
+            console.log('Vault count found:', vaults.length);
+            console.log('First Vault', vaults[0]);
         }
-        // console.log('Vault count found:', vaults.length)
-        // console.log('First Vault', vaults[0])
         // Filter out the accounts that are not open
-        // TODO filter on vault status. Or we enable people to "close out" empty vaults 
+        // TODO filter on vault status. Or we enable people to "close out" empty vaults
         // vaults = _.filter(vaults, (vault) => {
         //   return vault.vaultStatus === 'open'
         // })
@@ -77,11 +65,13 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (indexBefore > 0) {
             oldSmallerPublicKey = vaults[indexBefore - 1].publicKey;
         }
-        // Pretty print the list again
-        // console.log('Sorted open vaults. Index Before: ', indexBefore)
-        // console.log(vaults.map((vault) => {
-        //   return vault.toString(vaultPublicKey)
-        // }))
+        if (DEBUG) {
+            // Pretty print the list again
+            console.log('Sorted open vaults. Index Before: ', indexBefore);
+            console.log(vaults.map((vault) => {
+                return vault.toString(vaultPublicKey);
+            }));
+        }
         // Pretty print all the vaults before the operation
         // console.log('Sorted open vaults BEFORE at index:', indexBefore)
         // let correctOrderBefore = true
@@ -112,9 +102,8 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         // Now that we know it's def in the list, iterate the list and update
         // this vault with the operation we're going to apply
         const newNormalizedDebt = new decimal_js_1.default(loanAmount);
-        const vaultTypeCompoundedInterest = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccount.cumulativeRate.toString());
-        vaults[indexBefore].updateDebtAndCollateral(vaultTypeAccount);
-        vaults[indexBefore].addDebt(newNormalizedDebt, vaultTypeCompoundedInterest);
+        vaults[indexBefore].updateDebtAndCollateral(vaultType);
+        vaults[indexBefore].addDebt(newNormalizedDebt, vaultType);
         vaults[indexBefore].addDeposit(depositAmount);
         if (liquidate) {
             vaults[indexBefore].liquidate();
@@ -134,15 +123,17 @@ 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 After', indexAfter)
+        if (DEBUG) {
+            // New list with vault
+            console.log('New list with vault now at index:', indexAfter);
+            console.log(vaults.map((vault) => {
+                return vault.toString(vaultPublicKey);
+            }));
+        }
+        if (DEBUG) {
+            // Print where it moved from / to
+            console.log('Index After', indexAfter);
+        }
         // Save references to the new left and right
         if (indexAfter > 0) {
             newSmallerPublicKey = vaults[indexAfter - 1].publicKey;
@@ -150,10 +141,12 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (indexAfter < vaults.length - 1 && indexAfter >= 0) {
             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())
+        if (DEBUG) {
+            // Print out the new left/right
+            console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString());
+            console.log('newSmallerPublicKey', newSmallerPublicKey.toString());
+            console.log('newLargerPublicKey', newLargerPublicKey.toString());
+        }
         return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults];
     });
 }
@@ -168,7 +161,7 @@ function sortVaults(a, b) {
     }
     return aRatio - bRatio;
 }
-function getMiniVaults(program, vaultTypeName) {
+function getMiniVaults(program, vaultTypePublicKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const filters = [
             // Filter for Vault Accounts
@@ -176,13 +169,20 @@ function getMiniVaults(program, vaultTypeName) {
                 // @ts-ignore
                 memcmp: program.account.vault.coder.accounts.memcmp(program.account.vault._idlAccount.name),
             },
-            // Filter for Vaults with this collateral type
+            // Filter for Vaults that are open
             {
                 memcmp: {
-                    bytes: bs58_1.default.encode(VaultAccount_1.VaultAccount.getBufferForString(vaultTypeName)),
+                    bytes: bs58_1.default.encode(Buffer.from([1])),
                     offset: 8 + 32 + 24,
                 },
             },
+            // Filter for Vaults with this collateral type
+            {
+                memcmp: {
+                    bytes: vaultTypePublicKey.toString(),
+                    offset: 8 + 32 + 24 + 1,
+                },
+            },
         ];
         const allAccounts = yield program.provider.connection.getProgramAccounts(Constants_1.HEDGE_PROGRAM_PUBLICKEY, {
             filters: filters,
@@ -193,7 +193,7 @@ function getMiniVaults(program, vaultTypeName) {
                 length: 24,
             },
         });
-        return allAccounts.map(vaultData => {
+        return allAccounts.map((vaultData) => {
             return VaultAccount_1.VaultAccount.FromMiniSlice(vaultData.account.data, vaultData.pubkey);
         });
     });

package/package.json

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

package/src/Constants.ts

@@ -4,12 +4,13 @@ import {
 } from '@solana/spl-token'
 import { PublicKey } from '@solana/web3.js'
 
-export const HEDGE_PROGRAM_ID = 'HDG4FDos8fyrB79qMCe98gaFjNEy5kpxGNjMc5V8M6TJ'
+export const HEDGE_PROGRAM_ID = 'HedgeiSAoDWrgfyJ9z8XVsxhcCY2D9aHq1o3kTEbG1C1'
 export const HEDGE_PROGRAM_PUBLICKEY = new PublicKey(HEDGE_PROGRAM_ID)
 
 export const CHAINLINK_SOL_USD_ID =
   'FmAmfoyPXiA8Vhhe6MZTr3U6rZfEZ1ctEHay1ysqCqcf'
 export const CHAINLINK_SOL_USD_PUBLICKEY = new PublicKey(CHAINLINK_SOL_USD_ID)
+export const CHAINLINK_PROGRAM_ID = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny";
 
 const enc = new TextEncoder()