WIP library, sample app
This commit is contained in:
parent
95a48cea18
commit
3e8b27c9dc
35
test_app.qml
Normal file
35
test_app.qml
Normal file
@ -0,0 +1,35 @@
|
||||
import QtQuick 2.0
|
||||
import QtQuick.Controls 1.0;
|
||||
import QtQuick.Layouts 1.0;
|
||||
import GoExtensions 1.0
|
||||
|
||||
ApplicationWindow {
|
||||
minimumWidth: 500
|
||||
maximumWidth: 500
|
||||
maximumHeight: 100
|
||||
minimumHeight: 100
|
||||
|
||||
title: "Ethereum Dice"
|
||||
|
||||
TextField {
|
||||
id: textField
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
placeholderText: "Amount"
|
||||
}
|
||||
Label {
|
||||
id: txHash
|
||||
anchors.bottom: textField.top
|
||||
anchors.bottomMargin: 5
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
Button {
|
||||
anchors.top: textField.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.topMargin: 5
|
||||
text: "Place bet"
|
||||
onClicked: {
|
||||
txHash.text = eth.createTx("e6716f9544a56c530d868e4bfbacb172315bdead", parseInt(textField.text))
|
||||
}
|
||||
}
|
||||
}
|
28
ui/gui.go
28
ui/gui.go
@ -17,10 +17,15 @@ type Gui struct {
|
||||
engine *qml.Engine
|
||||
component *qml.Common
|
||||
eth *eth.Ethereum
|
||||
|
||||
// The Ethereum library
|
||||
lib *EthLib
|
||||
}
|
||||
|
||||
func New(ethereum *eth.Ethereum) *Gui {
|
||||
return &Gui{eth: ethereum}
|
||||
lib := &EthLib{blockManager: ethereum.BlockManager, blockChain: ethereum.BlockManager.BlockChain(), txPool: ethereum.TxPool}
|
||||
|
||||
return &Gui{eth: ethereum, lib: lib}
|
||||
}
|
||||
|
||||
type Block struct {
|
||||
@ -48,10 +53,10 @@ func (ui *Gui) Start() {
|
||||
}
|
||||
|
||||
ui.win = component.CreateWindow(nil)
|
||||
root := ui.win.Root()
|
||||
|
||||
context := ui.engine.Context()
|
||||
context.SetVar("tester", &Tester{root: root})
|
||||
context.SetVar("eth", ui.lib)
|
||||
context.SetVar("ui", &UiLib{engine: ui.engine})
|
||||
|
||||
ui.eth.BlockManager.SecondaryBlockProcessor = ui
|
||||
|
||||
@ -82,6 +87,23 @@ func (ui *Gui) updatePeers() {
|
||||
}
|
||||
}
|
||||
|
||||
type UiLib struct {
|
||||
engine *qml.Engine
|
||||
}
|
||||
|
||||
func (ui *UiLib) Open(path string) {
|
||||
component, err := ui.engine.LoadFile(path[7:])
|
||||
if err != nil {
|
||||
ethutil.Config.Log.Debugln(err)
|
||||
}
|
||||
win := component.CreateWindow(nil)
|
||||
|
||||
go func() {
|
||||
win.Show()
|
||||
win.Wait()
|
||||
}()
|
||||
}
|
||||
|
||||
type Tester struct {
|
||||
root qml.Object
|
||||
}
|
||||
|
42
ui/library.go
Normal file
42
ui/library.go
Normal file
@ -0,0 +1,42 @@
|
||||
package ethui
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"github.com/ethereum/eth-go/ethchain"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"math/big"
|
||||
)
|
||||
|
||||
type EthLib struct {
|
||||
blockManager *ethchain.BlockManager
|
||||
blockChain *ethchain.BlockChain
|
||||
txPool *ethchain.TxPool
|
||||
}
|
||||
|
||||
func (lib *EthLib) CreateTx(receiver string, amount uint64) string {
|
||||
hash, err := hex.DecodeString(receiver)
|
||||
if err != nil {
|
||||
return err.Error()
|
||||
}
|
||||
|
||||
tx := ethchain.NewTransaction(hash, big.NewInt(int64(amount)), []string{""})
|
||||
data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
|
||||
keyRing := ethutil.NewValueFromBytes(data)
|
||||
tx.Sign(keyRing.Get(0).Bytes())
|
||||
|
||||
lib.txPool.QueueTransaction(tx)
|
||||
|
||||
return ethutil.Hex(tx.Hash())
|
||||
}
|
||||
|
||||
func (lib *EthLib) GetBlock(hexHash string) *Block {
|
||||
hash, err := hex.DecodeString(hexHash)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
block := lib.blockChain.GetBlock(hash)
|
||||
fmt.Println(block)
|
||||
return &Block{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
|
||||
}
|
59
wallet.qml
59
wallet.qml
@ -1,6 +1,7 @@
|
||||
import QtQuick 2.0
|
||||
import QtQuick.Controls 1.0;
|
||||
import QtQuick.Layouts 1.0;
|
||||
import QtQuick.Dialogs 1.0;
|
||||
import GoExtensions 1.0
|
||||
|
||||
ApplicationWindow {
|
||||
@ -12,6 +13,7 @@ ApplicationWindow {
|
||||
|
||||
title: "Ethereal"
|
||||
|
||||
|
||||
toolBar: ToolBar {
|
||||
id: mainToolbar
|
||||
|
||||
@ -19,7 +21,7 @@ ApplicationWindow {
|
||||
width: parent.width
|
||||
Button {
|
||||
text: "Send"
|
||||
onClicked: tester.compile(codeView)
|
||||
onClicked: console.log("SEND")
|
||||
}
|
||||
|
||||
TextField {
|
||||
@ -66,35 +68,50 @@ ApplicationWindow {
|
||||
TableViewColumn{ role: "hash" ; title: "Hash" ; width: 560 }
|
||||
|
||||
model: blockModel
|
||||
|
||||
onDoubleClicked: {
|
||||
console.log(eth.getBlock(blockModel.get(row).hash))
|
||||
}
|
||||
}
|
||||
|
||||
FileDialog {
|
||||
id: openAppDialog
|
||||
title: "Open QML Application"
|
||||
onAccepted: {
|
||||
ui.open(openAppDialog.fileUrl.toString())
|
||||
}
|
||||
}
|
||||
|
||||
statusBar: StatusBar {
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
Label { text: "0.0.1" }
|
||||
Label {
|
||||
anchors.right: peerImage.left
|
||||
anchors.rightMargin: 5
|
||||
id: peerLabel
|
||||
font.pixelSize: 8
|
||||
text: "0 / 0"
|
||||
}
|
||||
|
||||
Image {
|
||||
id: peerImage
|
||||
anchors.right: parent.right
|
||||
width: 10; height: 10
|
||||
source: "network.png"
|
||||
}
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
Button {
|
||||
onClicked: openAppDialog.open()
|
||||
text: "Import App"
|
||||
}
|
||||
|
||||
Label { text: "0.0.1" }
|
||||
Label {
|
||||
anchors.right: peerImage.left
|
||||
anchors.rightMargin: 5
|
||||
id: peerLabel
|
||||
font.pixelSize: 8
|
||||
text: "0 / 0"
|
||||
}
|
||||
Image {
|
||||
id: peerImage
|
||||
anchors.right: parent.right
|
||||
width: 10; height: 10
|
||||
source: "network.png"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function addBlock(block) {
|
||||
blockModel.insert(0, {number: block.number, hash: block.hash})
|
||||
blockModel.insert(0, {number: block.number, hash: block.hash})
|
||||
}
|
||||
|
||||
function setPeers(text) {
|
||||
peerLabel.text = text
|
||||
}
|
||||
peerLabel.text = text
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user