aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-14 23:52:14 +0800
committerobscuren <geffobscura@gmail.com>2015-02-14 23:52:14 +0800
commit32c7ebc51dcb31f21efe1b9c75f2b86cd216f510 (patch)
tree200d8e48da46816b6b741de51dece5d7c15ba17a /core
parent65159d65c8c830342b3b1ca666571997209826c5 (diff)
downloaddexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.tar
dexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.tar.gz
dexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.tar.bz2
dexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.tar.lz
dexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.tar.xz
dexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.tar.zst
dexon-32c7ebc51dcb31f21efe1b9c75f2b86cd216f510.zip
Fixed mining & limited hash power
Diffstat (limited to 'core')
-rw-r--r--core/types/block.go3
-rw-r--r--core/types/receipt.go2
2 files changed, 3 insertions, 2 deletions
diff --git a/core/types/block.go b/core/types/block.go
index 562a21239..fa28f5cc7 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -209,6 +209,7 @@ func (self *Block) ParentHash() []byte {
func (self *Block) String() string {
return fmt.Sprintf(`BLOCK(%x): Size: %v TD: %v {
+NoNonce: %x
Header:
[
%v
@@ -218,7 +219,7 @@ Transactions:
Uncles:
%v
}
-`, self.header.Hash(), self.Size(), self.Td, self.header, self.transactions, self.uncles)
+`, self.header.Hash(), self.Size(), self.Td, self.header.HashNoNonce(), self.header, self.transactions, self.uncles)
}
func (self *Header) String() string {
diff --git a/core/types/receipt.go b/core/types/receipt.go
index bac64e41d..49e68e233 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -17,7 +17,7 @@ type Receipt struct {
}
func NewReceipt(root []byte, cumalativeGasUsed *big.Int) *Receipt {
- return &Receipt{PostState: ethutil.CopyBytes(root), CumulativeGasUsed: cumalativeGasUsed}
+ return &Receipt{PostState: ethutil.CopyBytes(root), CumulativeGasUsed: new(big.Int).Set(cumalativeGasUsed)}
}
func NewRecieptFromValue(val *ethutil.Value) *Receipt {