Added a basic <UNSTABLE> UI

This commit is contained in:
obscuren 2014-02-21 12:37:40 +01:00
parent d7ecc92c41
commit 05c353eca0
4 changed files with 211 additions and 31 deletions

View File

@ -15,11 +15,13 @@ var GenAddr bool
var UseSeed bool var UseSeed bool
var ImportKey string var ImportKey string
var ExportKey bool var ExportKey bool
var UseGui bool
func Init() { func Init() {
flag.BoolVar(&StartConsole, "c", false, "debug and testing console") flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
flag.BoolVar(&StartMining, "m", false, "start dagger mining") flag.BoolVar(&StartMining, "m", false, "start dagger mining")
flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits") flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
flag.BoolVar(&UseGui, "gui", false, "use the gui")
flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
flag.BoolVar(&UseSeed, "seed", true, "seed peers") flag.BoolVar(&UseSeed, "seed", true, "seed peers")
flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")

View File

@ -5,6 +5,8 @@ import (
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/ui"
"github.com/niemeyer/qml"
"github.com/obscuren/secp256k1-go" "github.com/obscuren/secp256k1-go"
"log" "log"
"os" "os"
@ -76,9 +78,16 @@ pubk: %x
} }
func main() { func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
Init() Init()
// Qt has to be initialized in the main thread or it will throw errors
// It has to be called BEFORE setting the maximum procs.
if UseGui {
qml.Init(nil)
}
runtime.GOMAXPROCS(runtime.NumCPU())
ethchain.InitFees() ethchain.InitFees()
ethutil.ReadConfig(".ethereum") ethutil.ReadConfig(".ethereum")
ethutil.Config.Seed = UseSeed ethutil.Config.Seed = UseSeed
@ -156,41 +165,46 @@ func main() {
go console.Start() go console.Start()
} }
RegisterInterupts(ethereum) if UseGui {
gui := ethui.New(ethereum)
gui.Start()
//ethereum.Stop()
} else {
RegisterInterupts(ethereum)
ethereum.Start()
ethereum.Start() if StartMining {
log.Printf("Miner started\n")
if StartMining { // Fake block mining. It broadcasts a new block every 5 seconds
log.Printf("Miner started\n") go func() {
pow := &ethchain.EasyPow{}
data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
keyRing := ethutil.NewValueFromBytes(data)
addr := keyRing.Get(1).Bytes()
// Fake block mining. It broadcasts a new block every 5 seconds for {
go func() { txs := ethereum.TxPool.Flush()
pow := &ethchain.EasyPow{} // Create a new block which we're going to mine
data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
keyRing := ethutil.NewValueFromBytes(data) // Apply all transactions to the block
addr := keyRing.Get(1).Bytes() ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
for { ethereum.BlockManager.AccumelateRewards(block, block)
txs := ethereum.TxPool.Flush()
// Create a new block which we're going to mine
block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
// Apply all transactions to the block
ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
ethereum.BlockManager.AccumelateRewards(block, block) // Search the nonce
block.Nonce = pow.Search(block)
// Search the nonce err := ethereum.BlockManager.ProcessBlock(block)
block.Nonce = pow.Search(block) if err != nil {
err := ethereum.BlockManager.ProcessBlock(block) log.Println(err)
if err != nil { } else {
log.Println(err) log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
} else { }
log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
} }
} }()
}() }
}
// Wait for shutdown // Wait for shutdown
ethereum.WaitForShutdown() ethereum.WaitForShutdown()
}
} }

83
ui/gui.go Normal file
View File

@ -0,0 +1,83 @@
package ethui
import (
"bufio"
"encoding/hex"
"fmt"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/niemeyer/qml"
"strings"
)
type Gui struct {
win *qml.Window
engine *qml.Engine
component *qml.Common
eth *eth.Ethereum
}
func New(ethereum *eth.Ethereum) *Gui {
return &Gui{eth: ethereum}
}
type Block struct {
Number int
Hash string
}
func NewBlockFromBlock(block *ethchain.Block) *Block {
info := block.BlockInfo()
hash := hex.EncodeToString(block.Hash())
return &Block{Number: int(info.Number), Hash: hash}
}
func (ui *Gui) Start() {
qml.RegisterTypes("GoExtensions", 1, 0, []qml.TypeSpec{{
Init: func(p *Block, obj qml.Object) { p.Number = 0; p.Hash = "" },
}})
ethutil.Config.Log.Infoln("[GUI] Starting GUI")
ui.engine = qml.NewEngine()
component, err := ui.engine.LoadFile("wallet.qml")
if err != nil {
panic(err)
}
ui.win = component.CreateWindow(nil)
root := ui.win.Root()
context := ui.engine.Context()
context.SetVar("tester", &Tester{root: root})
ui.eth.BlockManager.SecondaryBlockProcessor = ui
ui.eth.Start()
ui.win.Show()
ui.win.Wait()
}
func (ui *Gui) ProcessBlock(block *ethchain.Block) {
ui.win.Root().Call("addBlock", NewBlockFromBlock(block))
}
type Tester struct {
root qml.Object
}
func (t *Tester) Compile(area qml.Object) {
fmt.Println(area)
ethutil.Config.Log.Infoln("[TESTER] Compiling")
code := area.String("text")
scanner := bufio.NewScanner(strings.NewReader(code))
scanner.Split(bufio.ScanLines)
var lines []string
for scanner.Scan() {
lines = append(lines, scanner.Text())
}
}

81
wallet.qml Normal file
View File

@ -0,0 +1,81 @@
import QtQuick 2.0
import QtQuick.Controls 1.0;
import QtQuick.Layouts 1.0;
import GoExtensions 1.0
ApplicationWindow {
id: root
width: 800
height: 600
minimumHeight: 300
title: "Ethereal"
toolBar: ToolBar {
id: mainToolbar
RowLayout {
width: parent.width
Button {
text: "Send"
onClicked: tester.compile(codeView)
}
TextField {
width: 200
placeholderText: "Amount"
}
TextField {
width: 300
placeholderText: "Receiver Address (or empty for contract)"
Layout.fillWidth: true
}
}
}
SplitView {
id: splitView
height: 200
anchors.top: parent.top
anchors.right: parent.right
anchors.left: parent.left
TextArea {
id: codeView
width: parent.width /2
}
TextArea {
readOnly: true
}
}
property var blockModel: ListModel {
id: blockModel
}
TableView {
width: parent.width
height: 100
anchors.bottom: parent.bottom
anchors.top: splitView.bottom
TableViewColumn{ role: "number" ; title: "#" ; width: 100 }
TableViewColumn{ role: "hash" ; title: "Hash" ; width: 560 }
model: blockModel
}
statusBar: StatusBar {
RowLayout {
Label { text: "0.0.1" }
}
}
function addBlock(block) {
blockModel.append({number: block.number, hash: block.hash})
}
}