Simplify Casting (#128)

* abi.decode * indent fix

Simplify Casting (#128)
* abi.decode * indent fix
644e437c · Alina · GitHub · f53f7653 · 644e437c
Commit 644e437c authored Dec 11, 2020 by Alina Committed by GitHub Dec 11, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

Lib_BytesUtils.sol ...ts/optimistic-ethereum/libraries/utils/Lib_BytesUtils.sol +8 -4

No files found.
--- a/packages/contracts/contracts/optimistic-ethereum/libraries/utils/Lib_BytesUtils.sol
+++ b/packages/contracts/contracts/optimistic-ethereum/libraries/utils/Lib_BytesUtils.sol
@@ -177,11 +177,15 @@ library Lib_BytesUtils {
        pure
        returns (bytes32)
    {
-        bytes32 ret;
-        assembly {
-            ret := mload(add(_bytes, 32))
+        if (_bytes.length < 32) {
+            bytes32 ret;
+            assembly {
+                ret := mload(add(_bytes, 32))
+            }
+            return ret;
        }
-        return ret;
+
+        return abi.decode(_bytes,(bytes32)); // will truncate if input length > 32 bytes
    }

    function toUint256(