From e2dc74c0be1075badc2dcb24b8c6303a3b53401f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Fri, 1 Nov 2024 04:41:29 +0100 Subject: [PATCH] Switch to a more recent Sablier version that does compile in external benchmarks --- test/benchmarks/external-setup.sh | 12 +++++------- test/benchmarks/external.sh | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/benchmarks/external-setup.sh b/test/benchmarks/external-setup.sh index bbba60bad6fc..9b82c5767cf7 100755 --- a/test/benchmarks/external-setup.sh +++ b/test/benchmarks/external-setup.sh @@ -89,17 +89,15 @@ function install_old_uniswap { function install_sablier { # NOTE: To avoid hard-coding dependency versions here we'd have to install them from npm forge install --no-commit \ - foundry-rs/forge-std@v1.5.6 \ - OpenZeppelin/openzeppelin-contracts@v4.9.2 \ - PaulRBerg/prb-math@v4.0.2 \ - PaulRBerg/prb-test@v0.6.4 \ + foundry-rs/forge-std@v1.8.2 \ + OpenZeppelin/openzeppelin-contracts@v5.0.2 \ + PaulRBerg/prb-math@v4.0.3 \ evmcheb/solarray@a547630 \ - Vectorized/solady@v0.0.129 + Vectorized/solady@v0.0.208 cat < remappings.txt @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/ forge-std/=lib/forge-std/ @prb/math/=lib/prb-math/ -@prb/test/=lib/prb-test/ solarray/=lib/solarray/ solady/=lib/solady/ EOF @@ -125,4 +123,4 @@ setup_foundry_project seaport-1.6/ commit tags/1.6 https://github.com/ProjectOpe setup_foundry_project eigenlayer-0.3.0/ tag v0.3.0-holesky-rewards https://github.com/Layr-Labs/eigenlayer-contracts -setup_foundry_project sablier-v2-1.1.2/ tag v1.1.2 https://github.com/sablier-labs/v2-core install_sablier +setup_foundry_project sablier-v2-1.2.0/ tag v1.2.0 https://github.com/sablier-labs/v2-core install_sablier diff --git a/test/benchmarks/external.sh b/test/benchmarks/external.sh index 0fa830b26297..0e26a64fe4be 100755 --- a/test/benchmarks/external.sh +++ b/test/benchmarks/external.sh @@ -84,9 +84,9 @@ benchmarks=( liquity-2024-10-30 # compiles via IR with solc >=0.8.24 uniswap-v4-2024-06-06 # compiles via IR with solc >=0.8.24 eigenlayer-0.3.0 # compiles via IR with solc >=0.8.18 + sablier-v2-1.2.0 # compiles via IR with solc >=0.8.28 (maybe >=0.8.26) seaport-1.6 # StackTooDeep via IR farcaster-3.1.0 # StackTooDeep via IR - sablier-v2-1.1.2 # StackTooDeep via IR ) mkdir -p "$BENCHMARK_DIR"