roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

moved state and vm to core

Browse Source
This commit is contained in:
obscuren 2015-03-23 16:59:09 +01:00
parent d7eaa97a29
commit 0330077d76
58 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/disasm/main.go
View File

@ -6,7 +6,7 @@ import (
"os" "os"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
func main() { func main() {

2
cmd/ethereum/admin.go
View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
"github.com/robertkrimen/otto" "github.com/robertkrimen/otto"
) )

2
cmd/ethereum/main.go
View File

@ -36,7 +36,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/peterh/liner" "github.com/peterh/liner"
) )

4
cmd/ethtest/main.go
View File

@ -36,9 +36,9 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/tests/helper" "github.com/ethereum/go-ethereum/tests/helper"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type Log struct { type Log struct {

4
cmd/evm/main.go
View File

@ -35,8 +35,8 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
var ( var (

2
cmd/mist/bindings.go
View File

@ -28,7 +28,7 @@ import (
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type plugin struct { type plugin struct {

2
core/asm.go
View File

@ -5,7 +5,7 @@ import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
func Disassemble(script []byte) (asm []string) { func Disassemble(script []byte) (asm []string) {

2
core/block_processor.go
View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"gopkg.in/fatih/set.v0" "gopkg.in/fatih/set.v0"
) )

2
core/chain_makers.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
// So we can generate blocks easily // So we can generate blocks easily

2
core/chain_manager.go
View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
var ( var (

2
core/events.go
View File

@ -2,7 +2,7 @@ package core
import ( import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
// TxPreEvent is posted when a transaction enters the transaction pool. // TxPreEvent is posted when a transaction enters the transaction pool.

4
core/execution.go
View File

@ -6,8 +6,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type Execution struct { type Execution struct {

2
core/filter.go
View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type AccountChange struct { type AccountChange struct {

2
core/genesis.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
/* /*

0
state/dump.go → core/state/dump.go
View File

0
state/errors.go → core/state/errors.go
View File

0
state/log.go → core/state/log.go
View File

0
state/main_test.go → core/state/main_test.go
View File

0
state/managed_state.go → core/state/managed_state.go
View File

0
state/managed_state_test.go → core/state/managed_state_test.go
View File

0
state/state_object.go → core/state/state_object.go
View File

0
state/state_test.go → core/state/state_test.go
View File

0
state/statedb.go → core/state/statedb.go
View File

4
core/state_transition.go
View File

@ -6,8 +6,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
const tryJit = false const tryJit = false

2
core/transaction_pool_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
// State query interface // State query interface

2
core/types/bloom9.go
View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
func CreateBloom(receipts Receipts) Bloom { func CreateBloom(receipts Receipts) Bloom {

2
core/types/bloom9_test.go
View File

@ -4,7 +4,7 @@ package types
import ( import (
"testing" "testing"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
func TestBloom9(t *testing.T) { func TestBloom9(t *testing.T) {

2
core/types/common.go
View File

@ -4,7 +4,7 @@ import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"fmt" "fmt"
) )

2
core/types/receipt.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Receipt struct { type Receipt struct {

0
vm/address.go → core/vm/address.go
View File

0
vm/analysis.go → core/vm/analysis.go
View File

0
vm/asm.go → core/vm/asm.go
View File

0
vm/common.go → core/vm/common.go
View File

0
vm/context.go → core/vm/context.go
View File

2
vm/environment.go → core/vm/environment.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Environment interface { type Environment interface {

0
vm/errors.go → core/vm/errors.go
View File

0
vm/gas.go → core/vm/gas.go
View File

0
vm/main_test.go → core/vm/main_test.go
View File

0
vm/memory.go → core/vm/memory.go
View File

0
vm/stack.go → core/vm/stack.go
View File

0
vm/types.go → core/vm/types.go
View File

0
vm/virtual_machine.go → core/vm/virtual_machine.go
View File

2
vm/vm.go → core/vm/vm.go
View File

@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Vm struct { type Vm struct {

2
vm/vm_jit.go → core/vm/vm_jit.go
View File

@ -19,7 +19,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"math/big" "math/big"
"unsafe" "unsafe"
) )

0
vm/vm_jit_fake.go → core/vm/vm_jit_fake.go
View File

0
vm/vm_test.go → core/vm/vm_test.go
View File

4
core/vm_env.go
View File

@ -5,8 +5,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type VMEnv struct { type VMEnv struct {

2
eth/backend.go
View File

@ -21,7 +21,7 @@ import (
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/whisper" "github.com/ethereum/go-ethereum/whisper"
) )

2
event/filter/eth_filter.go
View File

@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type FilterManager struct { type FilterManager struct {

2
miner/worker.go
View File

@ -13,7 +13,7 @@ import (
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"gopkg.in/fatih/set.v0" "gopkg.in/fatih/set.v0"
) )

2
rpc/responses.go
View File

@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type BlockRes struct { type BlockRes struct {

2
tests/blocktest.go
View File

@ -15,7 +15,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
// Block Test JSON Format // Block Test JSON Format

4
tests/helper/vm.go
View File

@ -7,8 +7,8 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/vm" "github.com/ethereum/go-ethereum/core/vm"
) )
type Env struct { type Env struct {

2
tests/vm/gh_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/tests/helper" "github.com/ethereum/go-ethereum/tests/helper"
) )

0
vm/.ethtest
View File

2
xeth/state.go
View File

@ -2,7 +2,7 @@ package xeth
import ( import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type State struct { type State struct {

2
xeth/types.go
View File

@ -11,7 +11,7 @@ import (
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
) )
type Object struct { type Object struct {

2
xeth/xeth.go
View File

@ -19,7 +19,7 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/whisper" "github.com/ethereum/go-ethereum/whisper"
) )