eip2718: rename vm2 ChainId op code to ChainIdOp
this is to avoid clash with ChainId type imported from eth/common
This commit is contained in:
parent
96d1969017
commit
a2f77e8627
|
@ -505,7 +505,7 @@ template gasCosts(fork: Fork, prefix, ResultGasCostsName: untyped) =
|
||||||
Number: fixed GasBase,
|
Number: fixed GasBase,
|
||||||
Difficulty: fixed GasBase,
|
Difficulty: fixed GasBase,
|
||||||
GasLimit: fixed GasBase,
|
GasLimit: fixed GasBase,
|
||||||
ChainID: fixed GasBase,
|
ChainIdOp: fixed GasBase,
|
||||||
SelfBalance: fixed GasLow,
|
SelfBalance: fixed GasLow,
|
||||||
|
|
||||||
# 50s: Stack, Memory, Storage and Flow Operations
|
# 50s: Stack, Memory, Storage and Flow Operations
|
||||||
|
|
|
@ -101,7 +101,7 @@ type
|
||||||
Difficulty = 0x44, ## Get the block's difficulty.
|
Difficulty = 0x44, ## Get the block's difficulty.
|
||||||
GasLimit = 0x45, ## Get the block's gas limit.
|
GasLimit = 0x45, ## Get the block's gas limit.
|
||||||
|
|
||||||
ChainId = 0x46, ## Get current chain’s EIP-155 unique identifier.
|
ChainIdOp = 0x46, ## Get current chain’s EIP-155 unique identifier.
|
||||||
SelfBalance = 0x47, ## Get current contract's balance.
|
SelfBalance = 0x47, ## Get current contract's balance.
|
||||||
|
|
||||||
Nop0x48, Nop0x49, Nop0x4A, Nop0x4B, Nop0x4C, Nop0x4D,
|
Nop0x48, Nop0x49, Nop0x4A, Nop0x4B, Nop0x4C, Nop0x4D,
|
||||||
|
|
|
@ -123,7 +123,7 @@ const
|
||||||
run: gasLimitOp,
|
run: gasLimitOp,
|
||||||
post: vm2OpIgnore)),
|
post: vm2OpIgnore)),
|
||||||
|
|
||||||
(opCode: ChainId, ## 0x46, EIP-155 chain identifier
|
(opCode: ChainIdOp, ## 0x46, EIP-155 chain identifier
|
||||||
forks: Vm2OpIstanbulAndLater,
|
forks: Vm2OpIstanbulAndLater,
|
||||||
name: "chainId",
|
name: "chainId",
|
||||||
info: "Get current chain’s EIP-155 unique identifier",
|
info: "Get current chain’s EIP-155 unique identifier",
|
||||||
|
|
Loading…
Reference in New Issue