Merge branch 'modular-exponentiation-precompile-wrapper-OpenZeppelin#…

…1985' of https://github.com/mw2000/openzeppelin-contracts into modular-exponentiation-precompile-wrapper-OpenZeppelin#1985
mw2000 · Jun 25, 2023 · d81d69d · d81d69d
2 parents a1c1439 + 01badeb
commit d81d69d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/contracts/token/ERC1155/IERC1155.sol b/contracts/token/ERC1155/IERC1155.sol
@@ -108,7 +108,7 @@ interface IERC1155 is IERC165 {
      *
      *
      * WARNING: This function can potentially allow a reentrancy attack when transferring tokens
-     * to an untrusted contract, when invoking {onERC1155Received} on the receiver.
+     * to an untrusted contract, when invoking {onERC1155BatchReceived} on the receiver.
      * Ensure to follow the checks-effects-interactions pattern and consider employing
      * reentrancy guards when interacting with untrusted contracts.
      *

diff --git a/contracts/utils/math/Math.sol b/contracts/utils/math/Math.sol
@@ -414,10 +414,7 @@ library Math {
      */
     function modExp(uint256 b, uint256 e, uint256 m) internal view returns (uint256) {
         require(m != 0, "ModularExponentiation: Can't calculate for modulus equal to zero");
-        bool success;
-        bytes memory result;
-
-        (success, result) = (address(5).staticcall(abi.encode(32, 32, 32, b, e, m)));
+        (bool success, bytes memory result) = (address(5).staticcall(abi.encode(32, 32, 32, b, e, m)));
         require(success, "ModularExponentiation: Failed at calculating the result");
         return abi.decode(result, (uint256));
     }