hedge-web3 0.1.29 → 0.1.31

package/lib/instructions/withdrawStakingPool.js

@@ -19,7 +19,7 @@ function withdrawStakingPool(program, provider, payer, poolPositionPublicKey, st
     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], provider.opts).catch(Errors_1.parseAnchorErrors);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer]).catch(Errors_1.parseAnchorErrors);
         return poolPosition.publicKey;
     });
 }
@@ -36,29 +36,27 @@ function withdrawStakingPoolInstruction(program, payerPublicKey, poolPositionPub
         const payerAssociatedHedgeAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, hedgeMintPublickey);
         const payerAssociatedUshAccount = yield (0, Constants_1.findAssociatedTokenAddress)(payerPublicKey, ushMintPublickey);
         const communityHedgeTokenAccount = yield (0, Constants_1.findAssociatedTokenAddress)(vaultSystemStatePublicKey, hedgeMintPublickey);
-        return program.instruction.withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)), // override current time
-        {
-            accounts: {
-                payer: payerPublicKey,
-                vaultSystemState: vaultSystemStatePublicKey,
-                pool: poolPublickey,
-                poolPosition: poolPositionPublicKey,
-                poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
-                poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
-                payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
-                payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
-                payerAssociatedUshAccount: payerAssociatedUshAccount,
-                communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
-                hedgeMint: hedgeMintPublickey,
-                stakedTokenMint: stakedTokenMintPublicKey,
-                ushMint: ushMintPublickey,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId
-            },
-            signers: []
-        });
+        return yield program.methods
+            .withdrawStakingPool(new anchor_1.BN(overrideStartTime !== null && overrideStartTime !== void 0 ? overrideStartTime : Math.floor(Date.now() / 1000)) // override current time
+        )
+            .accounts({
+            payer: payerPublicKey,
+            vaultSystemState: vaultSystemStatePublicKey,
+            pool: poolPublickey,
+            poolPosition: poolPositionPublicKey,
+            poolAssociatedStakedTokenAccount: poolAssociatedStakedTokenAccount,
+            poolAssociatedUshTokenAccount: poolAssociatedUshTokenAccount,
+            payerAssociatedStakedTokenAccount: payerAssociatedStakedTokenAccount,
+            payerAssociatedHedgeAccount: payerAssociatedHedgeAccount,
+            payerAssociatedUshAccount: payerAssociatedUshAccount,
+            communityAssociatedHedgeTokenAccount: communityHedgeTokenAccount,
+            hedgeMint: hedgeMintPublickey,
+            stakedTokenMint: stakedTokenMintPublicKey,
+            ushMint: ushMintPublickey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.withdrawStakingPoolInstruction = withdrawStakingPoolInstruction;

package/lib/instructions/withdrawVault.js

@@ -33,35 +33,35 @@ 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, vaultTypeAccountPublicKey, 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, vaultTypeAccountPublicKey, vaultTypeAssociatedTokenAccount.address, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMintPublickey, history.publicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime));
-        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history], provider.opts);
+        yield (0, web3_js_1.sendAndConfirmTransaction)(provider.connection, transaction, [payer, history]);
         return vaultPublicKey;
     });
 }
 exports.withdrawVault = withdrawVault;
 function withdrawVaultInstruction(program, vaultSystemStatePublicKey, payerPublicKey, destinationTokenAccount, vaultPublickey, vaultAssociatedCollateralPublicKey, vaultTypeAccount, vaultTypeAssociatedTokenAccount, hedgeStakingPoolPublicKey, hedgeStakingPoolAssociatedUshTokenAccount, ushMint, historyPublicKey, oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, withdrawAmount, overrideTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        return program.instruction.withdrawVault(new anchor_1.BN(withdrawAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)), // override override time
-        {
-            accounts: {
-                vaultSystemState: vaultSystemStatePublicKey,
-                vaultTypeAccount: vaultTypeAccount,
-                vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
-                vault: vaultPublickey,
-                vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
-                feePool: hedgeStakingPoolPublicKey,
-                feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
-                ushMint: ushMint,
-                history: historyPublicKey,
-                vaultOwner: payerPublicKey,
-                destinationTokenAccount: destinationTokenAccount,
-                oldSmallerVaultInfo: oldSmallerPublicKey,
-                newSmallerVaultInfo: newSmallerPublicKey,
-                newLargerVaultInfo: newLargerPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                systemProgram: web3_js_1.SystemProgram.programId,
-            },
-            signers: [],
-        });
+        return yield program.methods
+            .withdrawVault(new anchor_1.BN(withdrawAmount), new anchor_1.BN(overrideTime !== null && overrideTime !== void 0 ? overrideTime : Math.floor(Date.now() / 1000)) // override override time
+        )
+            .accounts({
+            vaultSystemState: vaultSystemStatePublicKey,
+            vaultTypeAccount: vaultTypeAccount,
+            vaultTypeAssociatedTokenAccount: vaultTypeAssociatedTokenAccount,
+            vault: vaultPublickey,
+            vaultAssociatedTokenAccount: vaultAssociatedCollateralPublicKey,
+            feePool: hedgeStakingPoolPublicKey,
+            feePoolAssociatedUshTokenAccount: hedgeStakingPoolAssociatedUshTokenAccount,
+            ushMint: ushMint,
+            history: historyPublicKey,
+            vaultOwner: payerPublicKey,
+            destinationTokenAccount: destinationTokenAccount,
+            oldSmallerVaultInfo: oldSmallerPublicKey,
+            newSmallerVaultInfo: newSmallerPublicKey,
+            newLargerVaultInfo: newLargerPublicKey,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
     });
 }
 exports.withdrawVaultInstruction = withdrawVaultInstruction;

package/lib/state/LiquidationPoolEra.js

@@ -11,7 +11,9 @@ class LiquidationPoolEra {
         this.liquidyPoolEra = liquidyPoolEra;
         this.totalDeposits = liquidyPoolEra.totalDeposits.toNumber();
         this.product = (0, HedgeDecimal_1.DecimalFromU128)(liquidyPoolEra.productBytes);
-        this.sum = liquidyPoolEra.sumBytes.map((sumBytes) => { return (0, HedgeDecimal_1.DecimalFromU128)(sumBytes); });
+        this.sum = liquidyPoolEra.sumBytes.map((sumBytes) => {
+            return (0, HedgeDecimal_1.DecimalFromU128)(sumBytes);
+        });
         this.hedgeRewardsAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(liquidyPoolEra.hedgeRewardsAccumulatorBytes);
         this.hedgeRewardsTimestamp = liquidyPoolEra.hedgeRewardsTimestamp.toNumber();
     }

package/lib/state/LiquidationPosition.js

@@ -31,10 +31,3 @@ class LiquidationPosition {
     }
 }
 exports.LiquidationPosition = LiquidationPosition;
-// function hedgeRewardsDecay (supply: number, birthTime: number, timeIn: number, timeOut: number, halfLifeInDays: number): number {
-//   const timeInOffsetStart = timeIn - birthTime
-//   const timeOutOffsetStart = timeOut - birthTime
-//   const halfLife = -1 * Math.log(2) / (halfLifeInDays * 60 * 60 * 24)
-//   const awardedTokens = supply * (Math.pow(Math.E, halfLife * timeInOffsetStart) - Math.pow(Math.E, halfLife * timeOutOffsetStart))
-//   return awardedTokens
-// }

package/lib/state/StakingPool.js

@@ -7,16 +7,15 @@ class StakingPool {
         this.poolInfo = poolInfo;
         this.publicKey = publicKey;
         this.deposits = poolInfo.deposits.toNumber();
-        // this.totalFeesNow = poolInfo.totalFeesNow.toNumber()
-        // this.totalFeesPrevious = poolInfo.totalFeesPrevious.toNumber()
         this.lastTransactionTime = poolInfo.lastTransactionTime.toNumber();
         this.startTime = poolInfo.startTime.toNumber();
         this.halfLifeInDays = poolInfo.halfLifeInDays.toNumber();
         this.totalHedgeReward = poolInfo.totalHedgeReward.toNumber();
         this.hedgeRewardAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.hedgeRewardAccumulator);
         this.ushFeeAccumulator = (0, HedgeDecimal_1.DecimalFromU128)(poolInfo.ushFeeAccumulator);
-        this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum) => { return (0, HedgeDecimal_1.DecimalFromU128)(sum); });
-        // this.currentRewardsPerDay = DecimalFromU128(poolInfo.currentRewardsPerDay)
+        this.collateralFeeAccumulator = poolInfo.collateralFeeAccumulator.map((sum) => {
+            return (0, HedgeDecimal_1.DecimalFromU128)(sum);
+        });
     }
 }
 exports.StakingPool = StakingPool;

package/lib/state/VaultAccount.js

@@ -75,7 +75,7 @@ class VaultAccount {
         this.denormalizedDebt = 0;
         this.vaultStatus = 'liquidated';
     }
-    redistribution(vaultTypeAccuntData) {
+    updateDebtAndCollateral(vaultTypeAccuntData) {
         const debtProductCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccuntData.debtRedistributionProduct);
         const collateralAccumulatorCurrent = (0, HedgeDecimal_1.DecimalFromU128)(vaultTypeAccuntData.collateralRedistributionAccumulator);
         this.denormalizedDebt = debtProductCurrent
@@ -83,10 +83,7 @@ class VaultAccount {
             .mul(new decimal_js_1.default(this.denormalizedDebt))
             // .add(new Decimal(vaultTypeAccuntData.debtRedistributionError))
             .toNumber();
-        const extraCollateralDeposited = this.denormalizedDebt *
-            collateralAccumulatorCurrent
-                .sub(this.collateralAccumulatorSnapshotBytes)
-                .toNumber();
+        const extraCollateralDeposited = this.denormalizedDebt * collateralAccumulatorCurrent.sub(this.collateralAccumulatorSnapshotBytes).toNumber();
         this.deposited += extraCollateralDeposited;
         this.collateralAccumulatorSnapshotBytes = collateralAccumulatorCurrent;
         this.debtProductSnapshotBytes = debtProductCurrent;

package/lib/utils/getLinkedListAccounts.js

@@ -17,7 +17,7 @@ const underscore_1 = __importDefault(require("underscore"));
 const HedgeDecimal_1 = require("../HedgeDecimal");
 const VaultAccount_1 = require("../state/VaultAccount");
 const decimal_js_1 = __importDefault(require("decimal.js"));
-function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, loanAmount, redeem, liquidate) {
+function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vaultPublicKey, depositAmount, loanAmount, redeem, liquidate, cachedVaults) {
     return __awaiter(this, void 0, void 0, function* () {
         const vaultTypeAccount = yield program.account.vaultType.fetch(vaultTypeAccountPublicKey);
         // Default for null is the vault itself, so set them all to this vault
@@ -27,19 +27,27 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         const thisVaultData = yield program.account.vault.fetch(vaultPublicKey);
         const thisVault = new VaultAccount_1.VaultAccount(thisVaultData, vaultPublicKey);
         // Load all the vaults
-        let allVaults = (yield program.account.vault
-            .all([
-        // {
-        //   memcmp: { bytes: bs58.encode(inputCollateralType), offset: 8 + 32 + 8 },
-        // },
-        ])
-            .catch((error) => {
-            console.log('error', error);
-        })) || [];
-        // Load them into our account objects
-        let vaults = allVaults.map((vault) => {
-            return new VaultAccount_1.VaultAccount(vault.account, vault.publicKey);
-        });
+        let vaults;
+        if (cachedVaults) {
+            vaults = cachedVaults;
+        }
+        else {
+            let allVaults = cachedVaults
+                ? cachedVaults
+                : (yield program.account.vault
+                    .all([
+                // {
+                //   memcmp: { bytes: bs58.encode(inputCollateralType), offset: 8 + 32 + 8 },
+                // },
+                ])
+                    .catch((error) => {
+                    console.log('error', error);
+                })) || [];
+            // Load them into our account objects
+            vaults = allVaults.map((vault) => {
+                return new VaultAccount_1.VaultAccount(vault.account, vault.publicKey);
+            });
+        }
         // Filter out the account that are not the same vault type
         vaults = underscore_1.default.filter(vaults, (vault) => {
             return vault.collateralType === vaultTypeAccount.collateralType;
@@ -75,6 +83,7 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         // this vault with the opeation 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].addDeposit(depositAmount);
         if (liquidate) {
@@ -83,7 +92,6 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         if (redeem) {
             vaults[indexBefore].redeem();
         }
-        vaults[indexBefore].redistribution(vaultTypeAccount);
         if (vaults[indexBefore].denormalizedDebt === 0) {
             vaults.splice(indexBefore, 1);
         }
@@ -115,7 +123,7 @@ function getLinkedListAccounts(program, provider, vaultTypeAccountPublicKey, vau
         // console.log('oldSmallerPublicKey', oldSmallerPublicKey.toString())
         // console.log('newSmallerPublicKey', newSmallerPublicKey.toString())
         // console.log('newLargerPublicKey', newLargerPublicKey.toString())
-        return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey];
+        return [oldSmallerPublicKey, newSmallerPublicKey, newLargerPublicKey, vaults];
     });
 }
 exports.getLinkedListAccounts = getLinkedListAccounts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedge-web3",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Hedge Javascript Web3 API",
   "main": "lib/index.js",
   "types": "declarations/index.d.ts",
@@ -14,7 +14,7 @@
   "author": "Chris Coudron <coudron@hedge.so>",
   "license": "ISC",
   "dependencies": {
-    "@project-serum/anchor": "^0.23.0",
+    "@project-serum/anchor": "^0.24.1",
     "@project-serum/serum": "^0.13.61",
     "@rollup/plugin-typescript": "^8.3.0",
     "@solana/buffer-layout": "^4.0.0",