Merge branch 'dev' into dev-1126-safety-checks-erc4626

Author: lucas-manuel

src/MainnetController.sol

@@ -273,11 +273,15 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
     function setOTCBuffer(address exchange, address otcBuffer) external nonReentrant {
         _checkRole(DEFAULT_ADMIN_ROLE);
 
-        require(exchange != address(0), "MC/exchange-zero-address");
-        require(exchange != otcBuffer,  "MC/exchange-equals-otcBuffer");
+        require(exchange  != address(0), "MC/exchange-zero-address");
+        require(otcBuffer != address(0), "MC/otcBuffer-zero-address");
+        require(exchange  != otcBuffer,  "MC/exchange-equals-otcBuffer");
 
         OTC storage otc = otcs[exchange];
 
+        // Prevent rotating buffer while a swap is pending and not ready
+        require(otc.sentTimestamp == 0 || isOtcSwapReady(exchange), "MC/swap-in-progress");
+ 
         emit OTCBufferSet(exchange, otc.buffer, otcBuffer);
         otc.buffer = otcBuffer;
     }
@@ -1075,8 +1079,7 @@ contract MainnetController is ReentrancyGuard, AccessControlEnumerable {
 
         OTC storage otc = otcs[exchange];
 
-        // Just to check that OTC buffer exists
-        require(otc.buffer != address(0), "MC/otc-buffer-not-set");
+        // Its impossible to have zero address buffer because of whitelistedAssets.
         require(isOtcSwapReady(exchange), "MC/last-swap-not-returned");
 
         otc.sent18        = sent18;

test/mainnet-fork/OTCSwaps.t.sol

@@ -98,6 +98,24 @@ contract MainnetControllerOTCSwapBase is ForkTestBase {
 
 }
 
+// NOTE: This test requires the send to be executed first which requires ForkTestBase,
+//       therefore it is placed here instead of Admin.t.sol.
+contract MainnetControllerSetOTCBufferFailureTests is MainnetControllerOTCSwapBase {
+
+    function test_setOTCBuffer_swapInProgress() external {
+        deal(address(usdt), address(almProxy), 5_000_000e6);
+
+        // Execute OTC swap
+        vm.prank(relayer);
+        mainnetController.otcSend(exchange, address(usdt), 5_000_000e6);
+
+        vm.expectRevert("MC/swap-in-progress");
+        vm.prank(Ethereum.SPARK_PROXY);
+        mainnetController.setOTCBuffer(exchange, makeAddr("new-buffer"));
+    }
+
+}
+
 contract MainnetControllerOtcSendFailureTests is MainnetControllerOTCSwapBase {
 
     function test_otcSend_reentrancy() external {
@@ -166,15 +184,6 @@ contract MainnetControllerOtcSendFailureTests is MainnetControllerOTCSwapBase {
         mainnetController.otcSend(exchange, address(usds), 10_000_000e18);
     }
 
-    function test_otcSend_otcBufferNotSet() external {
-        vm.prank(Ethereum.SPARK_PROXY);
-        mainnetController.setOTCBuffer(exchange, address(0));
-
-        vm.prank(relayer);
-        vm.expectRevert("MC/otc-buffer-not-set");
-        mainnetController.otcSend(exchange, address(usdt), 1e6);
-    }
-
     function test_otcSend_transferFailed() external {
         address token = address(new MockTokenReturnFalse());
 

test/unit/controllers/Admin.t.sol

@@ -247,6 +247,12 @@ contract MainnetControllerSetOTCBufferTests is MainnetControllerAdminTestBase {
         mainnetController.setOTCBuffer(address(0), address(otcBuffer));
     }
 
+    function test_setOTCBuffer_otcBufferZero() external {
+        vm.prank(admin);
+        vm.expectRevert("MC/otcBuffer-zero-address");
+        mainnetController.setOTCBuffer(exchange, address(0));
+    }
+
     function test_setOTCBuffer_exchangeEqualsOTCBuffer() external {
         vm.prank(admin);
         vm.expectRevert("MC/exchange-equals-otcBuffer");