From 3ec0c719b99b6b14ed6c13128b2caec723bc4a93 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 19 Jun 2014 13:47:18 +0200
Subject: Verbose logging
---
ethereal/ui/debugger.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ethereal/ui')
diff --git a/ethereal/ui/debugger.go b/ethereal/ui/debugger.go
index 919407b34..9ebfc5fe7 100644
--- a/ethereal/ui/debugger.go
+++ b/ethereal/ui/debugger.go
@@ -78,7 +78,6 @@ 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)
- fmt.Printf("%x\n", ret)
return
})
@@ -118,6 +117,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
Diff: block.Difficulty,
Value: ethutil.Big(valueStr),
})
+ vm.Verbose = true
self.Db.done = false
self.Logf("callsize %d", len(script))
--
cgit v1.2.3
From c89566a42f984e4441c3398c3c136baa7cd46ac4 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 20 Jun 2014 00:42:53 +0200
Subject: Removed old debugger code
---
ethereal/ui/debugger.go | 3 ++-
ethereal/ui/ui_lib.go | 51 -------------------------------------------------
2 files changed, 2 insertions(+), 52 deletions(-)
(limited to 'ethereal/ui')
diff --git a/ethereal/ui/debugger.go b/ethereal/ui/debugger.go
index 9ebfc5fe7..9d60c7587 100644
--- a/ethereal/ui/debugger.go
+++ b/ethereal/ui/debugger.go
@@ -109,8 +109,9 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
block := self.lib.eth.BlockChain().CurrentBlock
vm := ethchain.NewVm(state, self.lib.eth.StateManager(), ethchain.RuntimeVars{
+ Block: block,
Origin: account.Address(),
- BlockNumber: block.BlockInfo().Number,
+ BlockNumber: block.Number,
PrevHash: block.PrevHash,
Coinbase: block.Coinbase,
Time: block.Time,
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 9f2cca1e0..791d4fe09 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -3,7 +3,6 @@ package ethui
import (
"bitbucket.org/kardianos/osext"
"github.com/ethereum/eth-go"
- "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
"os"
@@ -138,53 +137,3 @@ func DefaultAssetPath() string {
return base
}
-
-func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) {
- state := ui.eth.BlockChain().CurrentBlock.State()
-
- script, err := ethutil.Compile(data)
- if err != nil {
- ethutil.Config.Log.Debugln(err)
-
- return
- }
-
- dis := ethchain.Disassemble(script)
- ui.win.Root().Call("clearAsm")
-
- for _, str := range dis {
- ui.win.Root().Call("setAsm", str)
- }
- // Contract addr as test address
- keyPair := ethutil.GetKeyRing().Get(0)
- callerTx :=
- ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), script)
- callerTx.Sign(keyPair.PrivateKey)
-
- account := ui.eth.StateManager().TransState().GetStateObject(keyPair.Address())
- contract := ethchain.MakeContract(callerTx, state)
- callerClosure := ethchain.NewClosure(account, contract, contract.Init(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
-
- block := ui.eth.BlockChain().CurrentBlock
- vm := ethchain.NewVm(state, ui.eth.StateManager(), ethchain.RuntimeVars{
- Origin: account.Address(),
- BlockNumber: block.BlockInfo().Number,
- PrevHash: block.PrevHash,
- Coinbase: block.Coinbase,
- Time: block.Time,
- Diff: block.Difficulty,
- })
-
- ui.Db.done = false
- go func() {
- callerClosure.Call(vm, contract.Init(), ui.Db.halting)
-
- state.Reset()
-
- ui.Db.done = true
- }()
-}
-
-func (ui *UiLib) Next() {
- ui.Db.Next()
-}
--
cgit v1.2.3
From 65cbea2b6a5d1321c8262f88d952f0be7fbebe3d Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 20 Jun 2014 00:48:48 +0200
Subject: bump
---
ethereal/ui/gui.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ethereal/ui')
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 01d963332..1037ba5ac 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -56,7 +56,7 @@ func New(ethereum *eth.Ethereum) *Gui {
}
func (gui *Gui) Start(assetPath string) {
- const version = "0.5.0 RC13"
+ const version = "0.5.0 RC14"
defer gui.txDb.Close()
--
cgit v1.2.3