Compilation error

0xProject · Feb 10, 2025 · 5eac0b1 · 5eac0b1
1 parent 7a92436
commit 5eac0b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/multicall/MultiCall.sol b/src/multicall/MultiCall.sol
@@ -77,7 +77,10 @@ library SafeCall {
 
     /// This version of `safeCall` omits the OOG check because it bubbles the revert if the call
     /// reverts. Therefore, `success` is always `true`.
-    function safeCall(address target, bytes calldata data, address sender) internal returns (bool success, bytes memory returndata) {
+    function safeCall(address target, bytes calldata data, address sender)
+        internal
+        returns (bool success, bytes memory returndata)
+    {
         assembly ("memory-safe") {
             returndata := mload(0x40)
             calldatacopy(returndata, data.offset, data.length)

diff --git a/src/multicall/MultiCallContext.sol b/src/multicall/MultiCallContext.sol
@@ -25,7 +25,9 @@ interface IMultiCall {
 }
 
 abstract contract MultiCallContext is Context {
-    IMultiCall internal constant _MULTICALL = IMultiCall(0x000000000000deaDdeAddEADdEaddeaDDEADDeAd); // TODO:
+    address private constant _MULTICALL_ADDRESS = 0x000000000000deaDdeAddEADdEaddeaDDEADDeAd; // TODO:
+
+    IMultiCall internal constant _MULTICALL = IMultiCall(_MULTICALL_ADDRESS);
 
     function _isForwarded() internal view virtual override returns (bool) {
         return super._isForwarded() || super._msgSender() == address(_MULTICALL);
@@ -37,7 +39,11 @@ abstract contract MultiCallContext is Context {
             sender := and(0xffffffffffffffffffffffffffffffffffffffff, sender)
             // ERC-2771. The trusted forwarder (`_MULTICALL`) has appended the appropriate
             // msg.sender to the msg data
-            sender := xor(sender, mul(xor(sender, shr(0x60, calldataload(sub(calldatasize(), 0x14)))), eq(_MULTICALL, sender)))
+            sender :=
+                xor(
+                    sender,
+                    mul(xor(sender, shr(0x60, calldataload(sub(calldatasize(), 0x14)))), eq(_MULTICALL_ADDRESS, sender))
+                )
         }
     }
 }