Skip to content

Commit 12b59e2

Browse files
0xTimepunk0xTimepunk
committed
fix: failing tests
1 parent 9b79761 commit 12b59e2

File tree

10 files changed

+121
-112
lines changed

10 files changed

+121
-112
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ update:; forge update
3535
build :; FOUNDRY_PROFILE=production forge build
3636
build-unoptimized :; FOUNDRY_PROFILE=localdev forge build
3737
build-sizes :; FOUNDRY_PROFILE=production forge build --sizes
38-
test-vvv :; forge test --match-contract SmokeTest --evm-version cancun -vvvvv
38+
test-vvv :; forge test --match-test test_DstSwapIndex0DirectToCSRIndex1 --evm-version cancun -vvv
3939
ftest :; forge test --evm-version cancun
4040
test-ci :; forge test --no-match-path "test/invariant/**/*.sol" --evm-version cancun
4141
coverage :; FOUNDRY_PROFILE=coverage forge coverage --no-match-path "test/invariant/**/*.sol" --no-match-contract SmokeTest --evm-version cancun --report lcov

‎script/forge-scripts/EnvironmentUtils.s.sol

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ abstract contract EnvironmentUtils is AbstractDeploySingle {
9292
TARGET_CHAINS.push(ETH);
9393
TARGET_CHAINS.push(OP);
9494
TARGET_CHAINS.push(ARBI);
95+
TARGET_CHAINS.push(LINEA);
9596

9697
PAYMENT_ADMIN = 0xD911673eAF0D3e15fe662D58De15511c5509bAbB;
9798
CSR_PROCESSOR = 0x23c658FE050B4eAeB9401768bF5911D11621629c;

‎script/output/1/Ethereum-latest.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"AxelarImplementation": "0x0000000000000000000000000000000000000000",
3-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
4-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
5-
"DeBridgeForwarderValidator": "0x0000000000000000000000000000000000000000",
6-
"DeBridgeValidator": "0x0000000000000000000000000000000000000000",
7-
"DstSwapper": "0x0000000000000000000000000000000000000000",
8-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
9-
"ERC5115Form": "0x0000000000000000000000000000000000000000",
10-
"ERC5115To4626WrapperFactory": "0x0000000000000000000000000000000000000000",
11-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
12-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
13-
"LayerzeroImplementation": "0x0000000000000000000000000000000000000000",
14-
"LayerzeroV1Implementation": "0x0000000000000000000000000000000000000000",
15-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
16-
"OneInchValidator": "0x0000000000000000000000000000000000000000",
17-
"PayMaster": "0x0000000000000000000000000000000000000000",
18-
"PayloadHelper": "0xAD2b7eD1315330633bc265A0109D3B12D4caed3c",
19-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
20-
"RewardsDistributor": "0x0000000000000000000000000000000000000000",
21-
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LayerzeroV1Implementation": "0x44F11E68B595cb8f6789700BcF8814909093f553",
15+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
16+
"OneInchValidator": "0xf4F2b2d0036C5d9be3ddf86fa188B60C73170280",
17+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
18+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
19+
"PaymentHelper": "0x5754BdbD9a19037961aa16d53aB6a97fFeC7c9d6",
20+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
21+
"SocketOneInchValidator": "0xB0F404e09F4D9660970bE7780Bb453ba4E161F96",
2222
"SocketValidator": "0x0000000000000000000000000000000000000000",
23-
"SuperPositions": "0x0000000000000000000000000000000000000000",
24-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
25-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
26-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
27-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
28-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
29-
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
30-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
23+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
24+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
25+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
26+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
27+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
28+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
29+
"WormholeARImplementation": "0x7E76F8602194811eA4E1d36d570b5c3c2C6dd3c2",
30+
"WormholeSRImplementation": "0x802e93000D4F89A5B3c1D30b0D426bB7bCe3084C"
3131
}

‎script/output/10/Optimism-latest.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"AxelarImplementation": "0x0000000000000000000000000000000000000000",
3-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
4-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
5-
"DeBridgeForwarderValidator": "0x0000000000000000000000000000000000000000",
6-
"DeBridgeValidator": "0x0000000000000000000000000000000000000000",
7-
"DstSwapper": "0x0000000000000000000000000000000000000000",
8-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
9-
"ERC5115Form": "0x0000000000000000000000000000000000000000",
10-
"ERC5115To4626WrapperFactory": "0x0000000000000000000000000000000000000000",
11-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
12-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
13-
"LayerzeroImplementation": "0x0000000000000000000000000000000000000000",
14-
"LayerzeroV1Implementation": "0x0000000000000000000000000000000000000000",
15-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
16-
"OneInchValidator": "0x0000000000000000000000000000000000000000",
17-
"PayMaster": "0x0000000000000000000000000000000000000000",
18-
"PayloadHelper": "0xAD2b7eD1315330633bc265A0109D3B12D4caed3c",
19-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
20-
"RewardsDistributor": "0x0000000000000000000000000000000000000000",
21-
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LayerzeroV1Implementation": "0x44F11E68B595cb8f6789700BcF8814909093f553",
15+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
16+
"OneInchValidator": "0xf4F2b2d0036C5d9be3ddf86fa188B60C73170280",
17+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
18+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
19+
"PaymentHelper": "0x5754BdbD9a19037961aa16d53aB6a97fFeC7c9d6",
20+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
21+
"SocketOneInchValidator": "0xB0F404e09F4D9660970bE7780Bb453ba4E161F96",
2222
"SocketValidator": "0x0000000000000000000000000000000000000000",
23-
"SuperPositions": "0x0000000000000000000000000000000000000000",
24-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
25-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
26-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
27-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
28-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
29-
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
30-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
23+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
24+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
25+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
26+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
27+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
28+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
29+
"WormholeARImplementation": "0x7E76F8602194811eA4E1d36d570b5c3c2C6dd3c2",
30+
"WormholeSRImplementation": "0x802e93000D4F89A5B3c1D30b0D426bB7bCe3084C"
3131
}

‎script/output/42161/Arbitrum-latest.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"AxelarImplementation": "0x0000000000000000000000000000000000000000",
3-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
4-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
5-
"DeBridgeForwarderValidator": "0x0000000000000000000000000000000000000000",
6-
"DeBridgeValidator": "0x0000000000000000000000000000000000000000",
7-
"DstSwapper": "0x0000000000000000000000000000000000000000",
8-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
9-
"ERC5115Form": "0x0000000000000000000000000000000000000000",
10-
"ERC5115To4626WrapperFactory": "0x0000000000000000000000000000000000000000",
11-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
12-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
13-
"LayerzeroImplementation": "0x0000000000000000000000000000000000000000",
14-
"LayerzeroV1Implementation": "0x0000000000000000000000000000000000000000",
15-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
16-
"OneInchValidator": "0x0000000000000000000000000000000000000000",
17-
"PayMaster": "0x0000000000000000000000000000000000000000",
18-
"PayloadHelper": "0xAD2b7eD1315330633bc265A0109D3B12D4caed3c",
19-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
20-
"RewardsDistributor": "0x0000000000000000000000000000000000000000",
21-
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LayerzeroV1Implementation": "0x44F11E68B595cb8f6789700BcF8814909093f553",
15+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
16+
"OneInchValidator": "0xf4F2b2d0036C5d9be3ddf86fa188B60C73170280",
17+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
18+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
19+
"PaymentHelper": "0x5754BdbD9a19037961aa16d53aB6a97fFeC7c9d6",
20+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
21+
"SocketOneInchValidator": "0xB0F404e09F4D9660970bE7780Bb453ba4E161F96",
2222
"SocketValidator": "0x0000000000000000000000000000000000000000",
23-
"SuperPositions": "0x0000000000000000000000000000000000000000",
24-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
25-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
26-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
27-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
28-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
29-
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
30-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
23+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
24+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
25+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
26+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
27+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
28+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
29+
"WormholeARImplementation": "0x7E76F8602194811eA4E1d36d570b5c3c2C6dd3c2",
30+
"WormholeSRImplementation": "0x802e93000D4F89A5B3c1D30b0D426bB7bCe3084C"
3131
}

‎script/output/59144/Linea-latest.json

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
{
2-
"AxelarImplementation": "0x0000000000000000000000000000000000000000",
3-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
4-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
5-
"DeBridgeForwarderValidator": "0x0000000000000000000000000000000000000000",
6-
"DeBridgeValidator": "0x0000000000000000000000000000000000000000",
7-
"DstSwapper": "0x0000000000000000000000000000000000000000",
8-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
9-
"ERC5115Form": "0x0000000000000000000000000000000000000000",
10-
"ERC5115To4626WrapperFactory": "0x0000000000000000000000000000000000000000",
11-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
12-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
13-
"LayerzeroImplementation": "0xF442FC47c5e8b6CA772a9b7345d9E6A663375258",
14-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LayerzeroV1Implementation": "0x44F11E68B595cb8f6789700BcF8814909093f553",
15+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
1516
"OneInchValidator": "0x0000000000000000000000000000000000000000",
16-
"PayMaster": "0x0000000000000000000000000000000000000000",
17-
"PayloadHelper": "0x0000000000000000000000000000000000000000",
18-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
19-
"RewardsDistributor": "0x0000000000000000000000000000000000000000",
17+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
18+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
19+
"PaymentHelper": "0x5754BdbD9a19037961aa16d53aB6a97fFeC7c9d6",
20+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
2021
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2122
"SocketValidator": "0x0000000000000000000000000000000000000000",
22-
"SuperPositions": "0x0000000000000000000000000000000000000000",
23-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
24-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
25-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
26-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
27-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
23+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
24+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
25+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
26+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
27+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
28+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
2829
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
2930
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
3031
}

‎src/crosschain-liquidity/DstSwapper.sol

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"
1515
import { SafeERC20 } from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
1616
import { ReentrancyGuard } from "openzeppelin-contracts/contracts/utils/ReentrancyGuard.sol";
1717

18+
import "forge-std/console.sol";
19+
1820
/// @title DstSwapper
1921
/// @dev Handles all destination chain swaps
2022
/// @author Zeropoint Labs
@@ -374,6 +376,9 @@ contract DstSwapper is IDstSwapper, ReentrancyGuard, LiquidityHandler {
374376

375377
v.balanceDiff = v.balanceAfter - v.balanceBefore;
376378

379+
console.log("v.balanceDiff", v.balanceDiff);
380+
console.log("v.expAmount", v.expAmount);
381+
377382
/// @dev if actual underlying is less than expAmount adjusted with maxSlippage, invariant breaks
378383
if (v.balanceDiff * ENTIRE_SLIPPAGE < v.expAmount * (ENTIRE_SLIPPAGE - v.maxSlippage)) {
379384
revert Error.SLIPPAGE_OUT_OF_BOUNDS();

‎test/unit/crosschain-data/extensions/CoreStateRegistry.t.sol

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,8 @@ contract CoreStateRegistryTest is ProtocolActions {
10231023
internal
10241024
returns (uint256 superformId)
10251025
{
1026+
// 806584555793248223600
1027+
10261028
MultiDepositDstSwapSpecialCaseVars memory v;
10271029
/// scenario: user deposits with his own token and has approved enough tokens
10281030
vm.selectFork(FORKS[ETH]);
@@ -1048,7 +1050,7 @@ contract CoreStateRegistryTest is ProtocolActions {
10481050

10491051
/// this should fail as it is larger than the balance difference (result of swapping 0.1 WETH (1e17 in in
10501052
/// txDataFails) to DAI )
1051-
v.amounts[0] = isFailingIndex1Vault ? 419_972_359 : 419_950_757_613_293_461_130;
1053+
v.amounts[0] = isFailingIndex1Vault ? 419_972_359 : 386_546_523_522_493_717_113;
10521054
v.amounts[1] = isFailingIndex1Vault ? 1e21 : 419_972_359;
10531055

10541056
v.externalToken = getContract(ETH, "DAI");
@@ -1412,7 +1414,7 @@ contract CoreStateRegistryTest is ProtocolActions {
14121414
v.finalTokens[0] = getContract(AVAX, "DAI");
14131415
v.finalTokens[1] = getContract(AVAX, "DAI");
14141416

1415-
v.amounts[0] = 419_950_757_613_293_461_130;
1417+
v.amounts[0] = 386_546_523_522_493_717_113;
14161418
v.amounts[1] = 419_972_359;
14171419

14181420
vm.prank(deployer);

‎test/unit/crosschain-data/utils/PayloadHelper.multiVault.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ contract PayloadHelperMultiTest is ProtocolActions {
3333
TARGET_FORM_KINDS[ETH][0] = [0, 0];
3434
TARGET_FORM_KINDS[ETH][1] = [0, 0];
3535

36-
AMOUNTS[ETH][0] = [20_000, 213];
36+
AMOUNTS[ETH][0] = [20_001, 214];
3737

3838
MAX_SLIPPAGE = 1000;
3939

‎test/utils/BaseSetup.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,7 @@ abstract contract BaseSetup is StdInvariant, Test {
18061806
existingVaults[42_161][1]["WETH"][0] = 0xe4c2A17f38FEA3Dcb3bb59CEB0aC0267416806e2;
18071807

18081808
existingVaults[1][1]["DAI"][0] = address(0);
1809-
existingVaults[1][1]["USDC"][0] = 0x6bAD6A9BcFdA3fd60Da6834aCe5F93B8cFed9598;
1809+
existingVaults[1][1]["USDC"][0] = 0x797DD80692c3b2dAdabCe8e30C07fDE5307D48a9; // euler usdc
18101810
existingVaults[1][1]["WETH"][0] = address(0);
18111811
existingVaults[1][1]["USDe"][0] = 0x9D39A5DE30e57443BfF2A8307A4256c8797A3497;
18121812

0 commit comments

Comments
 (0)