aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-10 08:17:31 +0800
committerobscuren <geffobscura@gmail.com>2014-11-10 08:17:31 +0800
commitcbeebcd47da846e1b8990313f1ff1ffe7d0bf00f (patch)
tree95db04f468e66ebb26afd81bc72abea8fbcf7c0e /xeth
parentf538ea25e46d59dfa225ed105343d9c6a9909c2c (diff)
downloaddexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.tar
dexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.tar.gz
dexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.tar.bz2
dexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.tar.lz
dexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.tar.xz
dexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.tar.zst
dexon-cbeebcd47da846e1b8990313f1ff1ffe7d0bf00f.zip
Fixed bloom, updated mining & block processing
* Reverted back to process blocks in batches method * Bloom generation and lookup fix * Minor UI changed (mainly debug)
Diffstat (limited to 'xeth')
-rw-r--r--xeth/js_types.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/xeth/js_types.go b/xeth/js_types.go
index 1a1938648..ff240e21c 100644
--- a/xeth/js_types.go
+++ b/xeth/js_types.go
@@ -26,6 +26,8 @@ type JSBlock struct {
GasLimit string `json:"gasLimit"`
GasUsed string `json:"gasUsed"`
PrevHash string `json:"prevHash"`
+ Bloom string `json:"bloom"`
+ Raw string `json:"raw"`
}
// Creates a new QML Block from a chain block
@@ -54,6 +56,8 @@ func NewJSBlock(block *chain.Block) *JSBlock {
Time: block.Time,
Coinbase: ethutil.Bytes2Hex(block.Coinbase),
PrevHash: ethutil.Bytes2Hex(block.PrevHash),
+ Bloom: ethutil.Bytes2Hex(block.LogsBloom),
+ Raw: block.String(),
}
}