rebase main snapshot

Author: anna-carroll

.gas-snapshot

@@ -1,18 +1,18 @@
-OrdersTest:test_fill_ERC20() (gas: 70364)
-OrdersTest:test_fill_ETH() (gas: 68414)
-OrdersTest:test_fill_both() (gas: 166580)
-OrdersTest:test_fill_multiETH() (gas: 131926)
-OrdersTest:test_fill_underflowETH() (gas: 115281)
-OrdersTest:test_initiate_ERC20() (gas: 81435)
-OrdersTest:test_initiate_ETH() (gas: 44949)
-OrdersTest:test_initiate_both() (gas: 118677)
-OrdersTest:test_initiate_multiERC20() (gas: 722408)
-OrdersTest:test_initiate_multiETH() (gas: 75304)
-OrdersTest:test_onlyBuilder() (gas: 12815)
-OrdersTest:test_orderExpired() (gas: 27956)
-OrdersTest:test_sweepERC20() (gas: 60446)
-OrdersTest:test_sweepETH() (gas: 81940)
-OrdersTest:test_underflowETH() (gas: 63528)
+OrdersTest:test_fill_ERC20() (gas: 70421)
+OrdersTest:test_fill_ETH() (gas: 68471)
+OrdersTest:test_fill_both() (gas: 166672)
+OrdersTest:test_fill_multiETH() (gas: 132018)
+OrdersTest:test_fill_underflowETH() (gas: 115373)
+OrdersTest:test_initiate_ERC20() (gas: 81537)
+OrdersTest:test_initiate_ETH() (gas: 45051)
+OrdersTest:test_initiate_both() (gas: 118766)
+OrdersTest:test_initiate_multiERC20() (gas: 722497)
+OrdersTest:test_initiate_multiETH() (gas: 75393)
+OrdersTest:test_onlyBuilder() (gas: 12837)
+OrdersTest:test_orderExpired() (gas: 28037)
+OrdersTest:test_sweepERC20() (gas: 60468)
+OrdersTest:test_sweepETH() (gas: 82064)
+OrdersTest:test_underflowETH() (gas: 63575)
 PassageTest:test_configureEnter() (gas: 82311)
 PassageTest:test_disallowedEnter() (gas: 17938)
 PassageTest:test_enter() (gas: 25507)