Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update auctioneer #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions script/OpenBidder.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ contract OpenBidderScript is Script {
// todo: add mainnet details when deployed
// testnet
uint256 constant L2_CHAIN_ID = 42169;
address constant auctioneer = 0x10DeC79E201FE7b27b8c4A1524d9733727D60ea4;
address constant settlement = 0x46bb4fE80C04b5C28C761ADdd43FD10fFCcB57CE;
address constant auctioneer = 0x56e0B667f0279ff74Ed04632B5230D77B78fc704;
address constant settlement = 0xa77c65DBfaCAd5FA2996A234D11a02CD8F43A991;

function setUp() public {}

Expand Down
2 changes: 1 addition & 1 deletion src/OpenBidder.sol
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ contract OpenBidder is IBidder {
if (slot <= slotFinished) return ();

// check auction state
(, bool isOpen, bool isSettled) = auctioneer.auctions(slot);
(, bool isOpen, bool isSettled,,) = auctioneer.auctions(slot);
if (isOpen) revert();
if (!isSettled) revert();

Expand Down
3 changes: 1 addition & 2 deletions src/interfaces/IAuctioneer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ interface IAuctioneer {
function accountant() external view returns (address);
function allowance(address, address, uint256) external view returns (uint256);
function approve(address spender, uint256 id, uint256 amount) external returns (bool);
function auctions(uint256) external view returns (uint120 itemsForSale, bool isOpen, bool isSettled);
function auctions(uint256) external view returns (uint120 itemsForSale, bool isOpen, bool isSettled, bool isPaidOut, bool isRefunded);
function balanceOf(address, uint256) external view returns (uint256);
function bid(uint256 slot, uint256[] memory packedBids) external;
function bidderMap(uint8) external view returns (address);
Expand All @@ -51,7 +51,6 @@ interface IAuctioneer {
function pendingOwner() external view returns (address);
function removeBidder(uint8 bidderId) external;
function runAndSettle(uint256 slot) external;
function runAndSettleAndPayout(uint256 slot) external;
function setOperator(address operator, bool approved) external returns (bool);
function supportsInterface(bytes4 interfaceId) external view returns (bool);
function transfer(address receiver, uint256 id, uint256 amount) external returns (bool);
Expand Down
4 changes: 2 additions & 2 deletions test/OpenBidder.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ contract OpenBidderTest is Test {
WETH constant weth = WETH(payable(0x4200000000000000000000000000000000000006));
// todo: add mainnet details when deployed
// testnet
IAuctioneer constant auctioneer = IAuctioneer(0x10DeC79E201FE7b27b8c4A1524d9733727D60ea4);
address constant settlement = 0x46bb4fE80C04b5C28C761ADdd43FD10fFCcB57CE;
IAuctioneer constant auctioneer = IAuctioneer(0x56e0B667f0279ff74Ed04632B5230D77B78fc704);
address constant settlement = 0xa77c65DBfaCAd5FA2996A234D11a02CD8F43A991;
// auction operator
address operator;
uint256 constant slot = 101;
Expand Down