[hebao] Optimized memory copies (#1714)

Brechtpd · dong77 · web-flow · commit 06279464d4f9 · 2020-09-10T03:44:43.000+02:00
* [hebao] Optimized memory copies

* Update AddressUtil.sol

* Update AddressUtil.sol

* [hebao] Revert to normal calls in smart wallet

Co-authored-by: Daniel Wang &lt;daniel@loopring.org&gt;
diff --git a/packages/hebao_v1/contracts/base/BaseWallet.sol b/packages/hebao_v1/contracts/base/BaseWallet.sol
@@ -266,10 +266,10 @@ abstract contract BaseWallet is ReentrancyGuard, Wallet
     // This call is introduced to support reentrany check.
     // The caller shall NOT have the nonReentrant modifier.
     function nonReentrantCall(
-        uint8        mode,
-        address      target,
-        uint         value,
-        bytes memory data
+        uint8          mode,
+        address        target,
+        uint           value,
+        bytes calldata data
         )
         private
         nonReentrant
diff --git a/packages/hebao_v1/contracts/lib/AddressUtil.sol b/packages/hebao_v1/contracts/lib/AddressUtil.sol
@@ -34,7 +34,7 @@ library AddressUtil
         pure
         returns (address payable)
     {
-        return address(uint160(addr));
+        return payable(addr);
     }
 
     // Works like address.send but with a customizable gas limit
@@ -68,4 +68,49 @@ library AddressUtil
         success = to.sendETH(amount, gasLimit);
         require(success, "TRANSFER_FAILURE");
     }
+
+    // Works like call but is slightly more efficient when data
+    // needs to be copied from memory to do the call.
+    function fastCall(
+        address to,
+        uint    gasLimit,
+        uint    value,
+        bytes   memory data
+        )
+        internal
+        returns (bool success, bytes memory returnData)
+    {
+        if (to != address(0)) {
+            assembly {
+                // Do the call
+                success := call(gasLimit, to, value, add(data, 32), mload(data), 0, 0)
+                // Copy the return data
+                let size := returndatasize()
+                returnData := mload(0x40)
+                mstore(returnData, size)
+                returndatacopy(add(returnData, 32), 0, size)
+                // Update free memory pointer
+                mstore(0x40, add(returnData, add(32, size)))
+            }
+        }
+    }
+
+    // Like fastCall, but throws when the call is unsuccessful.
+    function fastCallAndVerify(
+        address to,
+        uint    gasLimit,
+        uint    value,
+        bytes   memory data
+        )
+        internal
+        returns (bytes memory returnData)
+    {
+        bool success;
+        (success, returnData) = fastCall(to, gasLimit, value, data);
+        if (!success) {
+            assembly {
+                revert(add(returnData, 32), mload(returnData))
+            }
+        }
+    }
 }
diff --git a/packages/hebao_v1/contracts/modules/base/BaseModule.sol b/packages/hebao_v1/contracts/modules/base/BaseModule.sol
@@ -184,7 +184,7 @@ abstract contract BaseModule is ReentrancyGuard, Module
         address wallet,
         address to,
         uint    value,
-        bytes   memory data
+        bytes   calldata data
         )
         internal
         returns (bytes memory)
@@ -195,7 +195,7 @@ abstract contract BaseModule is ReentrancyGuard, Module
     function transactStaticCall(
         address wallet,
         address to,
-        bytes   memory data
+        bytes   calldata data
         )
         internal
         returns (bytes memory)
diff --git a/packages/hebao_v1/contracts/modules/core/ForwarderModule.sol b/packages/hebao_v1/contracts/modules/core/ForwarderModule.sol
@@ -3,6 +3,7 @@
 pragma solidity ^0.7.0;
 pragma experimental ABIEncoderV2;
 
+import "../../lib/AddressUtil.sol";
 import "../../lib/EIP712.sol";
 import "../../lib/ERC20.sol";
 import "../../lib/MathUint.sol";
@@ -17,6 +18,7 @@ import "./WalletFactory.sol";
 /// @author Daniel Wang - <daniel@loopring.org>
 abstract contract ForwarderModule is BaseModule
 {
+    using AddressUtil   for address;
     using BytesUtil     for bytes;
     using MathUint      for uint;
     using SignatureUtil for bytes32;
diff --git a/packages/hebao_v1/contracts/modules/transfers/BaseTransferModule.sol b/packages/hebao_v1/contracts/modules/transfers/BaseTransferModule.sol
@@ -39,7 +39,7 @@ abstract contract BaseTransferModule is SecurityModule
         address token,
         address to,
         uint    amount,
-        bytes   memory logdata
+        bytes   calldata logdata
         )
         internal
     {
@@ -80,7 +80,7 @@ abstract contract BaseTransferModule is SecurityModule
         address wallet,
         address to,
         uint    value,
-        bytes   memory txData
+        bytes   calldata txData
         )
         internal
         virtual
diff --git a/packages/hebao_v1/contracts/thirdparty/ens/BaseENSManager.sol b/packages/hebao_v1/contracts/thirdparty/ens/BaseENSManager.sol
@@ -162,8 +162,8 @@ contract BaseENSManager is IENSManager, OwnerManagable, ENSConsumer {
     function verifyApproval(
         address _wallet,
         address _owner,
-        string  memory _label,
-        bytes   memory _approval
+        string  calldata _label,
+        bytes   calldata _approval
         )
         internal
         view
diff --git a/packages/hebao_v1/legacy/version1.0/contracts/transfers/QuotaTransfers.sol b/packages/hebao_v1/legacy/version1.0/contracts/transfers/QuotaTransfers.sol
@@ -152,7 +152,7 @@ contract QuotaTransfers is TransferModule
         address wallet,
         address to,
         uint    value,
-        bytes   memory txData
+        bytes   calldata txData
         )
         internal
         override
diff --git a/packages/hebao_v1/legacy/version1.0/contracts/transfers/TransferModule.sol b/packages/hebao_v1/legacy/version1.0/contracts/transfers/TransferModule.sol
@@ -93,7 +93,7 @@ abstract contract TransferModule is SecurityModule
         address wallet,
         address to,
         uint    value,
-        bytes   memory txData
+        bytes   calldata txData
         )
         internal
         virtual
diff --git a/packages/loopring_v3/contracts/lib/AddressUtil.sol b/packages/loopring_v3/contracts/lib/AddressUtil.sol
@@ -68,4 +68,49 @@ library AddressUtil
         success = to.sendETH(amount, gasLimit);
         require(success, "TRANSFER_FAILURE");
     }
+
+    // Works like call but is slightly more efficient when data
+    // needs to be copied from memory to do the call.
+    function fastCall(
+        address to,
+        uint    gasLimit,
+        uint    value,
+        bytes   memory data
+        )
+        internal
+        returns (bool success, bytes memory returnData)
+    {
+        if (to != address(0)) {
+            assembly {
+                // Do the call
+                success := call(gasLimit, to, value, add(data, 32), mload(data), 0, 0)
+                // Copy the return data
+                let size := returndatasize()
+                returnData := mload(0x40)
+                mstore(returnData, size)
+                returndatacopy(add(returnData, 32), 0, size)
+                // Update free memory pointer
+                mstore(0x40, add(returnData, add(32, size)))
+            }
+        }
+    }
+
+    // Like fastCall, but throws when the call is unsuccessful.
+    function fastCallAndVerify(
+        address to,
+        uint    gasLimit,
+        uint    value,
+        bytes   memory data
+        )
+        internal
+        returns (bytes memory returnData)
+    {
+        bool success;
+        (success, returnData) = fastCall(to, gasLimit, value, data);
+        if (!success) {
+            assembly {
+                revert(add(returnData, 32), mload(returnData))
+            }
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ abstract contract BaseTransferModule is SecurityModule`
`39`	`39`	`address token,`
`40`	`40`	`address to,`
`41`	`41`	`uint amount,`
`42`		`- bytes memory logdata`
	`42`	`+ bytes calldata logdata`
`43`	`43`	`)`
`44`	`44`	`internal`
`45`	`45`	`{`
`@@ -80,7 +80,7 @@ abstract contract BaseTransferModule is SecurityModule`
`80`	`80`	`address wallet,`
`81`	`81`	`address to,`
`82`	`82`	`uint value,`
`83`		`- bytes memory txData`
	`83`	`+ bytes calldata txData`
`84`	`84`	`)`
`85`	`85`	`internal`
`86`	`86`	`virtual`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ contract QuotaTransfers is TransferModule`
`152`	`152`	`address wallet,`
`153`	`153`	`address to,`
`154`	`154`	`uint value,`
`155`		`- bytes memory txData`
	`155`	`+ bytes calldata txData`
`156`	`156`	`)`
`157`	`157`	`internal`
`158`	`158`	`override`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ abstract contract TransferModule is SecurityModule`
`93`	`93`	`address wallet,`
`94`	`94`	`address to,`
`95`	`95`	`uint value,`
`96`		`- bytes memory txData`
	`96`	`+ bytes calldata txData`
`97`	`97`	`)`
`98`	`98`	`internal`
`99`	`99`	`virtual`