|
|
@ -121,12 +121,6 @@ func (b *Block) DeprecatedTd() *big.Int { |
|
|
|
return b.td |
|
|
|
return b.td |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// StorageBlock defines the RLP encoding of a Block stored in the
|
|
|
|
|
|
|
|
// state database. The StorageBlock encoding contains fields that
|
|
|
|
|
|
|
|
// would otherwise need to be recomputed.
|
|
|
|
|
|
|
|
// [deprecated by eth/63]
|
|
|
|
|
|
|
|
type StorageBlock Block |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// "external" block encoding. used for eth protocol, etc.
|
|
|
|
// "external" block encoding. used for eth protocol, etc.
|
|
|
|
type extblock struct { |
|
|
|
type extblock struct { |
|
|
|
Header *block.Header |
|
|
|
Header *block.Header |
|
|
@ -135,15 +129,6 @@ type extblock struct { |
|
|
|
IncomingReceipts CXReceiptsProofs |
|
|
|
IncomingReceipts CXReceiptsProofs |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// [deprecated by eth/63]
|
|
|
|
|
|
|
|
// "storage" block encoding. used for database.
|
|
|
|
|
|
|
|
type storageblock struct { |
|
|
|
|
|
|
|
Header *block.Header |
|
|
|
|
|
|
|
Txs []*Transaction |
|
|
|
|
|
|
|
Uncles []*block.Header |
|
|
|
|
|
|
|
TD *big.Int |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// NewBlock creates a new block. The input data is copied,
|
|
|
|
// NewBlock creates a new block. The input data is copied,
|
|
|
|
// changes to header and to the field values will not affect the
|
|
|
|
// changes to header and to the field values will not affect the
|
|
|
|
// block.
|
|
|
|
// block.
|
|
|
@ -221,17 +206,6 @@ func (b *Block) EncodeRLP(w io.Writer) error { |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// DecodeRLP decodes RLP
|
|
|
|
|
|
|
|
// [deprecated by eth/63]
|
|
|
|
|
|
|
|
func (b *StorageBlock) DecodeRLP(s *rlp.Stream) error { |
|
|
|
|
|
|
|
var sb storageblock |
|
|
|
|
|
|
|
if err := s.Decode(&sb); err != nil { |
|
|
|
|
|
|
|
return err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
b.header, b.uncles, b.transactions, b.td = sb.Header, sb.Uncles, sb.Txs, sb.TD |
|
|
|
|
|
|
|
return nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Uncles return uncles.
|
|
|
|
// Uncles return uncles.
|
|
|
|
func (b *Block) Uncles() []*block.Header { |
|
|
|
func (b *Block) Uncles() []*block.Header { |
|
|
|
return b.uncles |
|
|
|
return b.uncles |
|
|
|