Home Explore Help
Register Sign In
skyfffire
/
core-chain
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

moved state and vm to core

obscuren 10 years ago
parent
d7eaa97a29
commit
0330077d76
58 changed files with 40 additions and 40 deletions
Split View Show Diff Stats
  1. 1 1
      cmd/disasm/main.go
  2. 1 1
      cmd/ethereum/admin.go
  3. 1 1
      cmd/ethereum/main.go
  4. 2 2
      cmd/ethtest/main.go
  5. 2 2
      cmd/evm/main.go
  6. 1 1
      cmd/mist/bindings.go
  7. 1 1
      core/asm.go
  8. 1 1
      core/block_processor.go
  9. 1 1
      core/chain_makers.go
  10. 1 1
      core/chain_manager.go
  11. 1 1
      core/events.go
  12. 2 2
      core/execution.go
  13. 1 1
      core/filter.go
  14. 1 1
      core/genesis.go
  15. 0 0
      core/state/dump.go
  16. 0 0
      core/state/errors.go
  17. 0 0
      core/state/log.go
  18. 0 0
      core/state/main_test.go
  19. 0 0
      core/state/managed_state.go
  20. 0 0
      core/state/managed_state_test.go
  21. 0 0
      core/state/state_object.go
  22. 0 0
      core/state/state_test.go
  23. 0 0
      core/state/statedb.go
  24. 2 2
      core/state_transition.go
  25. 1 1
      core/transaction_pool_test.go
  26. 1 1
      core/types/bloom9.go
  27. 1 1
      core/types/bloom9_test.go
  28. 1 1
      core/types/common.go
  29. 1 1
      core/types/receipt.go
  30. 0 0
      core/vm/address.go
  31. 0 0
      core/vm/analysis.go
  32. 0 0
      core/vm/asm.go
  33. 0 0
      core/vm/common.go
  34. 0 0
      core/vm/context.go
  35. 1 1
      core/vm/environment.go
  36. 0 0
      core/vm/errors.go
  37. 0 0
      core/vm/gas.go
  38. 0 0
      core/vm/main_test.go
  39. 0 0
      core/vm/memory.go
  40. 0 0
      core/vm/stack.go
  41. 0 0
      core/vm/types.go
  42. 0 0
      core/vm/virtual_machine.go
  43. 1 1
      core/vm/vm.go
  44. 1 1
      core/vm/vm_jit.go
  45. 0 0
      core/vm/vm_jit_fake.go
  46. 0 0
      core/vm/vm_test.go
  47. 2 2
      core/vm_env.go
  48. 1 1
      eth/backend.go
  49. 1 1
      event/filter/eth_filter.go
  50. 1 1
      miner/worker.go
  51. 1 1
      rpc/responses.go
  52. 1 1
      tests/blocktest.go
  53. 2 2
      tests/helper/vm.go
  54. 1 1
      tests/vm/gh_test.go
  55. 0 0
      vm/.ethtest
  56. 1 1
      xeth/state.go
  57. 1 1
      xeth/types.go
  58. 1 1
      xeth/xeth.go

+ 1 - 1
cmd/disasm/main.go
View File 

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

+ 1 - 1
cmd/ethereum/admin.go
View File 

@@ -12,7 +12,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/ethereum/go-ethereum/rlp"
 
 	"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/robertkrimen/otto"
 
 )

+ 1 - 1
cmd/ethereum/main.go
View File 

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

+ 2 - 2
cmd/ethtest/main.go
View File 

@@ -36,9 +36,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/ethereum/go-ethereum/ethdb"
 
 	"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/vm"
 
+	"github.com/ethereum/go-ethereum/core/vm"
 
 )
 
 
 type Log struct {

+ 2 - 2
cmd/evm/main.go
View File 

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

+ 1 - 1
cmd/mist/bindings.go
View File 

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

+ 1 - 1
core/asm.go
View File 

@@ -5,7 +5,7 @@ import (
 
 	"math/big"
 
 
 	"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) {

+ 1 - 1
core/block_processor.go
View File 

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

+ 1 - 1
core/chain_makers.go
View File 

@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/ethereum/go-ethereum/event"
 
 	"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

+ 1 - 1
core/chain_manager.go
View File 

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

+ 1 - 1
core/events.go
View File 

@@ -2,7 +2,7 @@ package core
 
 
 import (
 
 	"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.

+ 2 - 2
core/execution.go
View File 

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

+ 1 - 1
core/filter.go
View File 

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

+ 1 - 1
core/genesis.go
View File 

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

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


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


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


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


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


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


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


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


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


+ 2 - 2
core/state_transition.go
View File 

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

+ 1 - 1
core/transaction_pool_test.go
View File 

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

+ 1 - 1
core/types/bloom9.go
View File 

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

+ 1 - 1
core/types/bloom9_test.go
View File 

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

+ 1 - 1
core/types/common.go
View File 

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

+ 1 - 1
core/types/receipt.go
View File 

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

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


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


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


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


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


+ 1 - 1
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/rlp"
 
-	"github.com/ethereum/go-ethereum/state"
 
+	"github.com/ethereum/go-ethereum/core/state"
 
 )
 
 
 type Environment interface {

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


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


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


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


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


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


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


+ 1 - 1
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/crypto"
 
-	"github.com/ethereum/go-ethereum/state"
 
+	"github.com/ethereum/go-ethereum/core/state"
 
 )
 
 
 type Vm struct {

+ 1 - 1
vm/vm_jit.go → core/vm/vm_jit.go
View File 

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

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


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


+ 2 - 2
core/vm_env.go
View File 

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

+ 1 - 1
eth/backend.go
View File 

@@ -21,7 +21,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/p2p"
 
 	"github.com/ethereum/go-ethereum/p2p/discover"
 
 	"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"
 
 )

+ 1 - 1
event/filter/eth_filter.go
View File 

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

+ 1 - 1
miner/worker.go
View File 

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

+ 1 - 1
rpc/responses.go
View File 

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

+ 1 - 1
tests/blocktest.go
View File 

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

+ 2 - 2
tests/helper/vm.go
View File 

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

+ 1 - 1
tests/vm/gh_test.go
View File 

@@ -10,7 +10,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/ethereum/go-ethereum/ethdb"
 
 	"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"
 
 )

+ 0 - 0
vm/.ethtest
View File


+ 1 - 1
xeth/state.go
View File 

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

+ 1 - 1
xeth/types.go
View File 

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

+ 1 - 1
xeth/xeth.go
View File 

@@ -19,7 +19,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/logger"
 
 	"github.com/ethereum/go-ethereum/miner"
 
 	"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"
 
 )