From dcd9c5598f0670c74eeaff390c8e23102a5c8182 Mon Sep 17 00:00:00 2001 From: publius Date: Tue, 30 May 2023 14:11:20 -0400 Subject: [PATCH 1/4] forge install: openzeppelin-contracts-upgradeable v4.9.0 --- .gitmodules | 4 ++-- lib/openzeppelin-contracts-upgradeable | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 538de534..a22f6fe4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,5 +12,5 @@ branch = v4.8.0 [submodule "lib/openzeppelin-contracts-upgradeable"] path = lib/openzeppelin-contracts-upgradeable - url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable - branch = v4.8.0 + url = https://github.com/lib/openzeppelin-contracts-upgradeable + branch = v4.9.0 diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable index 65420cb9..f6febd79 160000 --- a/lib/openzeppelin-contracts-upgradeable +++ b/lib/openzeppelin-contracts-upgradeable @@ -1 +1 @@ -Subproject commit 65420cb9c943c32eb7e8c9da60183a413d90067a +Subproject commit f6febd79e2a3a17e26969dd0d450c6ebd64bf459 From 50f0bb2ad8f4ad992a4ad73b38215e2484b3c996 Mon Sep 17 00:00:00 2001 From: publius Date: Tue, 30 May 2023 14:11:25 -0400 Subject: [PATCH 2/4] forge install: openzeppelin-contracts v4.9.0 --- .gitmodules | 4 ++-- lib/openzeppelin-contracts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a22f6fe4..8e29df0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = v3 [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts - url = https://github.com/OpenZeppelin/openzeppelin-contracts - branch = v4.8.0 + url = https://github.com/lib/openzeppelin-contracts + branch = v4.9.0 [submodule "lib/openzeppelin-contracts-upgradeable"] path = lib/openzeppelin-contracts-upgradeable url = https://github.com/lib/openzeppelin-contracts-upgradeable diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts index 49c0e437..dfef6a68 160000 --- a/lib/openzeppelin-contracts +++ b/lib/openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 49c0e4370d0cc50ea6090709e3835a3091e33ee2 +Subproject commit dfef6a68ee18dbd2e1f5a099061a3b8a0e404485 From fcbf04a99b00807891fb2a9791ba18ed425479ab Mon Sep 17 00:00:00 2001 From: publius Date: Tue, 30 May 2023 15:41:53 -0400 Subject: [PATCH 3/4] fail on getReserves reentry --- src/Well.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Well.sol b/src/Well.sol index 2b5501e9..ce99f990 100644 --- a/src/Well.sol +++ b/src/Well.sol @@ -602,6 +602,8 @@ contract Well is ERC20PermitUpgradeable, IWell, ReentrancyGuardUpgradeable, Clon } function getReserves() external view returns (uint[] memory reserves) { + // Use the same error as `ReentrancyGuardUpgradeable` instead of using a custom error for consistency. + require(!_reentrancyGuardEntered(), "ReentrancyGuard: reentrant call"); reserves = _getReserves(numberOfTokens()); } From 7e98aae18f1e46bf68e2bf5e10b3eca497c05118 Mon Sep 17 00:00:00 2001 From: publius Date: Tue, 30 May 2023 16:02:28 -0400 Subject: [PATCH 4/4] fix build --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8e29df0b..fcabee3d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,9 +8,9 @@ branch = v3 [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts - url = https://github.com/lib/openzeppelin-contracts + url = https://github.com/OpenZeppelin/openzeppelin-contracts branch = v4.9.0 [submodule "lib/openzeppelin-contracts-upgradeable"] path = lib/openzeppelin-contracts-upgradeable - url = https://github.com/lib/openzeppelin-contracts-upgradeable + url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable branch = v4.9.0