Merge branch 'master' into fix-pebble-metrics-registration

magicxyyz · web-flow · commit 92b91d3fac58 · 2024-05-02T17:31:47.000+02:00
diff --git a/arbitrum/apibackend.go b/arbitrum/apibackend.go
@@ -282,7 +282,7 @@ func (a *APIBackend) FeeHistory(
 			currentTimestampGasUsed = 0
 		}
 
-		receipts := a.BlockChain().GetReceiptsByHash(header.ReceiptHash)
+		receipts := a.BlockChain().GetReceiptsByHash(header.Hash())
 		for _, receipt := range receipts {
 			if receipt.GasUsed > receipt.GasUsedForL1 {
 				currentTimestampGasUsed += receipt.GasUsed - receipt.GasUsedForL1

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ func (a *APIBackend) FeeHistory(`
`282`	`282`	`currentTimestampGasUsed = 0`
`283`	`283`	`}`
`284`	`284`
`285`		`- receipts := a.BlockChain().GetReceiptsByHash(header.ReceiptHash)`
	`285`	`+ receipts := a.BlockChain().GetReceiptsByHash(header.Hash())`
`286`	`286`	`for _, receipt := range receipts {`
`287`	`287`	`if receipt.GasUsed > receipt.GasUsedForL1 {`
`288`	`288`	`currentTimestampGasUsed += receipt.GasUsed - receipt.GasUsedForL1`