re-integrated 0x4# op handlers
This commit is contained in:
Jordan Hrycaj
zah
parent
a9719f2dae
commit
0f1c7cee43
|
|
@ -20,7 +20,7 @@ import
|
|||
strformat,
|
||||
./op_codes,
|
||||
./op_handlers/[oph_defs,
|
||||
oph_arithmetic, oph_hash, oph_envinfo,
|
||||
oph_arithmetic, oph_hash, oph_envinfo, oph_blockdata,
|
||||
oph_sysops]
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
@ -55,6 +55,11 @@ const
|
|||
doAssert rc[w.opCode].info == ""
|
||||
rc[w.opCode] = w
|
||||
|
||||
for w in vm2OpExecBlockData:
|
||||
if w.complain("BlockData"):
|
||||
doAssert rc[w.opCode].info == ""
|
||||
rc[w.opCode] = w
|
||||
|
||||
for w in vm2OpExecSysOP:
|
||||
if w.complain("SysOp"):
|
||||
doAssert rc[w.opCode].info == ""
|
||||
|
|
|
|||
|
|
@ -0,0 +1,174 @@
|
|||
# Nimbus
|
||||
# Copyright (c) 2018 Status Research & Development GmbH
|
||||
# Licensed under either of
|
||||
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
|
||||
# http://www.apache.org/licenses/LICENSE-2.0)
|
||||
# * MIT license ([LICENSE-MIT](LICENSE-MIT) or
|
||||
# http://opensource.org/licenses/MIT)
|
||||
# at your option. This file may not be copied, modified, or distributed except
|
||||
# according to those terms.
|
||||
|
||||
## EVM Opcode Handlers: Block Data
|
||||
## ===============================
|
||||
##
|
||||
|
||||
const
|
||||
kludge {.intdefine.}: int = 0
|
||||
breakCircularDependency {.used.} = kludge > 0
|
||||
|
||||
import
|
||||
./oph_defs,
|
||||
stint
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Kludge BEGIN
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
when not breakCircularDependency:
|
||||
import
|
||||
../../stack,
|
||||
../../v2computation,
|
||||
../../v2state,
|
||||
eth/common,
|
||||
times
|
||||
|
||||
else:
|
||||
import macros
|
||||
|
||||
# copied from stack.nim
|
||||
macro genTupleType(len: static[int], elemType: untyped): untyped =
|
||||
result = nnkTupleConstr.newNimNode()
|
||||
for i in 0 ..< len: result.add(elemType)
|
||||
|
||||
# function stubs from stack.nim (to satisfy compiler logic)
|
||||
proc push[T](x: Stack; n: T) = discard
|
||||
proc popInt(x: var Stack, n: static[int]): auto =
|
||||
var rc: genTupleType(n, UInt256)
|
||||
return rc
|
||||
|
||||
# function stubs from v2computation.nim (to satisfy compiler logic)
|
||||
proc getBalance[T](c: Computation, address: T): Uint256 = 0.u256
|
||||
proc getBlockHash(c: Computation, blockNumber: Uint256): Uint256 = 0.u256
|
||||
proc getCoinbase(c: Computation): Uint256 = 0.u256
|
||||
proc getTimestamp(c: Computation): int64 = 0
|
||||
proc getBlockNumber(c: Computation): Uint256 = 0.u256
|
||||
proc getDifficulty(c: Computation): int = 0
|
||||
proc getGasLimit(c: Computation): int = 0
|
||||
proc getChainId(c: Computation): uint = 0
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Kludge END
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Private, op handlers implementation
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
const
|
||||
blockhashOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x40, Get the hash of one of the 256 most recent complete blocks.
|
||||
let (blockNumber) = k.cpt.stack.popInt(1)
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getBlockHash(blockNumber)
|
||||
|
||||
coinBaseOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x41, Get the block's beneficiary address.
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getCoinbase
|
||||
|
||||
timestampOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x42, Get the block's timestamp.
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getTimestamp
|
||||
|
||||
blocknumberOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x43, Get the block's number.
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getBlockNumber
|
||||
|
||||
difficultyOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x44, Get the block's difficulty
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getDifficulty
|
||||
|
||||
gasLimitOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x45, Get the block's gas limit
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getGasLimit
|
||||
|
||||
chainIdOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x46, Get current chain’s EIP-155 unique identifier.
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getChainId
|
||||
|
||||
selfBalanceOp: Vm2OpFn = proc (k: Vm2Ctx) =
|
||||
## 0x47, Get current contract's balance.
|
||||
k.cpt.stack.push:
|
||||
k.cpt.getBalance(k.cpt.msg.contractAddress)
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Public, op exec table entries
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
const
|
||||
vm2OpExecBlockData*: seq[Vm2OpExec] = @[
|
||||
|
||||
(opCode: Blockhash, ## 0x40, Hash of some most recent complete block
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get the hash of one of the 256 most recent complete blocks",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: blockhashOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: Coinbase, ## 0x41, Beneficiary address
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get the block's beneficiary address",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: coinBaseOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: Timestamp, ## 0x42, Block timestamp.
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get the block's timestamp",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: timestampOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: Number, ## 0x43, Block number
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get the block's number",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: blocknumberOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: Difficulty, ## 0x44, Block difficulty
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get the block's difficulty",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: difficultyOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: GasLimit, ## 0x45, Block gas limit
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get the block's gas limit",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: gasLimitOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: ChainId, ## 0x46, EIP-155 chain identifier
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get current chain’s EIP-155 unique identifier",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: chainIdOp,
|
||||
post: vm2OpIgnore)),
|
||||
|
||||
(opCode: SelfBalance, ## 0x47, Contract balance.
|
||||
forks: Vm2OpAllForks,
|
||||
info: "Get current contract's balance",
|
||||
exec: (prep: vm2OpIgnore,
|
||||
run: selfBalanceOp,
|
||||
post: vm2OpIgnore))]
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# End
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
@ -115,41 +115,14 @@ opHandler extCodeSize, Op.ExtCodeSize
|
|||
opHandler extCodeCopy, Op.ExtCodeCopy
|
||||
opHandler returnDataSize, Op.ReturnDataSize
|
||||
opHandler returnDataCopy, Op.ReturnDataCopy
|
||||
|
||||
# ##########################################
|
||||
# 40s: Block Information
|
||||
|
||||
op blockhash, inline = true, blockNumber:
|
||||
## 0x40, Get the hash of one of the 256 most recent complete blocks.
|
||||
push: c.getBlockHash(blockNumber)
|
||||
|
||||
op coinbase, inline = true:
|
||||
## 0x41, Get the block's beneficiary address.
|
||||
push: c.getCoinbase()
|
||||
|
||||
op timestamp, inline = true:
|
||||
## 0x42, Get the block's timestamp.
|
||||
push: c.getTimestamp()
|
||||
|
||||
op blocknumber, inline = true:
|
||||
## 0x43, Get the block's number.
|
||||
push: c.getBlockNumber()
|
||||
|
||||
op difficulty, inline = true:
|
||||
## 0x44, Get the block's difficulty
|
||||
push: c.getDifficulty()
|
||||
|
||||
op gasLimit, inline = true:
|
||||
## 0x45, Get the block's gas limit
|
||||
push: c.getGasLimit()
|
||||
|
||||
op chainId, inline = true:
|
||||
## 0x46, Get current chain’s EIP-155 unique identifier.
|
||||
push: c.getChainId()
|
||||
|
||||
op selfBalance, inline = true:
|
||||
## 0x47, Get current contract's balance.
|
||||
push: c.getBalance(c.msg.contractAddress)
|
||||
opHandler blockhash, Op.Blockhash
|
||||
opHandler coinbase, Op.Coinbase
|
||||
opHandler timestamp, Op.Timestamp
|
||||
opHandler blocknumber, Op.Number
|
||||
opHandler difficulty, Op.Difficulty
|
||||
opHandler gasLimit, Op.GasLimit
|
||||
opHandler chainId, Op.ChainId
|
||||
opHandler selfBalance, Op.SelfBalance
|
||||
|
||||
# ##########################################
|
||||
# 50s: Stack, Memory, Storage and Flow Operations
|
||||
|
|
|
|||
Loading…
Reference in New Issue