Replace excodesize assembly with address.code.length (https://github.…

…com/ethereum/solidity/releases/tag/v0.8.1) (OpenZeppelin#3025)
zjhdoit · Dec 15, 2021 · d95cdaa · d95cdaa
1 parent 4a9cc8b
commit d95cdaa
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/contracts/utils/Address.sol b/contracts/utils/Address.sol
@@ -34,15 +34,11 @@ library Address {
      * ====
      */
     function isContract(address account) internal view returns (bool) {
-        // This method relies on extcodesize, which returns 0 for contracts in
-        // construction, since the code is only stored at the end of the
-        // constructor execution.
+        // This method relies on extcodesize/address.code.length, which returns 0
+        // for contracts in construction, since the code is only stored at the end
+        // of the constructor execution.
 
-        uint256 size;
-        assembly {
-            size := extcodesize(account)
-        }
-        return size > 0;
+        return account.code.length > 0;
     }
 
     /**