Use force_bytes_to_address helper to generate address

Author: cburgdorf

eth/utils/address.py

@@ -15,7 +15,7 @@ def force_bytes_to_address(value: bytes) -> Address:
 
 
 def generate_contract_address(address: Address, nonce: bytes) -> Address:
-    return Address(keccak(rlp.encode([address, nonce]))[-20:])
+    return force_bytes_to_address(keccak(rlp.encode([address, nonce])))
 
 
 def generate_safe_contract_address(address: Address,

eth/vm/opcode_values.py

@@ -183,11 +183,11 @@
 # System
 #
 CREATE = 0xf0
-CREATE2 = 0xf5
 CALL = 0xf1
 CALLCODE = 0xf2
 RETURN = 0xf3
 DELEGATECALL = 0xf4
+CREATE2 = 0xf5
 STATICCALL = 0xfa
 REVERT = 0xfd
 SELFDESTRUCT = 0xff