From 345a4907d052501b19cab0c10bc1979e25ad23bc Mon Sep 17 00:00:00 2001 From: TuDo1403 Date: Tue, 24 Oct 2023 11:31:16 +0700 Subject: [PATCH 1/4] feat: forbid contract bidder --- src/RNSAuction.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RNSAuction.sol b/src/RNSAuction.sol index e8b25d2f..3ce1938a 100644 --- a/src/RNSAuction.sol +++ b/src/RNSAuction.sol @@ -191,7 +191,7 @@ contract RNSAuction is Initializable, AccessControlEnumerable, INSAuction { if (msg.value < beatPrice) revert InsufficientAmount(); address payable bidder = payable(_msgSender()); // check whether the bidder can receive RON - if (!RONTransferHelper.send(bidder, 0)) revert BidderCannotReceiveRON(); + if (bidder != tx.origin) revert BidderCannotReceiveRON(); address payable prvBidder = auction.bid.bidder; uint256 prvPrice = auction.bid.price; From b23f0c9d7446ad5637cc75b415bef007c9af9770 Mon Sep 17 00:00:00 2001 From: TuDo1403 Date: Tue, 24 Oct 2023 11:36:49 +0700 Subject: [PATCH 2/4] feat: update migration script --- ...ol => 20231021_UpgradeDomainPriceAndAuction.s.sol} | 0 .../20231024_UpgradeAuction.s.sol | 11 +++++++++++ script/Debug.s.sol | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) rename script/20231021-upgrade-domain-price-and-auction/{20231021_UpgradeDomainPriceAndAuction.s..sol => 20231021_UpgradeDomainPriceAndAuction.s.sol} (100%) create mode 100644 script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol diff --git a/script/20231021-upgrade-domain-price-and-auction/20231021_UpgradeDomainPriceAndAuction.s..sol b/script/20231021-upgrade-domain-price-and-auction/20231021_UpgradeDomainPriceAndAuction.s.sol similarity index 100% rename from script/20231021-upgrade-domain-price-and-auction/20231021_UpgradeDomainPriceAndAuction.s..sol rename to script/20231021-upgrade-domain-price-and-auction/20231021_UpgradeDomainPriceAndAuction.s.sol diff --git a/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol b/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol new file mode 100644 index 00000000..196b1c5f --- /dev/null +++ b/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.19; + +import { ContractKey } from "foundry-deployment-kit/configs/ContractConfig.sol"; +import { RNSDeploy } from "script/RNSDeploy.s.sol"; + +contract Migration__20231021_UpgradeAuction is RNSDeploy { + function run() public trySetUp { + _upgradeProxy(ContractKey.RNSAuction, EMPTY_ARGS); + } +} diff --git a/script/Debug.s.sol b/script/Debug.s.sol index 141560f2..811e6082 100644 --- a/script/Debug.s.sol +++ b/script/Debug.s.sol @@ -9,7 +9,7 @@ contract Debug is RNSDeploy { function debug(uint256 forkBlock, address from, address to, uint256 value, bytes calldata callData) external { if (forkBlock != 0) { - vm.rollFork(forkBlock); + vm.rollFork(forkBlock); } vm.prank(from); (bool success, bytes memory returnOrRevertData) = to.call{ value: value }(callData); From d596a17a217e788b231924b2479df802e89387d5 Mon Sep 17 00:00:00 2001 From: TuDo1403 Date: Tue, 24 Oct 2023 11:39:11 +0700 Subject: [PATCH 3/4] format: rename script --- script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol b/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol index 196b1c5f..ec80d3ea 100644 --- a/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol +++ b/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.19; import { ContractKey } from "foundry-deployment-kit/configs/ContractConfig.sol"; import { RNSDeploy } from "script/RNSDeploy.s.sol"; -contract Migration__20231021_UpgradeAuction is RNSDeploy { +contract Migration__20231024_UpgradeAuction is RNSDeploy { function run() public trySetUp { _upgradeProxy(ContractKey.RNSAuction, EMPTY_ARGS); } From 9ecc86f880e76427095f573f5ccda6feb137e246 Mon Sep 17 00:00:00 2001 From: TuDo1403 Date: Tue, 24 Oct 2023 11:46:13 +0700 Subject: [PATCH 4/4] format: rename outdated error --- src/RNSAuction.sol | 2 +- src/interfaces/INSAuction.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RNSAuction.sol b/src/RNSAuction.sol index 3ce1938a..585d68db 100644 --- a/src/RNSAuction.sol +++ b/src/RNSAuction.sol @@ -191,7 +191,7 @@ contract RNSAuction is Initializable, AccessControlEnumerable, INSAuction { if (msg.value < beatPrice) revert InsufficientAmount(); address payable bidder = payable(_msgSender()); // check whether the bidder can receive RON - if (bidder != tx.origin) revert BidderCannotReceiveRON(); + if (bidder != tx.origin) revert ContractBidderIsForbidden(); address payable prvBidder = auction.bid.bidder; uint256 prvPrice = auction.bid.price; diff --git a/src/interfaces/INSAuction.sol b/src/interfaces/INSAuction.sol index 53c9c5b2..e01d3a7d 100644 --- a/src/interfaces/INSAuction.sol +++ b/src/interfaces/INSAuction.sol @@ -15,7 +15,7 @@ interface INSAuction { error QueryIsNotInPeriod(); error InsufficientAmount(); error InvalidArrayLength(); - error BidderCannotReceiveRON(); + error ContractBidderIsForbidden(); error EventIsNotCreatedOrAlreadyStarted(); struct Bid {