From 832c847c06f2ef319b4464f83c586b4ef5d49e33 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 7 Nov 2026 15:14:56 +0000 Subject: [PATCH 1/2] fix(facade): skip trades outside their auction window in TradeHelperFacet DutchTrade.bidAmount() reverts before startTime and after endTime. One ended trade that nobody settled made getAllOpenTradesForRToken revert for the whole RToken. Leave a zero entry for such a trade instead. Amp-Thread-ID: https://ampcode.com/threads/T-01a1a9da-ddd5-71eb-a308-79d3217b772b --- contracts/facade/facets/TradeHelperFacet.sol | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contracts/facade/facets/TradeHelperFacet.sol b/contracts/facade/facets/TradeHelperFacet.sol index 8bbb1717f..b9c6df2d8 100644 --- a/contracts/facade/facets/TradeHelperFacet.sol +++ b/contracts/facade/facets/TradeHelperFacet.sol @@ -67,16 +67,20 @@ contract TradeHelperFacet { } openTrades = new SingleBid[](numOpenTrades); + uint48 bidTime = timestamp == 0 ? uint48(block.timestamp) : timestamp; for (uint256 i = 0; i < numOpenTrades; i++) { DutchTrade trade = DutchTrade(openTradeAddresses[i]); + // Leave a zero entry for a trade outside its auction window: bidAmount() reverts for it + if (bidTime < trade.startTime() || bidTime > trade.endTime()) continue; + openTrades[i] = SingleBid({ tradeAddress: address(trade), sellToken: address(trade.sell()), buyToken: address(trade.buy()), sellAmount: trade.lot(), - bidAmount: trade.bidAmount(timestamp == 0 ? uint48(block.timestamp) : timestamp) + bidAmount: trade.bidAmount(bidTime) }); } } From 30202d83b972ebcaa47042bd112ddac767d30b31 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 7 Nov 2026 18:09:56 +0000 Subject: [PATCH 2/2] style(facade): put the TradeHelperFacet continue in braces Amp-Thread-ID: https://ampcode.com/threads/T-01a1a9da-ddd5-71eb-a308-79d3217b772b --- contracts/facade/facets/TradeHelperFacet.sol | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contracts/facade/facets/TradeHelperFacet.sol b/contracts/facade/facets/TradeHelperFacet.sol index b9c6df2d8..16c76f1bc 100644 --- a/contracts/facade/facets/TradeHelperFacet.sol +++ b/contracts/facade/facets/TradeHelperFacet.sol @@ -73,7 +73,9 @@ contract TradeHelperFacet { DutchTrade trade = DutchTrade(openTradeAddresses[i]); // Leave a zero entry for a trade outside its auction window: bidAmount() reverts for it - if (bidTime < trade.startTime() || bidTime > trade.endTime()) continue; + if (bidTime < trade.startTime() || bidTime > trade.endTime()) { + continue; + } openTrades[i] = SingleBid({ tradeAddress: address(trade),