From d35380c19e5ce92b57158e7780f7105dc4136916 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 23 May 2014 14:37:03 +0200
Subject: New main script through init return value
---
ethereal/ui/gui.go | 5 ++---
ethereal/ui/ui_lib.go | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
(limited to 'ethereal')
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 7290bd6ec..022f192bf 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -9,7 +9,6 @@ import (
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
- "github.com/obscuren/mutan"
"math/big"
"strings"
)
@@ -262,7 +261,7 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.
func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
keyPair := ethutil.GetKeyRing().Get(0)
- mainInput, initInput := mutan.PreParse(data)
+ //mainInput, initInput := mutan.PreParse(data)
- return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput)
+ return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data)
}
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 0c43f1675..1c88b0181 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -135,7 +135,7 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
for _, str := range dis {
ui.win.Root().Call("setAsm", str)
}
- callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), callerScript, nil)
+ callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), nil)
// Contract addr as test address
keyPair := ethutil.GetKeyRing().Get(0)
--
cgit v1.2.3
From b42c70be9c669ba372ed99d820a5a9e807191619 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 26 May 2014 00:10:38 +0200
Subject: Recv send for txs
---
ethereal/assets/qml/wallet.qml | 9 ++++-----
ethereal/ui/gui.go | 16 +++++++++++-----
2 files changed, 15 insertions(+), 10 deletions(-)
(limited to 'ethereal')
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 51f064adf..f23f182f3 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -85,7 +85,6 @@ ApplicationWindow {
//color: "#D9DDE7"
color: "#252525"
-
ColumnLayout {
y: 50
anchors.left: parent.left
@@ -155,6 +154,7 @@ ApplicationWindow {
TableView {
id: txTableView
anchors.fill: parent
+ TableViewColumn{ role: "inout" ; title: "" ; width: 40 }
TableViewColumn{ role: "value" ; title: "Value" ; width: 100 }
TableViewColumn{ role: "address" ; title: "Address" ; width: 430 }
TableViewColumn{ role: "contract" ; title: "Contract" ; width: 100 }
@@ -404,7 +404,7 @@ ApplicationWindow {
anchors.left: aboutIcon.right
anchors.leftMargin: 10
font.pointSize: 12
- text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br><h3>Binary Distribution</h3>Jarrad Hope<br>"
+ text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>"
}
}
@@ -429,7 +429,6 @@ ApplicationWindow {
}
}
SplitView {
-
anchors.fill: parent
property var asmModel: ListModel {
id: asmModel
@@ -524,14 +523,14 @@ ApplicationWindow {
walletValueLabel.text = value
}
- function addTx(tx) {
+ function addTx(tx, inout) {
var isContract
if (tx.contract == true){
isContract = "Yes"
}else{
isContract = "No"
}
- txModel.insert(0, {hash: tx.hash, address: tx.address, value: tx.value, contract: isContract})
+ txModel.insert(0, {inout: inout, hash: tx.hash, address: tx.address, value: tx.value, contract: isContract})
}
function addBlock(block) {
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 022f192bf..a8bfb2b58 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -151,7 +151,15 @@ func (gui *Gui) readPreviousTransactions() {
for it.Next() {
tx := ethchain.NewTransactionFromBytes(it.Value())
- gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
+ var inout string
+ if bytes.Compare(tx.Sender(), gui.addr) == 0 {
+ inout = "send"
+ } else {
+ inout = "recv"
+ }
+
+ gui.win.Root().Call("addTx", ethpub.NewPTx(tx), inout)
+
}
it.Release()
}
@@ -207,12 +215,12 @@ func (gui *Gui) update() {
object := state.GetAccount(gui.addr)
if bytes.Compare(tx.Sender(), gui.addr) == 0 {
- gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
+ gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "send")
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
} else if bytes.Compare(tx.Recipient, gui.addr) == 0 {
- gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
+ gui.win.Root().Call("addTx", ethpub.NewPTx(tx), "recv")
gui.txDb.Put(tx.Hash(), tx.RlpEncode())
unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
@@ -261,7 +269,5 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.
func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
keyPair := ethutil.GetKeyRing().Get(0)
- //mainInput, initInput := mutan.PreParse(data)
-
return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data)
}
--
cgit v1.2.3
From 818bc84591c490b29cb28ee1e4895c8f303a0af1 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 26 May 2014 00:39:05 +0200
Subject: Bump
---
ethereal/ui/gui.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ethereal')
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index a8bfb2b58..8d6796ddb 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -54,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui {
}
func (gui *Gui) Start(assetPath string) {
- const version = "0.5.0 RC8"
+ const version = "0.5.0 RC9"
defer gui.txDb.Close()
--
cgit v1.2.3