aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ethereal/assets/debugger/debugger.qml80
-rw-r--r--ethereal/assets/qml/wallet.qml4
-rw-r--r--ethereal/debugger.go47
-rw-r--r--ethereal/gui.go28
-rw-r--r--ethereal/main.go14
-rw-r--r--ethereum/main.go11
-rw-r--r--utils/cmd.go15
7 files changed, 145 insertions, 54 deletions
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml
index b93308b3e..f204647c8 100644
--- a/ethereal/assets/debugger/debugger.qml
+++ b/ethereal/assets/debugger/debugger.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls.Styles 1.1
import Ethereum 1.0
ApplicationWindow {
+ id: win
visible: false
title: "IceCREAM"
minimumWidth: 1280
@@ -17,6 +18,10 @@ ApplicationWindow {
property alias codeText: codeEditor.text
property alias dataText: rawDataField.text
+ onClosing: {
+ compileTimer.stop()
+ }
+
MenuBar {
Menu {
title: "Debugger"
@@ -34,12 +39,44 @@ ApplicationWindow {
MenuItem {
text: "Continue"
- shortcut: "Ctrl+c"
+ shortcut: "Ctrl+g"
onTriggered: dbg.continue()
}
+ MenuItem {
+ text: "Command"
+ shortcut: "Ctrl+l"
+ onTriggered: {
+ dbgCommand.focus = true
+ }
+ }
+ MenuItem {
+ text: "Focus code"
+ shortcut: "Ctrl+1"
+ onTriggered: {
+ codeEditor.focus = true
+ }
+ }
+ MenuItem {
+ text: "Focus data"
+ shortcut: "Ctrl+2"
+ onTriggered: {
+ rawDataField.focus = true
+ }
+ }
+
+ /*
+ MenuItem {
+ text: "Close window"
+ shortcut: "Ctrl+w"
+ onTriggered: {
+ win.close()
+ }
+ }
+ */
}
}
+
SplitView {
anchors.fill: parent
property var asmModel: ListModel {
@@ -73,6 +110,15 @@ ApplicationWindow {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: settings.left
+ focus: true
+
+ Timer {
+ id: compileTimer
+ interval: 500 ; running: true ; repeat: true
+ onTriggered: {
+ dbg.compile(codeEditor.text)
+ }
+ }
}
Column {
@@ -185,7 +231,7 @@ ApplicationWindow {
}
height: parent.height
width: parent.width
- TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width }
+ TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width - 2 }
model: logModel
}
}
@@ -207,24 +253,15 @@ ApplicationWindow {
y: 1
x: asmTableView.width
width: 500
- placeholderText: "Debugger command (help for help)"
+ placeholderText: "Debugger (type 'help')"
Keys.onReturnPressed: {
exec()
}
}
-
- Button {
- anchors {
- left: dbgCommand.right
- }
- text: "Exec"
- onClicked: {
- exec()
- }
- }
}
toolBar: ToolBar {
+ height: 30
RowLayout {
spacing: 5
@@ -254,6 +291,23 @@ ApplicationWindow {
text: "Continue"
}
}
+
+
+ ComboBox {
+ id: snippets
+ anchors.right: parent.right
+ model: ListModel {
+ ListElement { text: "Snippets" ; value: "" }
+ ListElement { text: "Call Contract" ; value: "var[2] in;\nvar ret;\n\nin[0] = \"arg1\"\nin[1] = 0xdeadbeef\n\nvar success = call(0x0c542ddea93dae0c2fcb2cf175f03ad80d6be9a0, 0, 7000, in, ret)\n\nreturn ret" }
+ }
+ onCurrentIndexChanged: {
+ if(currentIndex != 0) {
+ var code = snippets.model.get(currentIndex).value;
+ codeEditor.insert(codeEditor.cursorPosition, code)
+ }
+ }
+ }
+
}
function debugCurrent() {
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 628d9f96a..4b252f200 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -248,9 +248,9 @@ ApplicationWindow {
text: "Client ID"
}
TextField {
- text: eth.clientId()
+ text: eth.getCustomIdentifier()
onTextChanged: {
- eth.changeClientId(text)
+ eth.setCustomIdentifier(text)
}
}
}
diff --git a/ethereal/debugger.go b/ethereal/debugger.go
index 8eab04b4d..89e0f36eb 100644
--- a/ethereal/debugger.go
+++ b/ethereal/debugger.go
@@ -52,13 +52,31 @@ func (self *DebuggerWindow) SetCode(code string) {
func (self *DebuggerWindow) SetData(data string) {
self.win.Set("dataText", data)
}
-func (self *DebuggerWindow) SetAsm(data string) {
- dis := ethchain.Disassemble(ethutil.Hex2Bytes(data))
+func (self *DebuggerWindow) SetAsm(data []byte) {
+ self.win.Root().Call("clearAsm")
+
+ dis := ethchain.Disassemble(data)
for _, str := range dis {
self.win.Root().Call("setAsm", str)
}
}
+func (self *DebuggerWindow) Compile(code string) {
+ var err error
+ script := ethutil.StringToByteFunc(code, func(s string) (ret []byte) {
+ ret, err = ethutil.Compile(s, true)
+ return
+ })
+
+ if err == nil {
+ self.SetAsm(script)
+ }
+}
+
+func (self *DebuggerWindow) ClearLog() {
+ self.win.Root().Call("clearLog")
+}
+
func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) {
if !self.Db.done {
self.Db.Q <- true
@@ -81,7 +99,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
var err error
script := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) {
- ret, err = ethutil.Compile(s)
+ ret, err = ethutil.Compile(s, false)
return
})
@@ -91,27 +109,21 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
return
}
- dis := ethchain.Disassemble(script)
- self.win.Root().Call("clearAsm")
-
- for _, str := range dis {
- self.win.Root().Call("setAsm", str)
- }
+ self.SetAsm(script)
var (
gas = ethutil.Big(gasStr)
gasPrice = ethutil.Big(gasPriceStr)
value = ethutil.Big(valueStr)
// Contract addr as test address
- keyPair = self.lib.eth.KeyManager().KeyPair()
- callerTx = ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script)
+ keyPair = self.lib.eth.KeyManager().KeyPair()
)
- callerTx.Sign(keyPair.PrivateKey)
- state := self.lib.eth.BlockChain().CurrentBlock.State()
+ state := self.lib.eth.StateManager().TransState()
account := self.lib.eth.StateManager().TransState().GetAccount(keyPair.Address())
- contract := ethchain.MakeContract(callerTx, state)
+ contract := ethchain.NewStateObject([]byte{0})
contract.Amount = value
+
callerClosure := ethchain.NewClosure(account, contract, script, state, gas, gasPrice)
block := self.lib.eth.BlockChain().CurrentBlock
@@ -179,8 +191,9 @@ func (self *DebuggerWindow) ExecCommand(command string) {
cmd := strings.Split(command, " ")
switch cmd[0] {
case "help":
- self.Logln("Debgger commands:")
- self.Logln("break, bp Set breakpoint")
+ self.Logln("Debugger commands:")
+ self.Logln("break, bp Set breakpoint on instruction")
+ self.Logln("clear [log, break, bp] Clears previous set sub-command(s)")
case "break", "bp":
if len(cmd) > 1 {
lineNo, err := strconv.Atoi(cmd[1])
@@ -202,6 +215,8 @@ func (self *DebuggerWindow) ExecCommand(command string) {
self.vm.BreakPoints = nil
self.Logln("Breakpoints cleared")
+ case "log":
+ self.ClearLog()
default:
self.Logf("clear '%s' is not valid", cmd[1])
}
diff --git a/ethereal/gui.go b/ethereal/gui.go
index 1719d41b2..9f28045f8 100644
--- a/ethereal/gui.go
+++ b/ethereal/gui.go
@@ -9,6 +9,7 @@ import (
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml"
"math/big"
@@ -36,11 +37,13 @@ type Gui struct {
logLevel ethlog.LogLevel
open bool
- Session string
+ Session string
+ clientIdentity *ethwire.SimpleClientIdentity
+ config *ethutil.ConfigManager
}
// Create GUI, but doesn't start it
-func NewWindow(ethereum *eth.Ethereum, session string, logLevel int) *Gui {
+func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIdentity *ethwire.SimpleClientIdentity, session string, logLevel int) *Gui {
db, err := ethdb.NewLDBDatabase("tx_database")
if err != nil {
panic(err)
@@ -48,11 +51,10 @@ func NewWindow(ethereum *eth.Ethereum, session string, logLevel int) *Gui {
pub := ethpub.NewPEthereum(ethereum)
- return &Gui{eth: ethereum, txDb: db, pub: pub, logLevel: ethlog.LogLevel(logLevel), Session: session, open: false}
+ return &Gui{eth: ethereum, txDb: db, pub: pub, logLevel: ethlog.LogLevel(logLevel), Session: session, open: false, clientIdentity: clientIdentity, config: config}
}
func (gui *Gui) Start(assetPath string) {
- const version = "0.5.16"
defer gui.txDb.Close()
@@ -65,8 +67,6 @@ func (gui *Gui) Start(assetPath string) {
Init: func(p *ethpub.KeyVal, obj qml.Object) { p.Key = ""; p.Value = "" },
}})
- ethutil.Config.SetClientString("Ethereal")
-
// Create a new QML engine
gui.engine = qml.NewEngine()
context := gui.engine.Context()
@@ -103,14 +103,14 @@ func (gui *Gui) Start(assetPath string) {
ethlog.AddLogSystem(gui)
}
win.Wait()
- // need to silence gui logger after window closed otherwise logsystem hangs
- gui.SetLogLevel(ethlog.Silence)
+ // need to silence gui logger after window closed otherwise logsystem hangs (but do not save loglevel)
+ gui.logLevel = ethlog.Silence
gui.open = false
}
func (gui *Gui) Stop() {
if gui.open {
- gui.SetLogLevel(ethlog.Silence)
+ gui.logLevel = ethlog.Silence
gui.open = false
gui.win.Hide()
}
@@ -369,17 +369,19 @@ func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PR
return gui.pub.Transact(gui.privateKey(), recipient, value, gas, gasPrice, data)
}
-func (gui *Gui) ChangeClientId(id string) {
- ethutil.Config.SetIdentifier(id)
+func (gui *Gui) SetCustomIdentifier(customIdentifier string) {
+ gui.clientIdentity.SetCustomIdentifier(customIdentifier)
+ gui.config.Save("id", customIdentifier)
}
-func (gui *Gui) ClientId() string {
- return ethutil.Config.Identifier
+func (gui *Gui) GetCustomIdentifier() string {
+ return gui.clientIdentity.GetCustomIdentifier()
}
// functions that allow Gui to implement interface ethlog.LogSystem
func (gui *Gui) SetLogLevel(level ethlog.LogLevel) {
gui.logLevel = level
+ gui.config.Save("loglevel", level)
}
func (gui *Gui) GetLogLevel() ethlog.LogLevel {
diff --git a/ethereal/main.go b/ethereal/main.go
index f3f1d3140..645e8f2ce 100644
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -8,6 +8,11 @@ import (
"runtime"
)
+const (
+ ClientIdentifier = "Ethereal"
+ Version = "0.5.16"
+)
+
func main() {
// Leave QT on top at ALL times. Qt Needs to be initialized from the main thread
qml.Init(nil)
@@ -23,7 +28,8 @@ func main() {
// precedence: code-internal flag default < config file < environment variables < command line
Init() // parsing command line
- utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH")
+
+ config := utils.InitConfig(ConfigFile, Datadir, "ETH")
utils.InitDataDir(Datadir)
@@ -36,7 +42,9 @@ func main() {
// create, import, export keys
utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive)
- ethereum := utils.NewEthereum(db, keyManager, UseUPnP, OutboundPort, MaxPeer)
+ clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier)
+
+ ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
if ShowGenesis {
utils.ShowGenesis(ethereum)
@@ -46,7 +54,7 @@ func main() {
utils.StartRpc(ethereum, RpcPort)
}
- gui := NewWindow(ethereum, KeyRing, LogLevel)
+ gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel)
utils.RegisterInterrupt(func(os.Signal) {
gui.Stop()
diff --git a/ethereum/main.go b/ethereum/main.go
index 1531871cb..e4d73d494 100644
--- a/ethereum/main.go
+++ b/ethereum/main.go
@@ -6,6 +6,11 @@ import (
"runtime"
)
+const (
+ ClientIdentifier = "Ethereum(G)"
+ Version = "0.5.16"
+)
+
var logger = ethlog.NewLogger("CLI")
func main() {
@@ -15,7 +20,7 @@ func main() {
// precedence: code-internal flag default < config file < environment variables < command line
Init() // parsing command line
- utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH")
+ utils.InitConfig(ConfigFile, Datadir, "ETH")
utils.InitDataDir(Datadir)
@@ -28,7 +33,9 @@ func main() {
// create, import, export keys
utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive)
- ethereum := utils.NewEthereum(db, keyManager, UseUPnP, OutboundPort, MaxPeer)
+ clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier)
+
+ ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
if ShowGenesis {
utils.ShowGenesis(ethereum)
diff --git a/utils/cmd.go b/utils/cmd.go
index e10addf6c..889726b04 100644
--- a/utils/cmd.go
+++ b/utils/cmd.go
@@ -10,6 +10,7 @@ import (
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethrpc"
"github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/eth-go/ethwire"
"io"
"log"
"os"
@@ -98,9 +99,9 @@ func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string)
}
}
-func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix string) {
+func InitConfig(ConfigFile string, Datadir string, EnvPrefix string) *ethutil.ConfigManager {
InitDataDir(Datadir)
- ethutil.ReadConfig(ConfigFile, Datadir, Identifier, EnvPrefix)
+ return ethutil.ReadConfig(ConfigFile, Datadir, EnvPrefix)
}
func exit(err error) {
@@ -122,8 +123,12 @@ func NewDatabase() ethutil.Database {
return db
}
-func NewEthereum(db ethutil.Database, keyManager *ethcrypto.KeyManager, usePnp bool, OutboundPort string, MaxPeer int) *eth.Ethereum {
- ethereum, err := eth.New(db, keyManager, eth.CapDefault, usePnp)
+func NewClientIdentity(clientIdentifier, version, customIdentifier string) *ethwire.SimpleClientIdentity {
+ return ethwire.NewSimpleClientIdentity(clientIdentifier, version, customIdentifier)
+}
+
+func NewEthereum(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *ethcrypto.KeyManager, usePnp bool, OutboundPort string, MaxPeer int) *eth.Ethereum {
+ ethereum, err := eth.New(db, clientIdentity, keyManager, eth.CapDefault, usePnp)
if err != nil {
logger.Fatalln("eth start err:", err)
}
@@ -133,7 +138,7 @@ func NewEthereum(db ethutil.Database, keyManager *ethcrypto.KeyManager, usePnp b
}
func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
- logger.Infof("Starting Ethereum v%s", ethutil.Config.Ver)
+ logger.Infof("Starting %s", ethereum.ClientIdentity())
ethereum.Start(UseSeed)
RegisterInterrupt(func(sig os.Signal) {
ethereum.Stop()
generated by cgit (git 2.34.1) at 2024-11-16 09:16:16 +0800