aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ethereal/ui/ext_app.go96
-rw-r--r--ethereal/ui/gui.go13
-rw-r--r--ethereal/ui/html_container.go5
-rw-r--r--ethereal/ui/library.go10
4 files changed, 17 insertions, 107 deletions
diff --git a/ethereal/ui/ext_app.go b/ethereal/ui/ext_app.go
index c02ffb7b2..1021afea9 100644
--- a/ethereal/ui/ext_app.go
+++ b/ethereal/ui/ext_app.go
@@ -2,13 +2,11 @@ package ethui
import (
"fmt"
- "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml"
"math/big"
- "strings"
)
type AppContainer interface {
@@ -24,7 +22,7 @@ type AppContainer interface {
}
type ExtApplication struct {
- *QEthereum
+ *utils.PEthereum
blockChan chan ethutil.React
changeChan chan ethutil.React
@@ -37,7 +35,7 @@ type ExtApplication struct {
func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
app := &ExtApplication{
- NewQEthereum(lib.eth),
+ utils.NewPEthereum(lib.eth),
make(chan ethutil.React, 1),
make(chan ethutil.React, 1),
make(chan bool),
@@ -127,93 +125,3 @@ func (app *ExtApplication) Watch(addr, storageAddr string) {
app.registeredEvents = append(app.registeredEvents, event)
}
-
-type QEthereum struct {
- stateManager *ethchain.StateManager
- blockChain *ethchain.BlockChain
- txPool *ethchain.TxPool
-}
-
-func NewQEthereum(eth *eth.Ethereum) *QEthereum {
- return &QEthereum{
- eth.StateManager(),
- eth.BlockChain(),
- eth.TxPool(),
- }
-}
-
-func (lib *QEthereum) GetBlock(hexHash string) *QBlock {
- hash := ethutil.FromHex(hexHash)
-
- block := lib.blockChain.GetBlock(hash)
-
- return &QBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
-}
-
-func (lib *QEthereum) GetKey() string {
- return ethutil.Hex(ethutil.Config.Db.GetKeys()[0].Address())
-}
-
-func (lib *QEthereum) GetStateObject(address string) *QStateObject {
- stateObject := lib.stateManager.ProcState().GetContract(ethutil.FromHex(address))
- if stateObject != nil {
- return NewQStateObject(stateObject)
- }
-
- // See GetStorage for explanation on "nil"
- return NewQStateObject(nil)
-}
-
-func (lib *QEthereum) Watch(addr, storageAddr string) {
- // lib.stateManager.Watch(ethutil.FromHex(addr), ethutil.FromHex(storageAddr))
-}
-
-func (lib *QEthereum) CreateTx(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
- return lib.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
-}
-
-func (lib *QEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
- var hash []byte
- var contractCreation bool
- if len(recipient) == 0 {
- contractCreation = true
- } else {
- hash = ethutil.FromHex(recipient)
- }
-
- keyPair := ethutil.Config.Db.GetKeys()[0]
- value := ethutil.Big(valueStr)
- gas := ethutil.Big(gasStr)
- gasPrice := ethutil.Big(gasPriceStr)
- var tx *ethchain.Transaction
- // Compile and assemble the given data
- if contractCreation {
- // Compile script
- mainScript, initScript, err := utils.CompileScript(dataStr)
- if err != nil {
- return "", err
- }
-
- tx = ethchain.NewContractCreationTx(value, gas, gasPrice, mainScript, initScript)
- } else {
- lines := strings.Split(dataStr, "\n")
- var data []byte
- for _, line := range lines {
- data = append(data, ethutil.BigToBytes(ethutil.Big(line), 256)...)
- }
-
- tx = ethchain.NewTransactionMessage(hash, value, gas, gasPrice, data)
- }
- acc := lib.stateManager.GetAddrState(keyPair.Address())
- tx.Nonce = acc.Nonce
- tx.Sign(keyPair.PrivateKey)
- lib.txPool.QueueTransaction(tx)
-
- if contractCreation {
- ethutil.Config.Log.Infof("Contract addr %x", tx.Hash()[12:])
- } else {
- ethutil.Config.Log.Infof("Tx hash %x", tx.Hash())
- }
-
- return ethutil.Hex(tx.Hash()), nil
-}
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index c821fa824..8e6433207 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -7,6 +7,7 @@ import (
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb"
"github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml"
"math/big"
"strings"
@@ -56,9 +57,9 @@ func (ui *Gui) Start(assetPath string) {
// Register ethereum functions
qml.RegisterTypes("Ethereum", 1, 0, []qml.TypeSpec{{
- Init: func(p *QBlock, obj qml.Object) { p.Number = 0; p.Hash = "" },
+ Init: func(p *utils.PBlock, obj qml.Object) { p.Number = 0; p.Hash = "" },
}, {
- Init: func(p *QTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" },
+ Init: func(p *utils.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" },
}})
ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", "0.2"))
@@ -129,13 +130,13 @@ func (ui *Gui) readPreviousTransactions() {
for it.Next() {
tx := ethchain.NewTransactionFromBytes(it.Value())
- ui.win.Root().Call("addTx", NewQTx(tx))
+ ui.win.Root().Call("addTx", utils.NewPTx(tx))
}
it.Release()
}
func (ui *Gui) ProcessBlock(block *ethchain.Block) {
- ui.win.Root().Call("addBlock", NewQBlock(block))
+ ui.win.Root().Call("addBlock", utils.NewPBlock(block))
}
// Simple go routine function that updates the list of peers in the GUI
@@ -156,13 +157,13 @@ func (ui *Gui) update() {
if txMsg.Type == ethchain.TxPre {
if bytes.Compare(tx.Sender(), ui.addr) == 0 && addrState.Nonce <= tx.Nonce {
- ui.win.Root().Call("addTx", NewQTx(tx))
+ ui.win.Root().Call("addTx", utils.NewPTx(tx))
ui.txDb.Put(tx.Hash(), tx.RlpEncode())
addrState.Nonce += 1
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
} else if bytes.Compare(tx.Recipient, ui.addr) == 0 {
- ui.win.Root().Call("addTx", NewQTx(tx))
+ ui.win.Root().Call("addTx", utils.NewPTx(tx))
ui.txDb.Put(tx.Hash(), tx.RlpEncode())
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
diff --git a/ethereal/ui/html_container.go b/ethereal/ui/html_container.go
index 8e3ef0fc7..16cc531f2 100644
--- a/ethereal/ui/html_container.go
+++ b/ethereal/ui/html_container.go
@@ -4,6 +4,7 @@ import (
"errors"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml"
"math/big"
"path/filepath"
@@ -56,12 +57,12 @@ func (app *HtmlApplication) Window() *qml.Window {
}
func (app *HtmlApplication) NewBlock(block *ethchain.Block) {
- b := &QBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
+ b := &utils.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
app.webView.Call("onNewBlockCb", b)
}
func (app *HtmlApplication) ObjectChanged(stateObject *ethchain.StateObject) {
- app.webView.Call("onObjectChangeCb", NewQStateObject(stateObject))
+ app.webView.Call("onObjectChangeCb", utils.NewPStateObject(stateObject))
}
func (app *HtmlApplication) StorageChanged(stateObject *ethchain.StateObject, addr []byte, value *big.Int) {
diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go
index 70462a93d..231fd96e7 100644
--- a/ethereal/ui/library.go
+++ b/ethereal/ui/library.go
@@ -47,14 +47,14 @@ func (lib *EthLib) GetKey() string {
return ethutil.Hex(ethutil.Config.Db.GetKeys()[0].Address())
}
-func (lib *EthLib) GetStateObject(address string) *QStateObject {
+func (lib *EthLib) GetStateObject(address string) *utils.PStateObject {
stateObject := lib.stateManager.ProcState().GetContract(ethutil.FromHex(address))
if stateObject != nil {
- return NewQStateObject(stateObject)
+ return utils.NewPStateObject(stateObject)
}
// See GetStorage for explanation on "nil"
- return NewQStateObject(nil)
+ return utils.NewPStateObject(nil)
}
func (lib *EthLib) Watch(addr, storageAddr string) {
@@ -115,7 +115,7 @@ func (lib *EthLib) Transact(recipient, valueStr, gasStr, gasPriceStr, dataStr st
return ethutil.Hex(tx.Hash()), nil
}
-func (lib *EthLib) GetBlock(hexHash string) *QBlock {
+func (lib *EthLib) GetBlock(hexHash string) *utils.PBlock {
hash, err := hex.DecodeString(hexHash)
if err != nil {
return nil
@@ -123,5 +123,5 @@ func (lib *EthLib) GetBlock(hexHash string) *QBlock {
block := lib.blockChain.GetBlock(hash)
- return &QBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
+ return &utils.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
}
generated by cgit (git 2.34.1) at 2024-11-14 10:40:35 +0800