internal/ethapi: fix recover sender of pending transaction (#23765)

MariusVanDerWijden · web-flow · commit 433f0919cc39 · 2021-10-18T20:53:08.000+02:00
* internal/ethapi: fix recover sender of pending transaction

* internal/ethapi: check if current exists
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1334,10 +1334,12 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber
 // newRPCPendingTransaction returns a pending transaction that will serialize to the RPC representation
 func newRPCPendingTransaction(tx *types.Transaction, current *types.Header, config *params.ChainConfig) *RPCTransaction {
 	var baseFee *big.Int
+	blockNumber := uint64(0)
 	if current != nil {
 		baseFee = misc.CalcBaseFee(config, current)
+		blockNumber = current.Number.Uint64()
 	}
-	return newRPCTransaction(tx, common.Hash{}, 0, 0, baseFee, config)
+	return newRPCTransaction(tx, common.Hash{}, blockNumber, 0, baseFee, config)
 }
 
 // newRPCTransactionFromBlockIndex returns a transaction that will serialize to the RPC representation.

Original file line number	Diff line number	Diff line change
`@@ -1334,10 +1334,12 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber`
`1334`	`1334`	`// newRPCPendingTransaction returns a pending transaction that will serialize to the RPC representation`
`1335`	`1335`	`func newRPCPendingTransaction(tx types.Transaction, current types.Header, config params.ChainConfig) RPCTransaction {`
`1336`	`1336`	`var baseFee *big.Int`
	`1337`	`+ blockNumber := uint64(0)`
`1337`	`1338`	`if current != nil {`
`1338`	`1339`	`baseFee = misc.CalcBaseFee(config, current)`
	`1340`	`+ blockNumber = current.Number.Uint64()`
`1339`	`1341`	`}`
`1340`		`- return newRPCTransaction(tx, common.Hash{}, 0, 0, baseFee, config)`
	`1342`	`+ return newRPCTransaction(tx, common.Hash{}, blockNumber, 0, baseFee, config)`
`1341`	`1343`	`}`
`1342`	`1344`
`1343`	`1345`	`// newRPCTransactionFromBlockIndex returns a transaction that will serialize to the RPC representation.`