Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/clear-mails-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@venusprotocol/evm": minor
---

refactor logic to simulate user operations
5 changes: 5 additions & 0 deletions .changeset/quiet-sites-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@venusprotocol/evm": minor
---

streamline how balance updates are shown on forms
9 changes: 6 additions & 3 deletions apps/evm/src/clients/api/queries/getSimulatedPool/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@ export const getSimulatedPool = async ({
isUserPrime = false,
userXvsStakedMantissa,
}: GetSimulatedPoolInput): Promise<GetSimulatedPoolOutput> => {
if (!pool || balanceMutations.length === 0) {
// Filter out 0 balance mutations
const filteredBalanceMutations = balanceMutations.filter(b => !b.amountTokens.isEqualTo(0));

if (!pool || filteredBalanceMutations.length === 0) {
return {
pool: undefined,
};
}

const { vaiMutations, assetMutations } = balanceMutations.reduce<{
const { vaiMutations, assetMutations } = filteredBalanceMutations.reduce<{
vaiMutations: VaiBalanceMutation[];
assetMutations: AssetBalanceMutation[];
}>(
Expand Down Expand Up @@ -93,7 +96,7 @@ export const getSimulatedPool = async ({
let userBorrowBalanceTokens = asset.userBorrowBalanceTokens;
let userBorrowBalanceCents = asset.userBorrowBalanceCents;

balanceMutations.forEach(({ action, amountTokens }) => {
filteredBalanceMutations.forEach(({ action, amountTokens }) => {
const amountCents = amountTokens.multipliedBy(asset.tokenPriceCents);

switch (action) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -222,8 +222,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -281,8 +281,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.6,
"userLiquidationThresholdPercentage": 66,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -367,8 +367,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -453,8 +453,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.81,
"userLiquidationThresholdPercentage": 89.10000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -672,8 +672,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -738,8 +738,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -819,8 +819,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -869,8 +869,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.45,
"userLiquidationThresholdPercentage": 49.50000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -935,8 +935,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.75,
"userLiquidationThresholdPercentage": 82.50000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -1029,8 +1029,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.65,
"userLiquidationThresholdPercentage": 71.5,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -1094,8 +1094,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down Expand Up @@ -1160,8 +1160,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
"userBorrowBalanceCents": "0",
"userBorrowBalanceTokens": "0",
"userBorrowLimitSharePercentage": 0,
"userCollateralFactor": 0.8,
"userLiquidationThresholdPercentage": 88.00000000000001,
"userCollateralFactor": 0,
"userLiquidationThresholdPercentage": 0,
"userSupplyBalanceCents": "0",
"userSupplyBalanceTokens": "0",
"userWalletBalanceCents": "0",
Expand Down
Loading