Skip to content

Commit 6c39156

Browse files
0xTimepunk0xTimepunk
authored
Merge pull request #634 from superform-xyz/SUP-8648
chore: increase coverage of ERC7540 & Async State Registry
2 parents 0663699 + f043501 commit 6c39156

File tree

51 files changed

+2947
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2947
-144
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ build-sizes: ## Builds the project and shows sizes
121121

122122
.PHONY: test-vvv
123123
test-vvv: ## Runs tests with verbose output
124-
forge test --match-contract MDMVDMulti0000NoTokenInputSlippageAMB12Permit2 --evm-version cancun -vvv
124+
forge test --match-contract SDMVW0TokenInputNoSlippageAMB1323 --evm-version cancun -vvv
125125

126126
.PHONY: ftest
127127
ftest: ## Runs tests with cancun evm version
@@ -137,7 +137,7 @@ coverage: ## Runs coverage
137137

138138
.PHONY: coverage-t
139139
coverage-t: ## Runs coverage for a specific contract
140-
FOUNDRY_PROFILE=coverage forge coverage --match-contract SuperformRouterPlusTest --evm-version cancun --report lcov
140+
FOUNDRY_PROFILE=coverage forge coverage --match-contract 7540 --evm-version cancun --report lcov
141141

142142
.PHONY: smoke-test
143143
smoke-test: ## Runs smoke tests

‎script/deployments/v1_deployment/1/Ethereum-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/10/Optimism-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/137/Polygon-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/250/Fantom-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0xAcceD01769200d6Fe399b88789FC8a044e094112",
2828
"OneInchValidator": "0xf5232D46E988e4ED6E95f90748Ec1AAEd19Ec0B8",
2929
"DeBridgeForwarderValidator": "0xDEDaA19236743EfB77a20042AA5Bb8C8A005C388",
30-
"DeBridgeValidator": "0x3456E9f41a4039d127aCfff4708ffC6CE0Ca83e2"
30+
"DeBridgeValidator": "0x3456E9f41a4039d127aCfff4708ffC6CE0Ca83e2",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/42161/Arbitrum-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/43114/Avalanche-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/56/Binance-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/59144/Linea-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"SuperformRouter": "0xa195608C2306A26f727d5199D5A382a4508308DA",
2828
"VaultClaimer": "0xC4A234A40aC13b02096Dd4aae1b8221541Dc5d5A",
2929
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
30-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
30+
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/81457/Blast-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"SuperformRouter": "0xa195608C2306A26f727d5199D5A382a4508308DA",
2828
"VaultClaimer": "0xC4A234A40aC13b02096Dd4aae1b8221541Dc5d5A",
2929
"WormholeARImplementation": "0xbe296d633E91BD3E72f52732d80F7b28F18cDB54",
30-
"WormholeSRImplementation": "0x2827eFf89affacf9E80D671bca6DeCf7dbdcCaCa"
30+
"WormholeSRImplementation": "0x2827eFf89affacf9E80D671bca6DeCf7dbdcCaCa",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_deployment/8453/Base-latest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
"ERC5115To4626WrapperFactory": "0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2",
2828
"OneInchValidator": "0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D",
2929
"DeBridgeForwarderValidator": "0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60",
30-
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d"
30+
"DeBridgeValidator": "0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d",
31+
"AsyncStateRegistry": "0x0000000000000000000000000000000000000000",
32+
"ERC7540Form": "0x0000000000000000000000000000000000000000"
3133
}

‎script/deployments/v1_staging_deployment/10/Optimism-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2+
"AsyncStateRegistry": "0x21d33C4f659D615e2D5684698c23fC1Ff0664d33",
23
"AxelarImplementation": "0x1d40741954d50DDAFa577d36E5857e04BfD41778",
34
"BroadcastRegistry": "0x5767897fc69A77AC68a75001a56fcA6c421adc6f",
45
"CoreStateRegistry": "0x80AAb0eA1243817E22D6ad76ebe06385900e906d",
56
"DstSwapper": "0xAACA228C3fca21c41C4Ea82EBb2d8843bd830B3b",
67
"ERC4626Form": "0xB2f32B62B7537304b830dE6575Fe73c41ea52991",
8+
"ERC7540Form": "0xe0B82E2D9b65f6Dc9E737398b522fC0210f6e525",
79
"EmergencyQueue": "0x7FE59421D6b85afa86d982E3186a74c72f6c4c03",
810
"HyperlaneImplementation": "0xFD1ad4B1119DF6fDa416600e4d456a2E941bf158",
911
"LayerzeroImplementation": "0xccaC476Da9b34C9553Bb2b3E7F5D23d60e497183",

‎script/deployments/v1_staging_deployment/250/Fantom-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2+
"AsyncStateRegistry": "0xdbd76E3283c2b041eE0274C749110Af7F60A0E37",
23
"BroadcastRegistry": "0xD3ebB36b75E66D72E3767318d6E2A81336170DcD",
34
"CoreStateRegistry": "0xa87976e23401FC5c22dD44C14FCEb19AA164AB54",
45
"DstSwapper": "0x57e009dfc2C5ff3FD3c4627222EF15d3cF9E38d6",
56
"ERC4626Form": "0x45e2ff7EA8d0f03edFfCceE1467528D1d76672b1",
7+
"ERC7540Form": "0x2B2fFa61098dCBfB477901CFE52131eb25fbB451",
68
"EmergencyQueue": "0xE49a5d6fA3bF4489D751CA5f93B2a7f475011bac",
79
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
810
"LayerzeroImplementation": "0x0968b6c93a64D09dBd7D06F5fBB8056510C0DdcB",

‎script/deployments/v1_staging_deployment/42161/Arbitrum-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2+
"AsyncStateRegistry": "0x21d33C4f659D615e2D5684698c23fC1Ff0664d33",
23
"AxelarImplementation": "0x1d40741954d50DDAFa577d36E5857e04BfD41778",
34
"BroadcastRegistry": "0x5767897fc69A77AC68a75001a56fcA6c421adc6f",
45
"CoreStateRegistry": "0x80AAb0eA1243817E22D6ad76ebe06385900e906d",
56
"DstSwapper": "0xAACA228C3fca21c41C4Ea82EBb2d8843bd830B3b",
67
"ERC4626Form": "0xB2f32B62B7537304b830dE6575Fe73c41ea52991",
8+
"ERC7540Form": "0xe0B82E2D9b65f6Dc9E737398b522fC0210f6e525",
79
"EmergencyQueue": "0x7FE59421D6b85afa86d982E3186a74c72f6c4c03",
810
"HyperlaneImplementation": "0xFD1ad4B1119DF6fDa416600e4d456a2E941bf158",
911
"LayerzeroImplementation": "0xccaC476Da9b34C9553Bb2b3E7F5D23d60e497183",

‎script/deployments/v1_staging_deployment/56/Binance-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2+
"AsyncStateRegistry": "0x21d33C4f659D615e2D5684698c23fC1Ff0664d33",
23
"AxelarImplementation": "0x1d40741954d50DDAFa577d36E5857e04BfD41778",
34
"BroadcastRegistry": "0x5767897fc69A77AC68a75001a56fcA6c421adc6f",
45
"CoreStateRegistry": "0x80AAb0eA1243817E22D6ad76ebe06385900e906d",
56
"DstSwapper": "0xAACA228C3fca21c41C4Ea82EBb2d8843bd830B3b",
67
"ERC4626Form": "0xB2f32B62B7537304b830dE6575Fe73c41ea52991",
8+
"ERC7540Form": "0xe0B82E2D9b65f6Dc9E737398b522fC0210f6e525",
79
"EmergencyQueue": "0x7FE59421D6b85afa86d982E3186a74c72f6c4c03",
810
"HyperlaneImplementation": "0xFD1ad4B1119DF6fDa416600e4d456a2E941bf158",
911
"LayerzeroImplementation": "0xccaC476Da9b34C9553Bb2b3E7F5D23d60e497183",

‎script/deployments/v1_staging_deployment/59144/Linea-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"AsyncStateRegistry": "0x21d33C4f659D615e2D5684698c23fC1Ff0664d33",
23
"AxelarImplementation": "0x84d065fac87227566bc1290e99d699b9cc1a6868",
34
"BroadcastRegistry": "0x5767897fc69A77AC68a75001a56fcA6c421adc6f",
45
"CoreStateRegistry": "0x80AAb0eA1243817E22D6ad76ebe06385900e906d",
@@ -7,6 +8,7 @@
78
"DstSwapper": "0xAACA228C3fca21c41C4Ea82EBb2d8843bd830B3b",
89
"ERC4626Form": "0xB2f32B62B7537304b830dE6575Fe73c41ea52991",
910
"ERC5115Form": "0x6eec8db5faa125990ea7faf60ad394d632140dc3",
11+
"ERC7540Form": "0xe0B82E2D9b65f6Dc9E737398b522fC0210f6e525",
1012
"ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
1113
"EmergencyQueue": "0x7FE59421D6b85afa86d982E3186a74c72f6c4c03",
1214
"HyperlaneImplementation": "0xC2C1C18fBe84951F583E7D3719c2aBD0De0649ec",

‎script/deployments/v1_staging_deployment/81457/Blast-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"AsyncStateRegistry": "0x21d33C4f659D615e2D5684698c23fC1Ff0664d33",
23
"AxelarImplementation": "0xA02dE92807c9620c362C7a485b6392dF7531E302",
34
"BroadcastRegistry": "0x5767897fc69A77AC68a75001a56fcA6c421adc6f",
45
"CoreStateRegistry": "0x80AAb0eA1243817E22D6ad76ebe06385900e906d",
@@ -7,6 +8,7 @@
78
"DstSwapper": "0xAACA228C3fca21c41C4Ea82EBb2d8843bd830B3b",
89
"ERC4626Form": "0x1cf4a860c3c1a2f8d69009b18ef039c6d50fbe9c",
910
"ERC5115Form": "0x752eb0eb444a0ffa2e8c7b3e5bb3a43946a454b6",
11+
"ERC7540Form": "0xe0B82E2D9b65f6Dc9E737398b522fC0210f6e525",
1012
"ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
1113
"EmergencyQueue": "0x7FE59421D6b85afa86d982E3186a74c72f6c4c03",
1214
"HyperlaneImplementation": "0xC2C1C18fBe84951F583E7D3719c2aBD0De0649ec",

‎script/deployments/v1_staging_deployment/8453/Base-latest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2+
"AsyncStateRegistry": "0x21d33C4f659D615e2D5684698c23fC1Ff0664d33",
23
"AxelarImplementation": "0x1d40741954d50DDAFa577d36E5857e04BfD41778",
34
"BroadcastRegistry": "0x5767897fc69A77AC68a75001a56fcA6c421adc6f",
45
"CoreStateRegistry": "0x80AAb0eA1243817E22D6ad76ebe06385900e906d",
56
"DstSwapper": "0xAACA228C3fca21c41C4Ea82EBb2d8843bd830B3b",
67
"ERC4626Form": "0xB2f32B62B7537304b830dE6575Fe73c41ea52991",
8+
"ERC7540Form": "0xe0B82E2D9b65f6Dc9E737398b522fC0210f6e525",
79
"EmergencyQueue": "0x7FE59421D6b85afa86d982E3186a74c72f6c4c03",
810
"HyperlaneImplementation": "0xFD1ad4B1119DF6fDa416600e4d456a2E941bf158",
911
"LayerzeroImplementation": "0xccaC476Da9b34C9553Bb2b3E7F5D23d60e497183",

0 commit comments

Comments
 (0)