diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_1.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_1.spec.ts new file mode 100644 index 0000000..14a5707 --- /dev/null +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_1.spec.ts @@ -0,0 +1,14 @@ +import { test } from '@playwright/test'; +import { morphoEthereumBorrowPools_1 } from 'utils/testData'; +import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; + +morphoEthereumBorrowPools_1.forEach((pool) => { + test.describe('Morpho Blue Borrow - Wallet connected', async () => { + await openNewPosition({ + network: 'ethereum', + protocol: 'morphoblue', + pool, + positionType: 'borrow', + }); + }); +}); diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_2.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_2.spec.ts new file mode 100644 index 0000000..fff093a --- /dev/null +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_2.spec.ts @@ -0,0 +1,14 @@ +import { test } from '@playwright/test'; +import { morphoEthereumBorrowPools_2 } from 'utils/testData'; +import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; + +morphoEthereumBorrowPools_2.forEach((pool) => { + test.describe('Morpho Blue Borrow - Wallet connected', async () => { + await openNewPosition({ + network: 'ethereum', + protocol: 'morphoblue', + pool, + positionType: 'borrow', + }); + }); +}); diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_3.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_3.spec.ts new file mode 100644 index 0000000..a975c55 --- /dev/null +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_3.spec.ts @@ -0,0 +1,14 @@ +import { test } from '@playwright/test'; +import { morphoEthereumBorrowPools_3 } from 'utils/testData'; +import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; + +morphoEthereumBorrowPools_3.forEach((pool) => { + test.describe('Morpho Blue Borrow - Wallet connected', async () => { + await openNewPosition({ + network: 'ethereum', + protocol: 'morphoblue', + pool, + positionType: 'borrow', + }); + }); +}); diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_4.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_4.spec.ts new file mode 100644 index 0000000..7fe86cd --- /dev/null +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow_4.spec.ts @@ -0,0 +1,14 @@ +import { test } from '@playwright/test'; +import { morphoEthereumBorrowPools_4 } from 'utils/testData'; +import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; + +morphoEthereumBorrowPools_4.forEach((pool) => { + test.describe('Morpho Blue Borrow - Wallet connected', async () => { + await openNewPosition({ + network: 'ethereum', + protocol: 'morphoblue', + pool, + positionType: 'borrow', + }); + }); +}); diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_1.spec.ts similarity index 74% rename from tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn.spec.ts rename to tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_1.spec.ts index 024ba16..33d5fb7 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_1.spec.ts @@ -1,8 +1,8 @@ import { test } from '@playwright/test'; -import { morphoEthereumEarnPools } from 'utils/testData'; +import { morphoEthereumEarnPools_1 } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoEthereumEarnPools.forEach((pool) => { +morphoEthereumEarnPools_1.forEach((pool) => { test.describe('Morpho Blue Multiply - Wallet connected', async () => { await openNewPosition({ network: 'ethereum', diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_4.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_2.spec.ts similarity index 56% rename from tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_4.spec.ts rename to tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_2.spec.ts index 4c63fbb..5fbfedb 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_4.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_2.spec.ts @@ -1,9 +1,9 @@ import { test } from '@playwright/test'; -import { morphoEthereumMultiplyPools_4 } from 'utils/testData'; +import { morphoEthereumEarnPools_2 } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoEthereumMultiplyPools_4.forEach((pool) => { - test.describe('Morpho Blue Multiply - Wallet connected', async () => { +morphoEthereumEarnPools_2.forEach((pool) => { + test.describe('Morpho Blue Earn - Wallet connected', async () => { await openNewPosition({ network: 'ethereum', protocol: 'morphoblue', diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_2.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_3.spec.ts similarity index 73% rename from tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_2.spec.ts rename to tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_3.spec.ts index 9498253..d0294d9 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_2.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_3.spec.ts @@ -1,8 +1,8 @@ import { test } from '@playwright/test'; -import { morphoEthereumMultiplyPools_2 } from 'utils/testData'; +import { morphoEthereumEarnPools_3 } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoEthereumMultiplyPools_2.forEach((pool) => { +morphoEthereumEarnPools_3.forEach((pool) => { test.describe('Morpho Blue Multiply - Wallet connected', async () => { await openNewPosition({ network: 'ethereum', diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_3.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_4.spec.ts similarity index 73% rename from tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_3.spec.ts rename to tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_4.spec.ts index 90103dd..83186ff 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_3.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoEarn_4.spec.ts @@ -1,8 +1,8 @@ import { test } from '@playwright/test'; -import { morphoEthereumMultiplyPools_3 } from 'utils/testData'; +import { morphoEthereumEarnPools_4 } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoEthereumMultiplyPools_3.forEach((pool) => { +morphoEthereumEarnPools_4.forEach((pool) => { test.describe('Morpho Blue Multiply - Wallet connected', async () => { await openNewPosition({ network: 'ethereum', diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_1.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_1.spec.ts index 3d96818..677bd4f 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_1.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoMultiply_1.spec.ts @@ -1,8 +1,8 @@ import { test } from '@playwright/test'; -import { morphoEthereumMultiplyPools_1 } from 'utils/testData'; +import { morphoEthereumMultiplyPools } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoEthereumMultiplyPools_1.forEach((pool) => { +morphoEthereumMultiplyPools.forEach((pool) => { test.describe('Morpho Blue Multiply - Wallet connected', async () => { await openNewPosition({ network: 'ethereum', diff --git a/utils/tenderly.ts b/utils/tenderly.ts index 8419614..827e1d7 100644 --- a/utils/tenderly.ts +++ b/utils/tenderly.ts @@ -70,6 +70,7 @@ export const tokenAddresses = { OSETH: '0xf1c9acdc66974dfb6decb12aa385b9cd01190e38', PYUSD: '0x6c3ea9036406852006290770BEdFcAbA0e23A0e8', RETH: '0xae78736cd615f374d3085123a210448e74fc6393', + RSETH: '0xa1290d69c65a6fe4df752f95823fae25cb99e5a7', SDAI: '0x83F20F44975D03b1b09e64809B757c47f942BEeA', // STETH: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', SUSDE: '0x9d39a5de30e57443bff2a8307a4256c8797a3497', @@ -130,6 +131,7 @@ export const tokenBalances = { OSETH: '1000', PYUSD: '200000', RETH: '1000', + RSETH: '1000', SDAI: '200000', STETH: '1000', SUSDE: '10000000', diff --git a/utils/testData.ts b/utils/testData.ts index 1bb95d9..0bbcfc3 100644 --- a/utils/testData.ts +++ b/utils/testData.ts @@ -19,15 +19,26 @@ export const sparkEthereumEarnPools = [ 'WEETH-ETH', ]; -export const morphoEthereumMultiplyPools_1 = [ +export const morphoEthereumMultiplyPools = [ 'WSTETH-USDC', 'WSTETH-USDT', - // 'WSTETH-USDA', - BUG 15978 - Pool should be removed for Multiply 'WBTC-USDC', 'WBTC-USDT', + 'MKR-USDC', + 'WSTETH-USDA', // - BUG 15978 - Pool should be removed for Multiply +]; + +export const morphoEthereumEarnPools_1 = [ + 'flagship-ETH', + 'flagship-USDC', + 'flagship-USDT', + 'steakhouse-ETH', + 'steakhouse-PYUSD', + 'steakhouse-USDC', + 'steakhouse-USDT', ]; -export const morphoEthereumMultiplyPools_2 = [ +export const morphoEthereumEarnPools_2 = [ 'USDE-DAI-1', 'USDE-DAI-2', 'USDE-DAI-3', @@ -35,7 +46,7 @@ export const morphoEthereumMultiplyPools_2 = [ 'OSETH-ETH', ]; -export const morphoEthereumMultiplyPools_3 = [ +export const morphoEthereumEarnPools_3 = [ 'WSTETH-ETH-1', 'WSTETH-ETH-2', 'WSTETH-ETH-3', @@ -43,22 +54,40 @@ export const morphoEthereumMultiplyPools_3 = [ 'WOETH-ETH', ]; -export const morphoEthereumMultiplyPools_4 = [ - 'MKR-USDC', +export const morphoEthereumEarnPools_4 = ['EZETH-ETH', 'SUSDE-DAI-1', 'SUSDE-DAI-2', 'SUSDE-DAI-3']; + +export const morphoEthereumBorrowPools_1 = [ + 'USDE-DAI-1', + 'USDE-DAI-2', + 'USDE-DAI-3', + 'OSETH-ETH', 'EZETH-ETH', +]; + +export const morphoEthereumBorrowPools_2 = [ 'SUSDE-DAI-1', 'SUSDE-DAI-2', 'SUSDE-DAI-3', + 'SUSDE-DAI-4', + 'SUSDE-USDT', ]; -export const morphoEthereumEarnPools = [ - 'flagship-ETH', - 'flagship-USDC', - 'flagship-USDT', - 'steakhouse-ETH', - 'steakhouse-PYUSD', - 'steakhouse-USDC', - 'steakhouse-USDT', +export const morphoEthereumBorrowPools_3 = [ + 'WSTETH-ETH-1', + 'WSTETH-ETH-2', + 'WSTETH-ETH-3', + 'WSTETH-USDC', + 'WSTETH-USDT', + 'WSTETH-USDA', +]; + +export const morphoEthereumBorrowPools_4 = [ + 'WBTC-USDC', + 'WBTC-USDT', + 'MKR-USDC', + 'RSETH-ETH', + 'WOETH-ETH', + 'WEETH-ETH', ]; export const morphoBaseMultiplyPools = ['ETH-USDC', 'WSTETH-USDC', 'CBETH-USDC', 'WEETH-USDC']; @@ -207,6 +236,7 @@ export type Tokens = | 'PTWEETH' | 'RETH' | 'RPL' + | 'RSETH' | 'SDAI' | 'SUSDE' | 'USDA' @@ -234,6 +264,7 @@ export type SetBalanceTokens = | 'OSETH' | 'PYUSD' | 'RETH' + | 'RSETH' | 'SDAI' | 'STETH' | 'SUSDE' @@ -265,6 +296,7 @@ export const depositAmount = { OSETH: '5', PYUSD: '2000', RETH: '5', + RSETH: '5', SDAI: '2000', STETH: '5', SUSDE: '100000',