From a5d7f4b70d5540e5a6d1f85f775dac45819e1ed2 Mon Sep 17 00:00:00 2001
From: Anton Bukov <k06aaa@gmail.com>
Date: Fri, 29 Sep 2023 00:28:07 +0200
Subject: [PATCH] Fix maker permit

---
 contracts/OrderMixin.sol | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/OrderMixin.sol b/contracts/OrderMixin.sol
index cc0ef730..2a7c564b 100644
--- a/contracts/OrderMixin.sol
+++ b/contracts/OrderMixin.sol
@@ -171,7 +171,7 @@ abstract contract OrderMixin is IOrderMixin, EIP712, OnlyWethReceiver, Predicate
             address maker = order.maker.get();
             if (maker == address(0) || maker != ECDSA.recover(orderHash, r, vs)) revert BadSignature();
             if (!takerTraits.skipMakerPermit()) {
-                _applyMakerPermit(order, orderHash, extension);
+                _applyMakerPermit(order, orderHash, maker, extension);
             }
         }
 
@@ -224,7 +224,7 @@ abstract contract OrderMixin is IOrderMixin, EIP712, OnlyWethReceiver, Predicate
         if (remainingMakingAmount == order.makingAmount) {
             if (!ECDSA.isValidSignature(order.maker.get(), orderHash, signature)) revert BadSignature();
             if (!takerTraits.skipMakerPermit()) {
-                _applyMakerPermit(order, orderHash, extension);
+                _applyMakerPermit(order, orderHash, order.maker.get(), extension);
             }
         }
 
@@ -505,11 +505,11 @@ abstract contract OrderMixin is IOrderMixin, EIP712, OnlyWethReceiver, Predicate
       * @param orderHash The hash of the order.
       * @param extension The extension data associated with the order.
       */
-    function _applyMakerPermit(IOrderMixin.Order calldata order, bytes32 orderHash, bytes calldata extension) private {
+    function _applyMakerPermit(IOrderMixin.Order calldata order, bytes32 orderHash, address maker, bytes calldata extension) private {
         bytes calldata makerPermit = extension.makerPermit();
         if (makerPermit.length >= 20) {
             // proceed only if taker is willing to execute permit and its length is enough to store address
-            IERC20(address(bytes20(makerPermit))).tryPermit(msg.sender, address(this), makerPermit[20:]);
+            IERC20(address(bytes20(makerPermit))).tryPermit(maker, address(this), makerPermit[20:]);
             if (!order.makerTraits.useBitInvalidator()) {
                 // Bit orders are not subjects for reentrancy, but we still need to check remaining-based orders for reentrancy
                 if (!_remainingInvalidator[order.maker.get()][orderHash].isNewOrder()) revert ReentrancyDetected();