From 17a59058536a471ef98da9a176814b4efa14766a Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Thu, 17 Oct 2024 14:23:07 +0200 Subject: [PATCH] test(bundler): make them all pass for once --- packages/blue-sdk/package.json | 2 +- packages/bundler-sdk-viem/test/helpers.ts | 25 ++----------------- .../test/populateBundle.test.ts | 15 ++++++----- packages/test-viem/package.json | 4 +-- packages/test-wagmi/package.json | 4 +-- pnpm-lock.yaml | 18 ++++++------- 6 files changed, 23 insertions(+), 45 deletions(-) diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index c90a9d7c..253acad7 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -24,7 +24,7 @@ "@types/node": "^22.1.0", "typescript": "^5.6.3", "viem": "^2.21.19", - "viem-deal": "^2.0.0", + "viem-deal": "^2.0.1", "vitest": "^2.1.3" }, "publishConfig": { diff --git a/packages/bundler-sdk-viem/test/helpers.ts b/packages/bundler-sdk-viem/test/helpers.ts index aad52fbc..dd87ebe4 100644 --- a/packages/bundler-sdk-viem/test/helpers.ts +++ b/packages/bundler-sdk-viem/test/helpers.ts @@ -6,7 +6,7 @@ import { getChainAddresses, getUnwrappedToken, } from "@morpho-org/blue-sdk"; -import { format, keys } from "@morpho-org/morpho-ts"; +import { format } from "@morpho-org/morpho-ts"; import { type BundlingOptions, @@ -141,28 +141,7 @@ export const setupBundle = async ( } }); - if (onBundleTx != null) { - const balancesBefore = await Promise.all( - [...tokens, ...keys(startData.tokens)].map(async (token) => ({ - token, - balance: await client.balanceOf({ - erc20: token, - owner: account.address, - }), - })), - ); - - await onBundleTx(startData); - - await Promise.all( - balancesBefore.map(({ token, balance }) => - client.deal({ - erc20: token, - amount: balance, - }), - ), - ); - } + await onBundleTx?.(startData); await Promise.all( bundle.requirements.signatures.map((requirement) => diff --git a/packages/bundler-sdk-viem/test/populateBundle.test.ts b/packages/bundler-sdk-viem/test/populateBundle.test.ts index aa26f3cc..2bbce424 100644 --- a/packages/bundler-sdk-viem/test/populateBundle.test.ts +++ b/packages/bundler-sdk-viem/test/populateBundle.test.ts @@ -1167,7 +1167,7 @@ describe("populateBundle", () => { async ({ client, config }) => { const { id } = usdc_wstEth; const collateralAssets = parseEther("100"); - const loanShares = parseUnits("5000", 12); + const loanShares = parseUnits("50000", 12); const loanAssets = (await fetchMarket(id, client)).toBorrowAssets( loanShares, ); @@ -2199,7 +2199,6 @@ describe("populateBundle", () => { const borrowAmount = parseEther("0.5"); await client.deal({ erc20: wstEth, amount: collateralAmount }); - await client.deal({ erc20: stEth, amount: 0n }); await client.approve({ address: wstEth, args: [morpho, maxUint256] }); await client.writeContract({ @@ -2418,7 +2417,7 @@ describe("populateBundle", () => { ).toBe(0n); expect(await client.balanceOf({ erc20: stEth })).toBe( - wstEthToken.toUnwrappedExactAmountIn(collateralAmount, 0n) - 2n, + wstEthToken.toUnwrappedExactAmountIn(collateralAmount, 0n) - 1n, ); expect(await client.balanceOf({ erc20: wstEth })).toBe(0n); expect(await client.balanceOf({ erc20: wNative })).toBe( @@ -3628,7 +3627,7 @@ describe("populateBundle", () => { async ({ client, config }) => { const { id } = usdc_wstEth; const collateralAssets = parseEther("100"); - const loanShares = parseUnits("5000", 12); + const loanShares = parseUnits("50000", 12); const loanAssets = (await fetchMarket(id, client)).toBorrowAssets( loanShares, ); @@ -3824,10 +3823,10 @@ describe("populateBundle", () => { test[ChainId.EthMainnet]( "should redeem all bbETH with slippage + wstETH leverage into bbETH deposit & unwrap remaining WETH", async ({ client, config }) => { - const id = eth_wstEth.id; + const id = eth_wstEth_2.id; const collateralAssets = parseEther("100"); - const loanAssets = parseEther("95"); + const loanAssets = parseEther("5"); await client.deal({ erc20: wstEth, amount: collateralAssets }); await client.deal({ erc20: wNative, amount: loanAssets }); @@ -3856,7 +3855,7 @@ describe("populateBundle", () => { eth_rEth.id, eth_sDai.id, eth_wbtc.id, - eth_wstEth_2.id, + eth_wstEth.id, ], users: [client.account.address, bundler, bbEth.address], tokens: [NATIVE_ADDRESS, wNative, stEth, wstEth, bbEth.address], @@ -4935,7 +4934,7 @@ describe("populateBundle", () => { ).toBe(0n); expect(await client.balanceOf({ erc20: stEth })).toBe( - wstEthToken.toUnwrappedExactAmountIn(collateralAmount, 0n) - 2n, + wstEthToken.toUnwrappedExactAmountIn(collateralAmount, 0n) - 1n, ); expect(await client.balanceOf({ erc20: wstEth })).toBe(0n); expect(await client.balanceOf({ erc20: wNative })).toBe( diff --git a/packages/test-viem/package.json b/packages/test-viem/package.json index 2285f4cb..ced42ca5 100644 --- a/packages/test-viem/package.json +++ b/packages/test-viem/package.json @@ -16,7 +16,7 @@ "peerDependencies": { "@morpho-org/test": "workspace:^", "viem": "^2.21.10", - "viem-deal": "^2.0.0", + "viem-deal": "^2.0.1", "vitest": "^2.1.0" }, "devDependencies": { @@ -24,7 +24,7 @@ "@types/node": "^22.7.4", "typescript": "^5.6.3", "viem": "^2.21.19", - "viem-deal": "^2.0.0", + "viem-deal": "^2.0.1", "vitest": "^2.1.3" }, "publishConfig": { diff --git a/packages/test-wagmi/package.json b/packages/test-wagmi/package.json index e9ca4140..27b1b772 100644 --- a/packages/test-wagmi/package.json +++ b/packages/test-wagmi/package.json @@ -14,7 +14,7 @@ "@morpho-org/test": "workspace:^", "@morpho-org/test-viem": "workspace:^", "viem": "^2.21.10", - "viem-deal": "^2.0.0", + "viem-deal": "^2.0.1", "vitest": "^2.1.0" }, "devDependencies": { @@ -31,7 +31,7 @@ "react-dom": "^18.3.1", "typescript": "^5.6.3", "viem": "^2.21.19", - "viem-deal": "^2.0.0", + "viem-deal": "^2.0.1", "vitest": "^2.1.3", "wagmi": "^2.12.17" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5d3ddd7..3e00079c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -94,8 +94,8 @@ importers: specifier: ^2.21.19 version: 2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10) viem-deal: - specifier: ^2.0.0 - version: 2.0.0(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)) + specifier: ^2.0.1 + version: 2.0.1(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)) vitest: specifier: ^2.1.3 version: 2.1.3(@types/node@22.7.5)(happy-dom@15.7.4)(terser@5.35.0) @@ -578,8 +578,8 @@ importers: specifier: ^2.21.19 version: 2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10) viem-deal: - specifier: ^2.0.0 - version: 2.0.0(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)) + specifier: ^2.0.1 + version: 2.0.1(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)) vitest: specifier: ^2.1.3 version: 2.1.3(@types/node@22.7.5)(happy-dom@15.7.4)(terser@5.35.0) @@ -626,8 +626,8 @@ importers: specifier: ^2.21.19 version: 2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10) viem-deal: - specifier: ^2.0.0 - version: 2.0.0(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)) + specifier: ^2.0.1 + version: 2.0.1(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)) vitest: specifier: ^2.1.3 version: 2.1.3(@types/node@22.7.5)(happy-dom@15.7.4)(terser@5.35.0) @@ -7074,8 +7074,8 @@ packages: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} - viem-deal@2.0.0: - resolution: {integrity: sha512-mLBXXBOBVGou2oL0p6qdT6ZPivGL6jB4DWmqFvByrqOqrNeg7IQln6lRnvyOik2x99IMbSnf8y8H12QyWlPgjg==} + viem-deal@2.0.1: + resolution: {integrity: sha512-oNiCD28q3PguviZuh1YLd/h+3mHuhK8l822d5uT0dBzHtF7odaKhotNd78pAogPG8QAOFdrMeualYpWqcSOxfw==} peerDependencies: viem: ^2.21.18 @@ -15215,7 +15215,7 @@ snapshots: vary@1.1.2: {} - viem-deal@2.0.0(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)): + viem-deal@2.0.1(viem@2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)): dependencies: viem: 2.21.27(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)