diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-18 04:30:17 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-18 04:30:17 +0800 |
| commit | 01d9107bce356e4de94b9506246672d003948203 (patch) | |
| tree | 0d6dcecdce2e4e06f91e2dfdf14d6e92ec063cbd /ethereal | |
| parent | ba3fabda774cc3f0c12542985c7ff252abc034da (diff) | |
| download | dexon-01d9107bce356e4de94b9506246672d003948203.tar.gz dexon-01d9107bce356e4de94b9506246672d003948203.tar.zst dexon-01d9107bce356e4de94b9506246672d003948203.zip | |
Add namecoin name if available to block
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 6 | ||||
| -rw-r--r-- | ethereal/gui.go | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index afb210bec..a9e309356 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -472,7 +472,7 @@ ApplicationWindow { Text { text: '<h3>Block details</h3>'; color: "#F2F2F2"} Text { text: '<b>Block number:</b> ' + number; color: "#F2F2F2"} Text { text: '<b>Hash:</b> ' + hash; color: "#F2F2F2"} - Text { text: '<b>Coinbase:</b> ' + coinbase; color: "#F2F2F2"} + Text { text: '<b>Coinbase:</b> <' + name + '> ' + coinbase; color: "#F2F2F2"} Text { text: '<b>Block found at:</b> ' + prettyTime; color: "#F2F2F2"} Text { text: '<b>Gas used:</b> ' + gasUsed + " / " + gasLimit; color: "#F2F2F2"} } @@ -699,9 +699,9 @@ ApplicationWindow { } if(initial){ - blockModel.append({number: block.number, gasLimit: block.gasLimit, gasUsed: block.gasUsed, coinbase: block.coinbase, hash: block.hash, txs: txs, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)}) + blockModel.append({number: block.number, name: block.name, gasLimit: block.gasLimit, gasUsed: block.gasUsed, coinbase: block.coinbase, hash: block.hash, txs: txs, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)}) }else{ - blockModel.insert(0, {number: block.number, gasLimit: block.gasLimit, gasUsed: block.gasUsed, coinbase: block.coinbase, hash: block.hash, txs: txs, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)}) + blockModel.insert(0, {number: block.number, name: block.name, gasLimit: block.gasLimit, gasUsed: block.gasUsed, coinbase: block.coinbase, hash: block.hash, txs: txs, txAmount: amount, time: block.time, prettyTime: convertToPretty(block.time)}) } } diff --git a/ethereal/gui.go b/ethereal/gui.go index f777f64f7..9a65ff3d0 100644 --- a/ethereal/gui.go +++ b/ethereal/gui.go @@ -243,7 +243,11 @@ func (gui *Gui) readPreviousTransactions() { } func (gui *Gui) processBlock(block *ethchain.Block, initial bool) { - gui.win.Root().Call("addBlock", ethpub.NewPBlock(block), initial) + name := ethpub.FindNameInNameReg(gui.eth.StateManager(), block.Coinbase) + b := ethpub.NewPBlock(block) + b.Name = name + + gui.win.Root().Call("addBlock", b, initial) } func (gui *Gui) setWalletValue(amount, unconfirmedFunds *big.Int) { |