The Burn: spend or burn excess ETH, every N Noun mints

packages/nouns-contracts/.gas-snapshot

@@ -1,11 +1,24 @@
-NounsDAOLogic_GasSnapshot_V2_propose:test_propose_longDescription() (gas: 528733)
-NounsDAOLogic_GasSnapshot_V2_propose:test_propose_shortDescription() (gas: 398388)
-NounsDAOLogic_GasSnapshot_V2_vote:test_castVoteWithReason() (gas: 83474)
-NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_against() (gas: 82886)
-NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_lastMinuteFor() (gas: 83459)
-NounsDAOLogic_GasSnapshot_V3_propose:test_propose_longDescription() (gas: 538195)
-NounsDAOLogic_GasSnapshot_V3_propose:test_propose_shortDescription() (gas: 404029)
-NounsDAOLogic_GasSnapshot_V3_vote:test_castVoteWithReason() (gas: 89809)
-NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_against() (gas: 88733)
-NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_lastMinuteFor() (gas: 112249)
-NounsDAOLogic_GasSnapshot_V3_voteDuringObjectionPeriod:test_castVote_duringObjectionPeriod_against() (gas: 88656)
+NounsAuctionHouseV2WarmedUp_GasSnapshot:test_createOneBid() (gas: 34963)
+NounsAuctionHouseV2WarmedUp_GasSnapshot:test_createTwoBids() (gas: 93423)
+NounsAuctionHouseV2WarmedUp_GasSnapshot:test_settleCurrentAndCreateNewAuction() (gas: 232686)
+NounsAuctionHouseV2_GasSnapshot:test_createOneBid() (gas: 34963)
+NounsAuctionHouseV2_GasSnapshot:test_createTwoBids() (gas: 93423)
+NounsAuctionHouseV2_GasSnapshot:test_settleCurrentAndCreateNewAuction() (gas: 249786)
+NounsAuctionHouseV2_HistoricPrices_GasSnapshot:test_getPrices_90() (gas: 310063)
+NounsAuctionHouseV2_HistoricPrices_GasSnapshot:test_getPrices_range_90() (gas: 300578)
+NounsAuctionHouseV2_HistoricPrices_GasSnapshot:test_getSettlements_90() (gas: 385762)
+NounsAuctionHouseV2_HistoricPrices_GasSnapshot:test_getSettlements_range_90() (gas: 378168)
+NounsAuctionHouse_GasSnapshot:test_createOneBid() (gas: 81474)
+NounsAuctionHouse_GasSnapshot:test_createTwoBids() (gas: 142736)
+NounsAuctionHouse_GasSnapshot:test_settleCurrentAndCreateNewAuction() (gas: 243008)
+NounsDAOLogic_GasSnapshot_V2_propose:test_propose_longDescription() (gas: 528754)
+NounsDAOLogic_GasSnapshot_V2_propose:test_propose_shortDescription() (gas: 398387)
+NounsDAOLogic_GasSnapshot_V2_vote:test_castVoteWithReason() (gas: 83585)
+NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_against() (gas: 82930)
+NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_lastMinuteFor() (gas: 83481)
+NounsDAOLogic_GasSnapshot_V3_propose:test_propose_longDescription() (gas: 538397)
+NounsDAOLogic_GasSnapshot_V3_propose:test_propose_shortDescription() (gas: 404209)
+NounsDAOLogic_GasSnapshot_V3_vote:test_castVoteWithReason() (gas: 89882)
+NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_against() (gas: 88717)
+NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_lastMinuteFor() (gas: 112210)
+NounsDAOLogic_GasSnapshot_V3_voteDuringObjectionPeriod:test_castVote_duringObjectionPeriod_against() (gas: 88702)

packages/nouns-contracts/contracts/NounsAuctionHousePreV2Migration.sol

@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0
+
+/// @title An interim contract for storage migration between V1 and V2
+
+/*********************************
+ * ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ *
+ * ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ *
+ * ░░░░░░█████████░░█████████░░░ *
+ * ░░░░░░██░░░████░░██░░░████░░░ *
+ * ░░██████░░░████████░░░████░░░ *
+ * ░░██░░██░░░████░░██░░░████░░░ *
+ * ░░██░░██░░░████░░██░░░████░░░ *
+ * ░░░░░░█████████░░█████████░░░ *
+ * ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ *
+ * ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ *
+ *********************************/
+
+pragma solidity ^0.8.19;
+
+import { PausableUpgradeable } from '@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol';
+import { ReentrancyGuardUpgradeable } from '@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol';
+import { OwnableUpgradeable } from '@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol';
+import { INounsAuctionHouse } from './interfaces/INounsAuctionHouse.sol';
+import { INounsAuctionHouseV2 } from './interfaces/INounsAuctionHouseV2.sol';
+
+contract NounsAuctionHousePreV2Migration is PausableUpgradeable, ReentrancyGuardUpgradeable, OwnableUpgradeable {
+    struct OldLayout {
+        address nouns;
+        address weth;
+        uint256 timeBuffer;
+        uint256 reservePrice;
+        uint8 minBidIncrementPercentage;
+        uint256 duration;
+        INounsAuctionHouse.Auction auction;
+    }
+
+    struct NewLayout {
+        uint192 reservePrice;
+        uint56 timeBuffer;
+        uint8 minBidIncrementPercentage;
+        INounsAuctionHouseV2.AuctionV2 auction;
+        bool paused;
+    }
+
+    uint256 private startSlot;
+
+    function migrate() public onlyOwner {
+        OldLayout storage oldLayout = _oldLayout();
+        NewLayout storage newLayout = _newLayout();
+        OldLayout memory oldLayoutCache = oldLayout;
+
+        // Clear the old storage layout
+        oldLayout.nouns = address(0);
+        oldLayout.weth = address(0);
+        oldLayout.timeBuffer = 0;
+        oldLayout.reservePrice = 0;
+        oldLayout.minBidIncrementPercentage = 0;
+        oldLayout.duration = 0;
+        oldLayout.auction = INounsAuctionHouse.Auction(0, 0, 0, 0, payable(0), false);
+
+        // Populate the new layout from the cache
+        newLayout.reservePrice = uint192(oldLayoutCache.reservePrice);
+        newLayout.timeBuffer = uint56(oldLayoutCache.timeBuffer);
+        newLayout.minBidIncrementPercentage = oldLayoutCache.minBidIncrementPercentage;
+        newLayout.auction = INounsAuctionHouseV2.AuctionV2({
+            nounId: uint128(oldLayoutCache.auction.nounId),
+            amount: uint128(oldLayoutCache.auction.amount),
+            startTime: uint40(oldLayoutCache.auction.startTime),
+            endTime: uint40(oldLayoutCache.auction.endTime),
+            bidder: oldLayoutCache.auction.bidder,
+            settled: oldLayoutCache.auction.settled
+        });
+        newLayout.paused = paused();
+    }
+
+    function _oldLayout() internal pure returns (OldLayout storage layout) {
+        assembly {
+            layout.slot := startSlot.slot
+        }
+    }
+
+    function _newLayout() internal pure returns (NewLayout storage layout) {
+        assembly {
+            layout.slot := startSlot.slot
+        }
+    }
+}