Skip to content

Commit 3c6c728

Browse files
duncancmtduncancmt
committed
Merge branch 'master' into dcmt/slippage
2 parents 1519356 + 97c2531 commit 3c6c728

Some content is hidden

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

61 files changed

+36
-1795
lines changed

‎.github/workflows/integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: npm install
3232

3333
- name: Build AllowanceHolder and Deployer
34-
run: forge build -- src/allowanceholder/AllowanceHolder.sol src/deployer/Deployer.sol src/deployer/BlastDeployer.sol src/deployer/ModeDeployer.sol
34+
run: forge build -- src/allowanceholder/AllowanceHolder.sol src/deployer/Deployer.sol src/deployer/ModeDeployer.sol
3535
env:
3636
FOUNDRY_SOLC_VERSION: 0.8.25
3737

‎.github/workflows/size.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
run: npm install
3232

3333
- name: Check contract sizes
34-
run: forge build --sizes --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip BlastDeployer.sol --skip ModeDeployer.sol --skip 'test/*'
34+
run: forge build --sizes --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip ModeDeployer.sol --skip 'test/*'

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
run: forge test --skip 'src/*' --skip 'script/*' --skip 'test/unit/*' --skip 'test/integration/*' --skip 'test/0.8.25/*' --mp test/0.8.28/EulerSwapBUSL.t.sol
2727

2828
- name: Build contracts
29-
run: forge build --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip BlastDeployer.sol --skip ModeDeployer.sol --skip 'test/*' --skip 'script/*'
29+
run: forge build --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip ModeDeployer.sol --skip 'test/*' --skip 'script/*'
3030

3131
- name: Build AllowanceHolder and Deployer
32-
run: forge build -- src/allowanceholder/AllowanceHolder.sol src/deployer/Deployer.sol src/deployer/BlastDeployer.sol src/deployer/ModeDeployer.sol
32+
run: forge build -- src/allowanceholder/AllowanceHolder.sol src/deployer/Deployer.sol src/deployer/ModeDeployer.sol
3333
env:
3434
FOUNDRY_SOLC_VERSION: 0.8.25
3535

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44

55
* DackieSwap and BaseX UniV3 forks removed from Base
66
* Remove `LFJTM` action for Let's F***ing Joe Token Mill V2 on Monad mainnet chain
7+
* Abandon the following chains:
8+
* Blast
9+
* Taiko
10+
* Gnosis (XDAI)
11+
* Remove `MAVERICKV2_VIP` and `METATXN_MAVERICKV2_VIP` actions from Arbitrum,
12+
Base, Bnb, Mainnet, Scroll, and Sepolia. The `MAVERICKV2` action remains.
713

814
### Non-breaking changes
915

1016
* Add Thena UniV3 Algebra style fork to Bnb with fork ID 37
1117
* EkuboV2 VIP actions `EKUBO_VIP` and `METATXN_EKUBO_VIP` are not
1218
supported anymore and were removed from `ISettlerActions.sol`.
19+
* Update Arbitrum to the Osaka EVM hardfork
1320

1421
## 2026-03-17
1522

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ your integration.
125125

126126
* `0x0000000000001fF3684f28c67538d4D072C22734` on chains supporting the Cancun
127127
hardfork (Ethereum mainnet, Ethereum Sepolia testnet, Polygon, Base, Optimism,
128-
Arbitrum, Blast, Bnb, Mode, World Chain, Gnosis, Fantom Sonic, Ink, Avalanche,
129-
Unichain, Berachain, Scroll, HyperEvm, Katana, Plasma, Monad mainnet,
130-
Abstract, Linea, Tempo)
128+
Arbitrum, Bnb, Mode, World Chain, Fantom Sonic, Ink, Avalanche, Unichain,
129+
Berachain, Scroll, HyperEvm, Katana, Plasma, Monad mainnet, Abstract, Linea,
130+
Tempo)
131131
* `0x0000000000005E88410CcDFaDe4a5EfaE4b49562` on chains supporting the Shanghai
132-
hardfork (Mantle, Taiko)
132+
hardfork (Mantle)
133133

134134
### ERC2771 forwarding MultiCall address
135135

@@ -1483,8 +1483,7 @@ is passed through the callback unmodified. _**This is critical for security.**_
14831483
Some chains have a form of sequencer fee sharing or other chain-specific
14841484
deploy-time setup. Configure this in the constructor of the Settler (and ideally
14851485
in the constructor of the Deployer, remembering that this is complicated by the
1486-
fact that the Deployer is a proxy). See the deployments to Blast and to Mode for
1487-
examples.
1486+
fact that the Deployer is a proxy). See the deployment to Mode for an example.
14881487

14891488
Fourth, deploy `MultiCall`. Run [`BROADCAST=no ./sh/deploy_multicall.sh
14901489
<CHAIN_NAME>`](sh/deploy_multicall.sh). Then switch to `BROADCAST=yes` to

‎UNISWAPV3_FORKS.md‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
<!-- -->
1717
8. SwapBasedV3
1818
<!-- -->
19-
9. Thruster
20-
<!-- -->
21-
10. BladeSwap (Algebra-like)
22-
<!-- -->
23-
11. Fenix (Algebra-like)
24-
<!-- -->
2519
12. ZebraV3
2620
<!-- -->
2721
13. Lynex (Algebra-like)
@@ -30,24 +24,12 @@
3024
<!-- -->
3125
17. MetavaultV3
3226
<!-- -->
33-
18. BlasterV3
34-
<!-- -->
35-
19. MonoSwapV3
36-
<!-- -->
37-
20. RogueXV1
38-
<!-- -->
3927
21. SupSwapV3
4028
<!-- -->
4129
22. Kim (Algebra-like)
4230
<!-- -->
4331
23. SwapMode
4432
<!-- -->
45-
24. Swapsicle (Algebra-like)
46-
<!-- -->
47-
25. Panko
48-
<!-- -->
49-
26. Swapr (Algebra-like)
50-
<!-- -->
5133
27. SpookySwap
5234
<!-- -->
5335
28. Wagmi

‎api_secrets.json.template‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
"avalanche": {
3131
"rpcUrl": ""
3232
},
33-
"blast": {
34-
"etherscanKey": "",
35-
"rpcUrl": ""
36-
},
3733
"linea": {
3834
"etherscanKey": "",
3935
"rpcUrl": ""
@@ -49,18 +45,10 @@
4945
"mode": {
5046
"rpcUrl": ""
5147
},
52-
"taiko": {
53-
"etherscanKey": "",
54-
"rpcUrl": ""
55-
},
5648
"world": {
5749
"etherscanKey": "",
5850
"rpcUrl": ""
5951
},
60-
"xdai": {
61-
"rpcUrl": "",
62-
"etherscanKey": ""
63-
},
6452
"sonic": {
6553
"etherscanKey": "",
6654
"rpcUrl": ""

‎chain_config.json‎

Lines changed: 1 addition & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"hardfork": {
191191
"shanghai": true,
192192
"cancun": true,
193-
"osaka": false,
193+
"osaka": true,
194194
"eraVm": false
195195
},
196196
"extraFlags": "--legacy",
@@ -295,42 +295,6 @@
295295
"etherscanApi": "https://api.snowtrace.io/api",
296296
"sourcifyApi": "https://sourcify.dev/server/"
297297
},
298-
"blast": {
299-
"chainId": 81457,
300-
"displayName": "Blast",
301-
"hardfork": {
302-
"shanghai": true,
303-
"cancun": true,
304-
"osaka": false,
305-
"eraVm": false
306-
},
307-
"extraFlags": "--legacy",
308-
"extraScriptFlags": "--isolate",
309-
"gasMultiplierPercent": 200,
310-
"minGasPriceGwei": 1,
311-
"wnative": "0x4300000000000000000000000000000000000004",
312-
"safe": {
313-
"toehold": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
314-
"singleton": "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA",
315-
"factory": "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC",
316-
"fallback": "0x017062a1dE2FE6b99BE3d9d37841FeD19F573804",
317-
"multiCall": "0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B",
318-
"apiUrl": "NOT SUPPORTED"
319-
},
320-
"governance": {
321-
"upgradeSafe": "0xf36b9f50E59870A24F42F9Ba43b2aD0A4b8f2F51",
322-
"deploymentSafe": "0x8E5DE7118a596E99B0563D3022039c11927f4827",
323-
"pause": "0x1CeC01DC0fFEE5eB5aF47DbEc1809F2A7c601C30",
324-
"daoSafe": "0x23030a6124E871F4744Cb9bc14D519b1f033FFe3"
325-
},
326-
"deployment": {
327-
"deployer": "0x00000000000004533Fe15556B1E086BB1A72cEae",
328-
"allowanceHolder": "0x0000000000001fF3684f28c67538d4D072C22734",
329-
"forwardingMultiCall": "0x00000000000000CF9E3c5A26621af382fA17f24f",
330-
"crossChainFactory": "0x00000000000000304861c3aDfb80dd5ebeC96325"
331-
},
332-
"etherscanApi": "https://api.etherscan.io/v2/api?chainid=81457"
333-
},
334298
"linea": {
335299
"chainId": 59144,
336300
"displayName": "Linea",
@@ -479,42 +443,6 @@
479443
"blockscoutApi": "https://explorer.mode.network/api",
480444
"sourcifyApi": "https://sourcify.dev/server/"
481445
},
482-
"taiko": {
483-
"chainId": 167000,
484-
"displayName": "Taiko",
485-
"hardfork": {
486-
"shanghai": true,
487-
"cancun": false,
488-
"osaka": false,
489-
"eraVm": false
490-
},
491-
"extraFlags": "",
492-
"extraScriptFlags": "--isolate",
493-
"gasMultiplierPercent": 200,
494-
"minGasPriceGwei": 1,
495-
"wnative": "0xA51894664A773981C6C112C43ce576f315d5b1B6",
496-
"safe": {
497-
"toehold": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
498-
"singleton": "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA",
499-
"factory": "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC",
500-
"fallback": "0x017062a1dE2FE6b99BE3d9d37841FeD19F573804",
501-
"multiCall": "0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B",
502-
"apiUrl": "NOT SUPPORTED"
503-
},
504-
"governance": {
505-
"upgradeSafe": "0xf36b9f50E59870A24F42F9Ba43b2aD0A4b8f2F51",
506-
"deploymentSafe": "0x8E5DE7118a596E99B0563D3022039c11927f4827",
507-
"pause": "0x1CeC01DC0fFEE5eB5aF47DbEc1809F2A7c601C30",
508-
"daoSafe": "0x23030a6124E871F4744Cb9bc14D519b1f033FFe3"
509-
},
510-
"deployment": {
511-
"deployer": "0x00000000000004533Fe15556B1E086BB1A72cEae",
512-
"allowanceHolder": "0x0000000000005E88410CcDFaDe4a5EfaE4b49562",
513-
"forwardingMultiCall": "0x00000000000000CF9E3c5A26621af382fA17f24f",
514-
"crossChainFactory": "0x00000000000000304861c3aDfb80dd5ebeC96325"
515-
},
516-
"etherscanApi": "https://api.etherscan.io/v2/api?chainid=167000"
517-
},
518446
"world": {
519447
"chainId": 480,
520448
"displayName": "WorldChain",
@@ -552,43 +480,6 @@
552480
"etherscanApi": "https://api.etherscan.io/v2/api?chainid=480",
553481
"blockscoutApi": "https://worldchain-mainnet.explorer.alchemy.com/api"
554482
},
555-
"xdai": {
556-
"chainId": 100,
557-
"displayName": "Gnosis",
558-
"hardfork": {
559-
"shanghai": true,
560-
"cancun": true,
561-
"osaka": false,
562-
"eraVm": false
563-
},
564-
"extraFlags": "",
565-
"extraScriptFlags": "--isolate",
566-
"gasMultiplierPercent": 140,
567-
"minGasPriceGwei": 2,
568-
"wnative": "0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d",
569-
"safe": {
570-
"toehold": "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
571-
"singleton": "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA",
572-
"factory": "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC",
573-
"fallback": "0x017062a1dE2FE6b99BE3d9d37841FeD19F573804",
574-
"multiCall": "0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B",
575-
"apiUrl": "https://api.safe.global/tx-service/gno/api"
576-
},
577-
"governance": {
578-
"upgradeSafe": "0xf36b9f50E59870A24F42F9Ba43b2aD0A4b8f2F51",
579-
"deploymentSafe": "0x8E5DE7118a596E99B0563D3022039c11927f4827",
580-
"pause": "0x1CeC01DC0fFEE5eB5aF47DbEc1809F2A7c601C30",
581-
"daoSafe": "0x23030a6124E871F4744Cb9bc14D519b1f033FFe3"
582-
},
583-
"deployment": {
584-
"deployer": "0x00000000000004533Fe15556B1E086BB1A72cEae",
585-
"allowanceHolder": "0x0000000000001fF3684f28c67538d4D072C22734",
586-
"forwardingMultiCall": "0x00000000000000CF9E3c5A26621af382fA17f24f",
587-
"crossChainFactory": "0x00000000000000304861c3aDfb80dd5ebeC96325"
588-
},
589-
"etherscanApi": "https://api.etherscan.io/v2/api?chainid=100",
590-
"sourcifyApi": "https://sourcify.dev/server/"
591-
},
592483
"sonic": {
593484
"chainId": 146,
594485
"displayName": "Sonic",

‎script/SafeConfig.sol‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ library SafeConfig {
1414
block.chainid == 1 // mainnet
1515
|| block.chainid == 10 // optimism
1616
|| block.chainid == 56 // bnb
17-
|| block.chainid == 100 // gnosis
1817
|| block.chainid == 130 // unichain
1918
|| block.chainid == 137 // polygon
2019
|| block.chainid == 143 // monad
@@ -32,8 +31,6 @@ library SafeConfig {
3231
|| block.chainid == 57073 // ink
3332
|| block.chainid == 59144 // linea
3433
|| block.chainid == 80094 // berachain
35-
|| block.chainid == 81457 // blast
36-
|| block.chainid == 167000 // taiko
3734
|| block.chainid == 534352 // scroll
3835
|| block.chainid == 747474 // katana
3936
) {
@@ -49,7 +46,6 @@ library SafeConfig {
4946
if (
5047
block.chainid == 10 // optimism
5148
|| block.chainid == 56 // bnb
52-
|| block.chainid == 100 // gnosis
5349
|| block.chainid == 130 // unichain
5450
|| block.chainid == 137 // polygon
5551
|| block.chainid == 143 // monad
@@ -67,8 +63,6 @@ library SafeConfig {
6763
|| block.chainid == 57073 // ink
6864
|| block.chainid == 59144 // linea
6965
|| block.chainid == 80094 // berachain
70-
|| block.chainid == 81457 // blast
71-
|| block.chainid == 167000 // taiko
7266
|| block.chainid == 534352 // scroll
7367
|| block.chainid == 747474 // katana
7468
|| block.chainid == 11155111 // sepolia
@@ -88,7 +82,6 @@ library SafeConfig {
8882
block.chainid == 1 // ethereum
8983
|| block.chainid == 10 // optimism
9084
|| block.chainid == 56 // bnb
91-
|| block.chainid == 100 // gnosis
9285
|| block.chainid == 130 // unichain
9386
|| block.chainid == 137 // polygon
9487
|| block.chainid == 143 // monad
@@ -105,8 +98,6 @@ library SafeConfig {
10598
|| block.chainid == 57073 // ink
10699
|| block.chainid == 59144 // linea
107100
|| block.chainid == 80094 // berachain
108-
|| block.chainid == 81457 // blast
109-
|| block.chainid == 167000 // taiko
110101
|| block.chainid == 534352 // scroll
111102
|| block.chainid == 747474 // katana
112103
|| block.chainid == 11155111 // sepolia

‎sh/abandon_chain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ gas_limit="$(apply_gas_multiplier $gas_estimate)"
229229
declare -r -i gas_limit
230230

231231
if [[ $wallet_type = 'frame' ]] ; then
232-
cast send --confirmations 10 --from "$signer" --rpc-url 'http://127.0.0.1:1248/' --chain $chainid --gas-price $gas_price --gas-limit $gas_limit "${wallet_args[@]}" "${extra_flags[@]}" "${args[@]}"
232+
cast send --timeout 300 --rpc-timeout 300 --confirmations 10 --from "$signer" --rpc-url 'http://127.0.0.1:1248/' --chain $chainid --gas-price $gas_price --gas-limit $gas_limit "${wallet_args[@]}" "${extra_flags[@]}" "${args[@]}"
233233
else
234234
cast send --confirmations 10 --from "$signer" --rpc-url "$rpc_url" --chain $chainid --gas-price $gas_price --gas-limit $gas_limit "${wallet_args[@]}" "${extra_flags[@]}" "${args[@]}"
235235
fi

0 commit comments

Comments
 (0)