aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/cmd.go50
-rw-r--r--cmd/utils/vm_env.go78
-rw-r--r--cmd/utils/websockets.go166
3 files changed, 42 insertions, 252 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index d01d9da9f..ecb847fc3 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -1,3 +1,24 @@
+/*
+ This file is part of go-ethereum
+
+ go-ethereum is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ go-ethereum is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @authors
+ * Jeffrey Wilcke <i@jev.io>
+ * Viktor Tron <viktor@ethdev.com>
+ */
package utils
import (
@@ -17,7 +38,9 @@ import (
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/rlp"
- "github.com/ethereum/go-ethereum/rpc"
+ rpchttp "github.com/ethereum/go-ethereum/rpc/http"
+ rpcws "github.com/ethereum/go-ethereum/rpc/ws"
+ "github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/xeth"
)
@@ -98,13 +121,11 @@ func exit(err error) {
os.Exit(status)
}
-func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
- clilogger.Infof("Starting %s", ethereum.ClientIdentity())
- err := ethereum.Start(UseSeed)
- if err != nil {
+func StartEthereum(ethereum *eth.Ethereum) {
+ clilogger.Infoln("Starting ", ethereum.Name())
+ if err := ethereum.Start(); err != nil {
exit(err)
}
-
RegisterInterrupt(func(sig os.Signal) {
ethereum.Stop()
logger.Flush()
@@ -170,7 +191,7 @@ func KeyTasks(keyManager *crypto.KeyManager, KeyRing string, GenAddr bool, Secre
func StartRpc(ethereum *eth.Ethereum, RpcPort int) {
var err error
- ethereum.RpcServer, err = rpc.NewJsonRpcServer(xeth.NewJSXEth(ethereum), RpcPort)
+ ethereum.RpcServer, err = rpchttp.NewRpcHttpServer(xeth.New(ethereum), RpcPort)
if err != nil {
clilogger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err)
} else {
@@ -178,6 +199,18 @@ func StartRpc(ethereum *eth.Ethereum, RpcPort int) {
}
}
+func StartWebSockets(eth *eth.Ethereum, wsPort int) {
+ clilogger.Infoln("Starting WebSockets")
+
+ var err error
+ eth.WsServer, err = rpcws.NewWebSocketServer(xeth.New(eth), wsPort)
+ if err != nil {
+ clilogger.Errorf("Could not start RPC interface (port %v): %v", wsPort, err)
+ } else {
+ go eth.WsServer.Start()
+ }
+}
+
var gminer *miner.Miner
func GetMiner() *miner.Miner {
@@ -238,7 +271,8 @@ func BlockDo(ethereum *eth.Ethereum, hash []byte) error {
parent := ethereum.ChainManager().GetBlock(block.ParentHash())
- _, err := ethereum.BlockProcessor().TransitionState(parent.State(), parent, block)
+ statedb := state.New(parent.Root(), ethereum.Db())
+ _, err := ethereum.BlockProcessor().TransitionState(statedb, parent, block)
if err != nil {
return err
}
diff --git a/cmd/utils/vm_env.go b/cmd/utils/vm_env.go
deleted file mode 100644
index acc2ffad9..000000000
--- a/cmd/utils/vm_env.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package utils
-
-import (
- "math/big"
-
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/state"
- "github.com/ethereum/go-ethereum/vm"
-)
-
-type VMEnv struct {
- chain *core.ChainManager
- state *state.StateDB
- block *types.Block
-
- transactor []byte
- value *big.Int
-
- depth int
- Gas *big.Int
-}
-
-func NewEnv(chain *core.ChainManager, state *state.StateDB, block *types.Block, transactor []byte, value *big.Int) *VMEnv {
- return &VMEnv{
- chain: chain,
- state: state,
- block: block,
- transactor: transactor,
- value: value,
- }
-}
-
-func (self *VMEnv) Origin() []byte { return self.transactor }
-func (self *VMEnv) BlockNumber() *big.Int { return self.block.Number() }
-func (self *VMEnv) PrevHash() []byte { return self.block.ParentHash() }
-func (self *VMEnv) Coinbase() []byte { return self.block.Coinbase() }
-func (self *VMEnv) Time() int64 { return self.block.Time() }
-func (self *VMEnv) Difficulty() *big.Int { return self.block.Difficulty() }
-func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit() }
-func (self *VMEnv) Value() *big.Int { return self.value }
-func (self *VMEnv) State() *state.StateDB { return self.state }
-func (self *VMEnv) Depth() int { return self.depth }
-func (self *VMEnv) SetDepth(i int) { self.depth = i }
-func (self *VMEnv) GetHash(n uint64) []byte {
- if block := self.chain.GetBlockByNumber(n); block != nil {
- return block.Hash()
- }
-
- return nil
-}
-func (self *VMEnv) AddLog(log state.Log) {
- self.state.AddLog(log)
-}
-func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
- return vm.Transfer(from, to, amount)
-}
-
-func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execution {
- return core.NewExecution(self, addr, data, gas, price, value)
-}
-
-func (self *VMEnv) Call(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
- exe := self.vm(addr, data, gas, price, value)
- ret, err := exe.Call(addr, caller)
- self.Gas = exe.Gas
-
- return ret, err
-}
-func (self *VMEnv) CallCode(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
- exe := self.vm(caller.Address(), data, gas, price, value)
- return exe.Call(addr, caller)
-}
-
-func (self *VMEnv) Create(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
- exe := self.vm(addr, data, gas, price, value)
- return exe.Create(caller)
-}
diff --git a/cmd/utils/websockets.go b/cmd/utils/websockets.go
deleted file mode 100644
index e4bc1b185..000000000
--- a/cmd/utils/websockets.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package utils
-
-import (
- "github.com/ethereum/go-ethereum/eth"
- "github.com/ethereum/go-ethereum/ethutil"
- "github.com/ethereum/go-ethereum/logger"
- "github.com/ethereum/go-ethereum/websocket"
- "github.com/ethereum/go-ethereum/xeth"
-)
-
-var wslogger = logger.NewLogger("WS")
-
-func args(v ...interface{}) []interface{} {
- return v
-}
-
-type WebSocketServer struct {
- ethereum *eth.Ethereum
- filterCallbacks map[int][]int
-}
-
-func NewWebSocketServer(eth *eth.Ethereum) *WebSocketServer {
- return &WebSocketServer{eth, make(map[int][]int)}
-}
-
-func (self *WebSocketServer) Serv() {
- pipe := xeth.NewJSXEth(self.ethereum)
-
- wsServ := websocket.NewServer("/eth", ":40404")
- wsServ.MessageFunc(func(c *websocket.Client, msg *websocket.Message) {
- switch msg.Call {
- case "compile":
- data := ethutil.NewValue(msg.Args)
- bcode, err := ethutil.Compile(data.Get(0).Str(), false)
- if err != nil {
- c.Write(args(nil, err.Error()), msg.Seed)
- }
-
- code := ethutil.Bytes2Hex(bcode)
- c.Write(args(code, nil), msg.Seed)
- case "getBlockByNumber":
- args := msg.Arguments()
-
- block := pipe.BlockByNumber(int32(args.Get(0).Uint()))
- c.Write(block, msg.Seed)
-
- case "getKey":
- c.Write(pipe.Key().PrivateKey, msg.Seed)
- case "transact":
- if mp, ok := msg.Args[0].(map[string]interface{}); ok {
- object := mapToTxParams(mp)
- c.Write(
- args(pipe.Transact(object["from"], object["to"], object["value"], object["gas"], object["gasPrice"], object["data"])),
- msg.Seed,
- )
-
- }
- case "getCoinBase":
- c.Write(pipe.CoinBase(), msg.Seed)
-
- case "getIsListening":
- c.Write(pipe.IsListening(), msg.Seed)
-
- case "getIsMining":
- c.Write(pipe.IsMining(), msg.Seed)
-
- case "getPeerCoint":
- c.Write(pipe.PeerCount(), msg.Seed)
-
- case "getCountAt":
- args := msg.Arguments()
-
- c.Write(pipe.TxCountAt(args.Get(0).Str()), msg.Seed)
-
- case "getCodeAt":
- args := msg.Arguments()
-
- c.Write(len(pipe.CodeAt(args.Get(0).Str())), msg.Seed)
-
- case "getBlockByHash":
- args := msg.Arguments()
-
- c.Write(pipe.BlockByHash(args.Get(0).Str()), msg.Seed)
-
- case "getStorageAt":
- args := msg.Arguments()
-
- c.Write(pipe.StorageAt(args.Get(0).Str(), args.Get(1).Str()), msg.Seed)
-
- case "getBalanceAt":
- args := msg.Arguments()
-
- c.Write(pipe.BalanceAt(args.Get(0).Str()), msg.Seed)
-
- case "getSecretToAddress":
- args := msg.Arguments()
-
- c.Write(pipe.SecretToAddress(args.Get(0).Str()), msg.Seed)
-
- case "newFilter":
- case "newFilterString":
- case "messages":
- // TODO
- }
-
- })
-
- wsServ.Listen()
-}
-
-func StartWebSockets(eth *eth.Ethereum) {
- wslogger.Infoln("Starting WebSockets")
-
- sock := NewWebSocketServer(eth)
- go sock.Serv()
-}
-
-// TODO This is starting to become a generic method. Move to utils
-func mapToTxParams(object map[string]interface{}) map[string]string {
- // Default values
- if object["from"] == nil {
- object["from"] = ""
- }
- if object["to"] == nil {
- object["to"] = ""
- }
- if object["value"] == nil {
- object["value"] = ""
- }
- if object["gas"] == nil {
- object["gas"] = ""
- }
- if object["gasPrice"] == nil {
- object["gasPrice"] = ""
- }
-
- var dataStr string
- var data []string
- if str, ok := object["data"].(string); ok {
- data = []string{str}
- }
-
- for _, str := range data {
- if ethutil.IsHex(str) {
- str = str[2:]
-
- if len(str) != 64 {
- str = ethutil.LeftPadString(str, 64)
- }
- } else {
- str = ethutil.Bytes2Hex(ethutil.LeftPadBytes(ethutil.Big(str).Bytes(), 32))
- }
-
- dataStr += str
- }
- object["data"] = dataStr
-
- conv := make(map[string]string)
- for key, value := range object {
- if v, ok := value.(string); ok {
- conv[key] = v
- }
- }
-
- return conv
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 23:44:03 +0800