eth: modify GetBlockReceipts to identical too GetTransactionReceipt

Author: ian

eth/api.go

@@ -560,9 +560,27 @@ func (api *PrivateDebugAPI) getModifiedAccounts(startBlock, endBlock *types.Bloc
 }
 
 // GetBlockReceipts returns all transaction receipts of the specified block.
-func (api *PrivateDebugAPI) GetBlockReceipts(blockHash common.Hash) (types.Receipts, error) {
+func (api *PrivateDebugAPI) GetBlockReceipts(ctx context.Context, blockHash common.Hash) ([]map[string]interface{}, error) {
 	if receipts := api.eth.blockchain.GetReceiptsByHash(blockHash); receipts != nil {
-		return receipts, nil
+		if block := api.eth.blockchain.GetBlockByHash(blockHash); block != nil {
+			txs := block.Transactions()
+			if len(txs) != len(receipts) {
+				return nil, fmt.Errorf("txs length doesn't equal to receipts' length")
+			}
+
+			txReceipts := make([]map[string]interface{}, 0, len(txs))
+			blockNumber := block.Header().Number
+			for idx, receipt := range receipts {
+				tx := txs[idx]
+				fields, err := ethapi.ToTransactionReceipt(ctx, api.eth.APIBackend, tx, receipt, blockHash, tx.Hash(), blockNumber.Uint64(), uint64(idx))
+				if err != nil {
+					return nil, err
+				}
+				txReceipts = append(txReceipts, fields)
+			}
+
+			return txReceipts, nil
+		}
 	}
 	return nil, errors.New("unknown receipts")
 }

internal/ethapi/api.go

@@ -1609,9 +1609,13 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
 	}
 	receipt := receipts[index]
 
-	// Derive the sender.
+	return ToTransactionReceipt(ctx, s.b, tx, receipt, blockHash, hash, blockNumber, index)
+}
+
+func ToTransactionReceipt(ctx context.Context, b Backend, tx *types.Transaction, receipt *types.Receipt, blockHash common.Hash, hash common.Hash, blockNumber uint64, index uint64) (map[string]interface{}, error) {
+	chainConfig := b.ChainConfig()
 	bigblock := new(big.Int).SetUint64(blockNumber)
-	signer := types.MakeSigner(s.b.ChainConfig(), bigblock)
+	signer := types.MakeSigner(chainConfig, bigblock)
 	from, _ := types.Sender(signer, tx)
 
 	fields := map[string]interface{}{
@@ -1629,10 +1633,10 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
 		"type":              hexutil.Uint(tx.Type()),
 	}
 	// Assign the effective gas price paid
-	if !s.b.ChainConfig().IsLondon(bigblock) {
+	if !chainConfig.IsLondon(bigblock) {
 		fields["effectiveGasPrice"] = hexutil.Uint64(tx.GasPrice().Uint64())
 	} else {
-		header, err := s.b.HeaderByHash(ctx, blockHash)
+		header, err := b.HeaderByHash(ctx, blockHash)
 		if err != nil {
 			return nil, err
 		}