exclude types.EmptyUncleHash, remove block/root field for Tron network

nikicat · Feb 23, 2023 · 9ecefac · 9ecefac
1 parent a41be47
commit 9ecefac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/core/types/block.go b/core/types/block.go
@@ -68,10 +68,10 @@ func (n *BlockNonce) UnmarshalText(input []byte) error {
 
 // Header represents a block header in the Ethereum blockchain.
 type Header struct {
+	Root        common.Hash
 	ParentHash  common.Hash    `json:"parentHash"       gencodec:"required"`
 	UncleHash   common.Hash    `json:"sha3Uncles"       gencodec:"required"`
 	Coinbase    common.Address `json:"miner"`
-	Root        common.Hash    `json:"stateRoot"        gencodec:"required"`
 	TxHash      common.Hash    `json:"transactionsRoot" gencodec:"required"`
 	ReceiptHash common.Hash    `json:"receiptsRoot"     gencodec:"required"`
 	Bloom       Bloom          `json:"logsBloom"        gencodec:"required"`

diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
@@ -128,9 +128,9 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface
 	if head.UncleHash == types.EmptyUncleHash && len(body.UncleHashes) > 0 {
 		return nil, fmt.Errorf("server returned non-empty uncle list but block header indicates no uncles")
 	}
-	if head.UncleHash != types.EmptyUncleHash && len(body.UncleHashes) == 0 {
-		return nil, fmt.Errorf("server returned empty uncle list but block header indicates uncles")
-	}
+	//if head.UncleHash != types.EmptyUncleHash && len(body.UncleHashes) == 0 {
+	//	return nil, fmt.Errorf("server returned empty uncle list but block header indicates uncles")
+	//}
 	if head.TxHash == types.EmptyRootHash && len(body.Transactions) > 0 {
 		return nil, fmt.Errorf("server returned non-empty transaction list but block header indicates no transactions")
 	}