feat(auction): implement eoa-bidder (#96)

axieinfinity · Oct 24, 2023 · 5a3867b · 5a3867b
2 parents 98c17d9 + 9ecc86f
commit 5a3867b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/...31021_UpgradeDomainPriceAndAuction.s..sol → ...231021_UpgradeDomainPriceAndAuction.s.sol b/...31021_UpgradeDomainPriceAndAuction.s..sol → ...231021_UpgradeDomainPriceAndAuction.s.sol
diff --git a/script/20231024-upgrade-auction/20231024_UpgradeAuction.s.sol 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__20231024_UpgradeAuction is RNSDeploy {
+  function run() public trySetUp {
+    _upgradeProxy(ContractKey.RNSAuction, EMPTY_ARGS);
+  }
+}
diff --git 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);

diff --git 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 ContractBidderIsForbidden();
     address payable prvBidder = auction.bid.bidder;
     uint256 prvPrice = auction.bid.price;
 

diff --git 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 {