Merge branch 'develop' into feature/mnemonic

pull/33/merge
Maran 11 years ago
commit 52b63459e9
  1. 17
      ethereal/assets/qml/wallet.qml
  2. 12
      ethereal/ui/library.go
  3. 1
      ethereal/ui/ui_lib.go
  4. 44
      ethereum/ethereum.go

@ -199,9 +199,22 @@ ApplicationWindow {
text: "Send" text: "Send"
onClicked: { onClicked: {
//this.enabled = false //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.left: aboutIcon.right
anchors.leftMargin: 10 anchors.leftMargin: 10
font.pointSize: 12 font.pointSize: 12
text: "<h2>Ethereum(Go)</h2><br><h3>Development</h3>Jeffrey Wilcke<br><h3>Binary Distribution</h3>Jarrad Hope<br>" text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br><h3>Binary Distribution</h3>Jarrad Hope<br>"
} }
} }

@ -15,7 +15,7 @@ type EthLib struct {
txPool *ethchain.TxPool 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 hash []byte
var contractCreation bool var contractCreation bool
if len(recipient) == 0 { if len(recipient) == 0 {
@ -24,7 +24,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
var err error var err error
hash, err = hex.DecodeString(recipient) hash, err = hex.DecodeString(recipient)
if err != nil { if err != nil {
return err.Error() return "", err
} }
} }
@ -37,7 +37,7 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
if contractCreation { if contractCreation {
asm, err := mutan.Compile(strings.NewReader(data), false) asm, err := mutan.Compile(strings.NewReader(data), false)
if err != nil { if err != nil {
return err.Error() return "", err
} }
code := ethutil.Assemble(asm...) code := ethutil.Assemble(asm...)
@ -45,7 +45,9 @@ func (lib *EthLib) CreateTx(recipient, valueStr, gasStr, gasPriceStr, data strin
} else { } else {
tx = ethchain.NewTransactionMessage(hash, value, gasPrice, gas, []string{}) 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) tx.Sign(keyPair.PrivateKey)
lib.txPool.QueueTransaction(tx) 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()) ethutil.Config.Log.Infof("Tx hash %x", tx.Hash())
} }
return ethutil.Hex(tx.Hash()) return ethutil.Hex(tx.Hash()), nil
} }
/* /*

@ -58,7 +58,6 @@ func (ui *UiLib) AssetPath(p string) string {
func DefaultAssetPath() string { func DefaultAssetPath() string {
var base string var base string
// If the current working directory is the go-ethereum dir // If the current working directory is the go-ethereum dir
// assume a debug build and use the source directory as // assume a debug build and use the source directory as
// asset directory. // asset directory.

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"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/ethminer"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"log" "log"
"os" "os"
@ -121,36 +121,22 @@ func main() {
// Fake block mining. It broadcasts a new block every 5 seconds // Fake block mining. It broadcasts a new block every 5 seconds
go func() { go func() {
pow := &ethchain.EasyPow{}
data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) if StartMining {
keyRing := ethutil.NewValueFromBytes(data) log.Printf("Miner started\n")
addr := keyRing.Get(1).Bytes()
go func() {
for { data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
txs := ethereum.TxPool().Flush() keyRing := ethutil.NewValueFromBytes(data)
// Create a new block which we're going to mine addr := keyRing.Get(1).Bytes()
block := ethereum.BlockChain().NewBlock(addr, txs)
log.Println("Mining on new block. Includes", len(block.Transactions()), "transactions") miner := ethminer.NewDefaultMiner(addr, ethereum)
miner.Start()
ethereum.StateManager().Prepare(block.State(), block.State())
// Apply all transactions to the block }()
ethereum.StateManager().ApplyTransactions(block, block.Transactions())
ethereum.StateManager().AccumelateRewards(block)
// Search the nonce
block.Nonce = pow.Search(block)
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 // Wait for shutdown

Loading…
Cancel
Save