gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd/evm, core/vm, test: refactored VM and core

Browse Source 
* Moved `vm.Transfer` to `core` package and changed execution to call
`env.Transfer` instead of `core.Transfer` directly.
* core/vm: byte code VM moved to jump table instead of switch
* Moved `vm.Transfer` to `core` package and changed execution to call
  `env.Transfer` instead of `core.Transfer` directly.
* Byte code VM now shares the same code as the JITVM
* Renamed Context to Contract
* Changed initialiser of state transition & unexported methods
* Removed the Execution object and refactor `Call`, `CallCode` &
  `Create` in to their own functions instead of being methods.
* Removed the hard dep on the state for the VM. The VM now
  depends on a Database interface returned by the environment. In the
  process the core now depends less on the statedb by usage of the env
* Moved `Log` from package `core/state` to package `core/vm`.
This commit is contained in:
Jeffrey Wilcke
2015-08-30 10:19:10 +02:00
parent f7a71996fb
commit 361082ec4b
39 changed files with 966 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eth/filters/filter.go
View File

@ -21,8 +21,8 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
)
type AccountChange struct {
@ -39,9 +39,9 @@ type Filter struct {
max int
topics [][]common.Hash
BlockCallback func(*types.Block, state.Logs)
BlockCallback func(*types.Block, vm.Logs)
TransactionCallback func(*types.Transaction)
LogsCallback func(state.Logs)
LogsCallback func(vm.Logs)
}
// Create a new filter which uses a bloom filter on blocks to figure out whether a particular block
@ -78,7 +78,7 @@ func (self *Filter) SetSkip(skip int) {
}
// Run filters logs with the current parameters set
func (self *Filter) Find() state.Logs {
func (self *Filter) Find() vm.Logs {
earliestBlock := core.GetCurrentBlock(self.db)
var earliestBlockNo uint64 = uint64(self.earliest)
if self.earliest == -1 {
@ -90,7 +90,7 @@ func (self *Filter) Find() state.Logs {
}
var (
logs state.Logs
logs vm.Logs
block = core.GetBlockByNumber(self.db, latestBlockNo)
)
@ -112,7 +112,7 @@ done:
// Get the logs of the block
var (
receipts = core.GetBlockReceipts(self.db, block.Hash())
unfiltered state.Logs
unfiltered vm.Logs
)
for _, receipt := range receipts {
unfiltered = append(unfiltered, receipt.Logs()...)
@ -138,8 +138,8 @@ func includes(addresses []common.Address, a common.Address) bool {
return false
}
func (self *Filter) FilterLogs(logs state.Logs) state.Logs {
var ret state.Logs
func (self *Filter) FilterLogs(logs vm.Logs) vm.Logs {
var ret vm.Logs
// Filter the logs for interesting stuff
Logs:

6
eth/filters/filter_system.go
View File

@ -22,7 +22,7 @@ import (
"sync"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/event"
)
@ -89,7 +89,7 @@ func (fs *FilterSystem) filterLoop() {
//core.PendingBlockEvent{},
core.ChainEvent{},
core.TxPreEvent{},
state.Logs(nil))
vm.Logs(nil))
out:
for {
@ -116,7 +116,7 @@ out:
}
fs.filterMu.RUnlock()
case state.Logs:
case vm.Logs:
fs.filterMu.RLock()
for _, filter := range fs.filters {
if filter.LogsCallback != nil {