diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 9093e3ca8..b22e82f9a 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -199,9 +199,22 @@ ApplicationWindow {
text: "Send"
onClicked: {
//this.enabled = false
- console.log(eth.createTx(txRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text))
+ var res = eth.createTx(txRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text)
+ if(res[1]) {
+ txOutput.text = "Output:\n" + res[1].error()
+ } else {
+ txOutput.text = "Output:\n" + res[0]
+ }
+ txOutput.visible = true
}
}
+ TextArea {
+ id: txOutput
+ visible: false
+ Layout.fillWidth: true
+ height: 40
+ anchors.bottom: parent.bottom
+ }
}
}
@@ -391,7 +404,7 @@ ApplicationWindow {
anchors.left: aboutIcon.right
anchors.leftMargin: 10
font.pointSize: 12
- text: "
Ethereum(Go)
Development
Jeffrey Wilcke
Binary Distribution
Jarrad Hope
"
+ text: "Ethereal
Development
Jeffrey Wilcke
Maran Hidskes
Binary Distribution
Jarrad Hope
"
}
}
diff --git a/ethereal/ui/library.go b/ethereal/ui/library.go
index 6f8cb6f65..9a7469426 100644
--- a/ethereal/ui/library.go
+++ b/ethereal/ui/library.go
@@ -15,7 +15,7 @@ type EthLib struct {
txPool *ethchain.TxPool
}
-func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data string) string {
+func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data string) (string, error) {
var hash []byte
var contractCreation bool
if len(recipient) == 0 {
@@ -24,7 +24,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
var err error
hash, err = hex.DecodeString(recipient)
if err != nil {
- return err.Error()
+ return "", err
}
}
@@ -37,7 +37,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
if contractCreation {
asm, err := mutan.Compile(strings.NewReader(data), false)
if err != nil {
- return err.Error()
+ return "", err
}
code := ethutil.Assemble(asm...)
@@ -45,7 +45,9 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
} else {
tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, []string{})
}
- tx.Nonce = lib.stateManager.GetAddrState(keyPair.Address()).Nonce
+ acc := lib.stateManager.GetAddrState(keyPair.Address())
+ tx.Nonce = acc.Nonce
+ //acc.Nonce++
tx.Sign(keyPair.PrivateKey)
lib.txPool.QueueTransaction(tx)
@@ -55,7 +57,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
ethutil.Config.Log.Infof("Tx hash %x", tx.Hash())
}
- return ethutil.Hex(tx.Hash())
+ return ethutil.Hex(tx.Hash()), nil
}
/*
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 4441a7238..5c3c98fb9 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -58,7 +58,6 @@ func (ui *UiLib) AssetPath(p string) string {
func DefaultAssetPath() string {
var base string
-
// If the current working directory is the go-ethereum dir
// assume a debug build and use the source directory as
// asset directory.
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index 666c75117..c82e7dcd8 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
+ "github.com/ethereum/eth-go/ethminer"
"github.com/ethereum/eth-go/ethutil"
- "github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/go-ethereum/utils"
"log"
"os"
@@ -121,36 +121,22 @@ func main() {
// Fake block mining. It broadcasts a new block every 5 seconds
go func() {
- pow := ðchain.EasyPow{}
- data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
- keyRing := ethutil.NewValueFromBytes(data)
- addr := keyRing.Get(1).Bytes()
- for {
- txs := ethereum.TxPool().Flush()
- // Create a new block which we're going to mine
- block := ethereum.BlockChain().NewBlock(addr, txs)
- log.Println("Mining on new block. Includes", len(block.Transactions()), "transactions")
+ if StartMining {
+ log.Printf("Miner started\n")
- ethereum.StateManager().Prepare(block.State(), block.State())
- // Apply all transactions to the block
- ethereum.StateManager().ApplyTransactions(block, block.Transactions())
- ethereum.StateManager().AccumelateRewards(block)
+ go func() {
+ data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
+ keyRing := ethutil.NewValueFromBytes(data)
+ addr := keyRing.Get(1).Bytes()
- // Search the nonce
- block.Nonce = pow.Search(block)
+ miner := ethminer.NewDefaultMiner(addr, ethereum)
+ miner.Start()
- ethereum.StateManager().PrepareDefault(block)
- err := ethereum.StateManager().ProcessBlock(block)
- if err != nil {
- log.Println(err)
- } else {
- log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockChain().CurrentBlock)
- log.Printf("🔨 Mined block %x\n", block.Hash())
- ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
- }
+ }()
}
}()
+
}
// Wait for shutdown