aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum
diff options
context:
space:
mode:
Diffstat (limited to 'ethereum')
-rw-r--r--ethereum/cmd.go8
-rw-r--r--ethereum/flags.go10
-rw-r--r--ethereum/main.go36
-rw-r--r--ethereum/repl/javascript_runtime.go232
-rw-r--r--ethereum/repl/js_lib.go53
-rw-r--r--ethereum/repl/repl.go12
-rw-r--r--ethereum/repl/repl_darwin.go4
-rw-r--r--ethereum/repl/types.go95
8 files changed, 56 insertions, 394 deletions
diff --git a/ethereum/cmd.go b/ethereum/cmd.go
index ff2b8409c..5ddc91619 100644
--- a/ethereum/cmd.go
+++ b/ethereum/cmd.go
@@ -1,11 +1,13 @@
package main
import (
+ "io/ioutil"
+ "os"
+
"github.com/ethereum/eth-go"
"github.com/ethereum/go-ethereum/ethereum/repl"
+ "github.com/ethereum/go-ethereum/javascript"
"github.com/ethereum/go-ethereum/utils"
- "io/ioutil"
- "os"
)
func InitJsConsole(ethereum *eth.Ethereum) {
@@ -25,7 +27,7 @@ func ExecJsFile(ethereum *eth.Ethereum, InputFile string) {
if err != nil {
logger.Fatalln(err)
}
- re := ethrepl.NewJSRE(ethereum)
+ re := javascript.NewJSRE(ethereum)
utils.RegisterInterrupt(func(os.Signal) {
re.Stop()
})
diff --git a/ethereum/flags.go b/ethereum/flags.go
index 4f59ddf06..5ed208411 100644
--- a/ethereum/flags.go
+++ b/ethereum/flags.go
@@ -3,10 +3,11 @@ package main
import (
"flag"
"fmt"
- "github.com/ethereum/eth-go/ethlog"
"os"
"os/user"
"path"
+
+ "github.com/ethereum/eth-go/ethlog"
)
var Identifier string
@@ -31,6 +32,9 @@ var LogFile string
var ConfigFile string
var DebugFile string
var LogLevel int
+var Dump bool
+var DumpHash string
+var DumpNumber int
// flags specific to cli client
var StartMining bool
@@ -71,6 +75,10 @@ func Init() {
flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0")
flag.StringVar(&DiffType, "diff", "all", "sets the level of diff output [vm, all]. Has no effect if difftool=false")
+ flag.BoolVar(&Dump, "dump", false, "output the ethereum state in JSON format. Sub args [number, hash]")
+ flag.StringVar(&DumpHash, "hash", "", "specify arg in hex")
+ flag.IntVar(&DumpNumber, "number", -1, "specify arg in number")
+
flag.BoolVar(&StartMining, "mine", false, "start dagger mining")
flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console")
diff --git a/ethereum/main.go b/ethereum/main.go
index 217991074..a8e60dec7 100644
--- a/ethereum/main.go
+++ b/ethereum/main.go
@@ -1,15 +1,19 @@
package main
import (
+ "fmt"
+ "os"
+ "runtime"
+
+ "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/utils"
- "runtime"
)
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.6.0"
+ Version = "0.6.3"
)
var logger = ethlog.NewLogger("CLI")
@@ -23,7 +27,7 @@ func main() {
Init() // parsing command line
// If the difftool option is selected ignore all other log output
- if DiffTool {
+ if DiffTool || Dump {
LogLevel = 0
}
@@ -46,6 +50,32 @@ func main() {
ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
+ if Dump {
+ var block *ethchain.Block
+
+ if len(DumpHash) == 0 && DumpNumber == -1 {
+ block = ethereum.BlockChain().CurrentBlock
+ } else if len(DumpHash) > 0 {
+ block = ethereum.BlockChain().GetBlock(ethutil.Hex2Bytes(DumpHash))
+ } else {
+ block = ethereum.BlockChain().GetBlockByNumber(uint64(DumpNumber))
+ }
+
+ if block == nil {
+ fmt.Fprintln(os.Stderr, "block not found")
+
+ // We want to output valid JSON
+ fmt.Println("{}")
+
+ os.Exit(1)
+ }
+
+ // Leave the Println. This needs clean output for piping
+ fmt.Printf("%s\n", block.State().Dump())
+
+ os.Exit(0)
+ }
+
if ShowGenesis {
utils.ShowGenesis(ethereum)
}
diff --git a/ethereum/repl/javascript_runtime.go b/ethereum/repl/javascript_runtime.go
deleted file mode 100644
index 41b6216d4..000000000
--- a/ethereum/repl/javascript_runtime.go
+++ /dev/null
@@ -1,232 +0,0 @@
-package ethrepl
-
-import (
- "fmt"
- "github.com/ethereum/eth-go"
- "github.com/ethereum/eth-go/ethchain"
- "github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/eth-go/ethpub"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/ethutil"
- "github.com/ethereum/go-ethereum/utils"
- "github.com/obscuren/otto"
- "io/ioutil"
- "os"
- "path"
- "path/filepath"
-)
-
-var jsrelogger = ethlog.NewLogger("JSRE")
-
-type JSRE struct {
- ethereum *eth.Ethereum
- vm *otto.Otto
- lib *ethpub.PEthereum
-
- blockChan chan ethutil.React
- changeChan chan ethutil.React
- quitChan chan bool
-
- objectCb map[string][]otto.Value
-}
-
-func (jsre *JSRE) LoadExtFile(path string) {
- result, err := ioutil.ReadFile(path)
- if err == nil {
- jsre.vm.Run(result)
- } else {
- jsrelogger.Debugln("Could not load file:", path)
- }
-}
-
-func (jsre *JSRE) LoadIntFile(file string) {
- assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal", "assets", "ext")
- jsre.LoadExtFile(path.Join(assetPath, file))
-}
-
-func NewJSRE(ethereum *eth.Ethereum) *JSRE {
- re := &JSRE{
- ethereum,
- otto.New(),
- ethpub.NewPEthereum(ethereum),
- make(chan ethutil.React, 1),
- make(chan ethutil.React, 1),
- make(chan bool),
- make(map[string][]otto.Value),
- }
-
- // Init the JS lib
- re.vm.Run(jsLib)
-
- // Load extra javascript files
- re.LoadIntFile("string.js")
- re.LoadIntFile("big.js")
-
- // We have to make sure that, whoever calls this, calls "Stop"
- go re.mainLoop()
-
- re.Bind("eth", &JSEthereum{re.lib, re.vm})
-
- re.initStdFuncs()
-
- jsrelogger.Infoln("started")
-
- return re
-}
-
-func (self *JSRE) Bind(name string, v interface{}) {
- self.vm.Set(name, v)
-}
-
-func (self *JSRE) Run(code string) (otto.Value, error) {
- return self.vm.Run(code)
-}
-
-func (self *JSRE) Require(file string) error {
- if len(filepath.Ext(file)) == 0 {
- file += ".js"
- }
-
- fh, err := os.Open(file)
- if err != nil {
- return err
- }
-
- content, _ := ioutil.ReadAll(fh)
- self.Run("exports = {};(function() {" + string(content) + "})();")
-
- return nil
-}
-
-func (self *JSRE) Stop() {
- // Kill the main loop
- self.quitChan <- true
-
- close(self.blockChan)
- close(self.quitChan)
- close(self.changeChan)
- jsrelogger.Infoln("stopped")
-}
-
-func (self *JSRE) mainLoop() {
- // Subscribe to events
- reactor := self.ethereum.Reactor()
- reactor.Subscribe("newBlock", self.blockChan)
-
-out:
- for {
- select {
- case <-self.quitChan:
- break out
- case block := <-self.blockChan:
- if _, ok := block.Resource.(*ethchain.Block); ok {
- }
- case object := <-self.changeChan:
- if stateObject, ok := object.Resource.(*ethstate.StateObject); ok {
- for _, cb := range self.objectCb[ethutil.Bytes2Hex(stateObject.Address())] {
- val, _ := self.vm.ToValue(ethpub.NewPStateObject(stateObject))
- cb.Call(cb, val)
- }
- } else if storageObject, ok := object.Resource.(*ethstate.StorageState); ok {
- for _, cb := range self.objectCb[ethutil.Bytes2Hex(storageObject.StateAddress)+ethutil.Bytes2Hex(storageObject.Address)] {
- val, _ := self.vm.ToValue(ethpub.NewPStorageState(storageObject))
- cb.Call(cb, val)
- }
- }
- }
- }
-}
-
-func (self *JSRE) initStdFuncs() {
- t, _ := self.vm.Get("eth")
- eth := t.Object()
- eth.Set("watch", self.watch)
- eth.Set("addPeer", self.addPeer)
- eth.Set("require", self.require)
- eth.Set("stopMining", self.stopMining)
- eth.Set("startMining", self.startMining)
- eth.Set("execBlock", self.execBlock)
-}
-
-/*
- * The following methods are natively implemented javascript functions
- */
-
-func (self *JSRE) stopMining(call otto.FunctionCall) otto.Value {
- v, _ := self.vm.ToValue(utils.StopMining(self.ethereum))
- return v
-}
-
-func (self *JSRE) startMining(call otto.FunctionCall) otto.Value {
- v, _ := self.vm.ToValue(utils.StartMining(self.ethereum))
- return v
-}
-
-// eth.watch
-func (self *JSRE) watch(call otto.FunctionCall) otto.Value {
- addr, _ := call.Argument(0).ToString()
- var storageAddr string
- var cb otto.Value
- var storageCallback bool
- if len(call.ArgumentList) > 2 {
- storageCallback = true
- storageAddr, _ = call.Argument(1).ToString()
- cb = call.Argument(2)
- } else {
- cb = call.Argument(1)
- }
-
- if storageCallback {
- self.objectCb[addr+storageAddr] = append(self.objectCb[addr+storageAddr], cb)
-
- event := "storage:" + string(ethutil.Hex2Bytes(addr)) + ":" + string(ethutil.Hex2Bytes(storageAddr))
- self.ethereum.Reactor().Subscribe(event, self.changeChan)
- } else {
- self.objectCb[addr] = append(self.objectCb[addr], cb)
-
- event := "object:" + string(ethutil.Hex2Bytes(addr))
- self.ethereum.Reactor().Subscribe(event, self.changeChan)
- }
-
- return otto.UndefinedValue()
-}
-
-func (self *JSRE) addPeer(call otto.FunctionCall) otto.Value {
- host, err := call.Argument(0).ToString()
- if err != nil {
- return otto.FalseValue()
- }
- self.ethereum.ConnectToPeer(host)
-
- return otto.TrueValue()
-}
-
-func (self *JSRE) require(call otto.FunctionCall) otto.Value {
- file, err := call.Argument(0).ToString()
- if err != nil {
- return otto.UndefinedValue()
- }
- if err := self.Require(file); err != nil {
- fmt.Println("err:", err)
- return otto.UndefinedValue()
- }
-
- t, _ := self.vm.Get("exports")
-
- return t
-}
-
-func (self *JSRE) execBlock(call otto.FunctionCall) otto.Value {
- hash, err := call.Argument(0).ToString()
- if err != nil {
- return otto.UndefinedValue()
- }
-
- err = utils.BlockDo(self.ethereum, ethutil.Hex2Bytes(hash))
- if err != nil {
- fmt.Println(err)
- return otto.FalseValue()
- }
-
- return otto.TrueValue()
-}
diff --git a/ethereum/repl/js_lib.go b/ethereum/repl/js_lib.go
deleted file mode 100644
index c781c43d0..000000000
--- a/ethereum/repl/js_lib.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package ethrepl
-
-const jsLib = `
-function pp(object) {
- var str = "";
-
- if(object instanceof Array) {
- str += "[ ";
- for(var i = 0, l = object.length; i < l; i++) {
- str += pp(object[i]);
-
- if(i < l-1) {
- str += ", ";
- }
- }
- str += " ]";
- } else if(typeof(object) === "object") {
- str += "{ ";
- var last = Object.keys(object).sort().pop()
- for(var k in object) {
- str += k + ": " + pp(object[k]);
-
- if(k !== last) {
- str += ", ";
- }
- }
- str += " }";
- } else if(typeof(object) === "string") {
- str += "\033[32m'" + object + "'";
- } else if(typeof(object) === "undefined") {
- str += "\033[1m\033[30m" + object;
- } else if(typeof(object) === "number") {
- str += "\033[31m" + object;
- } else if(typeof(object) === "function") {
- str += "\033[35m[Function]";
- } else {
- str += object;
- }
-
- str += "\033[0m";
-
- return str;
-}
-
-function prettyPrint(/* */) {
- var args = arguments;
- for(var i = 0, l = args.length; i < l; i++) {
- console.log(pp(args[i]))
- }
-}
-
-var print = prettyPrint;
-`
diff --git a/ethereum/repl/repl.go b/ethereum/repl/repl.go
index 92d4ad86a..d08feb7b4 100644
--- a/ethereum/repl/repl.go
+++ b/ethereum/repl/repl.go
@@ -3,12 +3,14 @@ package ethrepl
import (
"bufio"
"fmt"
- "github.com/ethereum/eth-go"
- "github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/eth-go/ethutil"
"io"
"os"
"path"
+
+ "github.com/ethereum/eth-go"
+ "github.com/ethereum/eth-go/ethlog"
+ "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/javascript"
)
var logger = ethlog.NewLogger("REPL")
@@ -19,7 +21,7 @@ type Repl interface {
}
type JSRepl struct {
- re *JSRE
+ re *javascript.JSRE
prompt string
@@ -34,7 +36,7 @@ func NewJSRepl(ethereum *eth.Ethereum) *JSRepl {
panic(err)
}
- return &JSRepl{re: NewJSRE(ethereum), prompt: "> ", history: hist}
+ return &JSRepl{re: javascript.NewJSRE(ethereum), prompt: "> ", history: hist}
}
func (self *JSRepl) Start() {
diff --git a/ethereum/repl/repl_darwin.go b/ethereum/repl/repl_darwin.go
index 3a91b0d44..4c07280f7 100644
--- a/ethereum/repl/repl_darwin.go
+++ b/ethereum/repl/repl_darwin.go
@@ -115,8 +115,8 @@ L:
}
func (self *JSRepl) PrintValue(v interface{}) {
- method, _ := self.re.vm.Get("prettyPrint")
- v, err := self.re.vm.ToValue(v)
+ method, _ := self.re.Vm.Get("prettyPrint")
+ v, err := self.re.Vm.ToValue(v)
if err == nil {
method.Call(method, v)
}
diff --git a/ethereum/repl/types.go b/ethereum/repl/types.go
deleted file mode 100644
index 16a18e6e5..000000000
--- a/ethereum/repl/types.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package ethrepl
-
-import (
- "fmt"
- "github.com/ethereum/eth-go/ethpub"
- "github.com/ethereum/eth-go/ethutil"
- "github.com/obscuren/otto"
-)
-
-type JSStateObject struct {
- *ethpub.PStateObject
- eth *JSEthereum
-}
-
-func (self *JSStateObject) EachStorage(call otto.FunctionCall) otto.Value {
- cb := call.Argument(0)
- self.PStateObject.EachStorage(func(key string, value *ethutil.Value) {
- value.Decode()
-
- cb.Call(self.eth.toVal(self), self.eth.toVal(key), self.eth.toVal(ethutil.Bytes2Hex(value.Bytes())))
- })
-
- return otto.UndefinedValue()
-}
-
-// The JSEthereum object attempts to wrap the PEthereum object and returns
-// meaningful javascript objects
-type JSBlock struct {
- *ethpub.PBlock
- eth *JSEthereum
-}
-
-func (self *JSBlock) GetTransaction(hash string) otto.Value {
- return self.eth.toVal(self.PBlock.GetTransaction(hash))
-}
-
-type JSEthereum struct {
- *ethpub.PEthereum
- vm *otto.Otto
-}
-
-func (self *JSEthereum) GetBlock(hash string) otto.Value {
- return self.toVal(&JSBlock{self.PEthereum.GetBlock(hash), self})
-}
-
-func (self *JSEthereum) GetPeers() otto.Value {
- return self.toVal(self.PEthereum.GetPeers())
-}
-
-func (self *JSEthereum) GetKey() otto.Value {
- return self.toVal(self.PEthereum.GetKey())
-}
-
-func (self *JSEthereum) GetStateObject(addr string) otto.Value {
- return self.toVal(&JSStateObject{self.PEthereum.GetStateObject(addr), self})
-}
-
-func (self *JSEthereum) GetStateKeyVals(addr string) otto.Value {
- return self.toVal(self.PEthereum.GetStateObject(addr).StateKeyVal(false))
-}
-
-func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
- r, err := self.PEthereum.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
- if err != nil {
- fmt.Println(err)
-
- return otto.UndefinedValue()
- }
-
- return self.toVal(r)
-}
-
-func (self *JSEthereum) Create(key, valueStr, gasStr, gasPriceStr, scriptStr string) otto.Value {
- r, err := self.PEthereum.Create(key, valueStr, gasStr, gasPriceStr, scriptStr)
-
- if err != nil {
- fmt.Println(err)
-
- return otto.UndefinedValue()
- }
-
- return self.toVal(r)
-}
-
-func (self *JSEthereum) toVal(v interface{}) otto.Value {
- result, err := self.vm.ToValue(v)
-
- if err != nil {
- fmt.Println("Value unknown:", err)
-
- return otto.UndefinedValue()
- }
-
- return result
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 03:07:40 +0800