Merge 3cc6c2f into 6791956

EIPS/eip-1153.md

@@ -17,8 +17,8 @@ requires: 2200, 3529
 This proposal introduces transient storage opcodes, which manipulate state that behaves identically to storage, except that transient storage is discarded after every transaction. In other words, the values of transient storage are never deserialized from storage or serialized to storage. Thus transient storage is cheaper since it never requires disk access. Transient storage is accessible to smart contracts via 2 new opcodes, `TLOAD` and `TSTORE`, where “T” stands for "transient:"
 
 ```
-TLOAD  (0xb3)
-TSTORE (0xb4)
+TLOAD  (0x5c)
+TSTORE (0x5d)
 ```
 
 ## Motivation
@@ -42,7 +42,7 @@ These opcodes are more efficient to execute than the `SSTORE` and `SLOAD` opcode
 
 ## Specification
 
-Two new opcodes are added to EVM, `TLOAD` (`0xb3`) and `TSTORE` (`0xb4`). Note that previous drafts of this EIP specified the values `0x5c` and `0x5d` for `TLOAD` and `TSTORE` respectively, but these have been modified so as not to conflict with other draft EIPs.
+Two new opcodes are added to EVM, `TLOAD` (`0x5c`) and `TSTORE` (`0x5d`). (Note that previous drafts of this EIP specified the values `0xb3` and `0xb4` for `TLOAD` and `TSTORE` respectively to avoid conflict with other EIPs. The conflict has since been removed.)
 
 They use the same arguments on stack as `SLOAD` (`0x54`) and `SSTORE` (`0x55`).