eth/api,api_backend: Changed 'Finalized' block number to be valid in RPC API.

cp-jhjin · cp-jhjin · commit 5919efad0ce2 · 2023-12-06T14:53:36.000+09:00
diff --git a/eth/api.go b/eth/api.go
@@ -353,7 +353,7 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error
 	if blockNr == rpc.LatestBlockNumber {
 		block = api.eth.blockchain.CurrentBlock()
 	} else if blockNr == rpc.FinalizedBlockNumber {
-		block = api.eth.blockchain.CurrentFinalizedBlock()
+		block = api.eth.blockchain.CurrentBlock()
 	} else {
 		block = api.eth.blockchain.GetBlockByNumber(uint64(blockNr))
 	}
@@ -443,7 +443,7 @@ func (api *PublicDebugAPI) AccountRange(blockNrOrHash rpc.BlockNumberOrHash, sta
 			if number == rpc.LatestBlockNumber {
 				block = api.eth.blockchain.CurrentBlock()
 			} else if number == rpc.FinalizedBlockNumber {
-				block = api.eth.blockchain.CurrentFinalizedBlock()
+				block = api.eth.blockchain.CurrentBlock()
 			} else {
 				block = api.eth.blockchain.GetBlockByNumber(uint64(number))
 			}
diff --git a/eth/api_backend.go b/eth/api_backend.go
@@ -76,7 +76,7 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumb
 		return b.eth.blockchain.CurrentBlock().Header(), nil
 	}
 	if number == rpc.FinalizedBlockNumber {
-		return b.eth.blockchain.CurrentFinalizedBlock().Header(), nil
+		return b.eth.blockchain.CurrentBlock().Header(), nil
 	}
 	return b.eth.blockchain.GetHeaderByNumber(uint64(number)), nil
 }
@@ -113,7 +113,7 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
 		return b.eth.blockchain.CurrentBlock(), nil
 	}
 	if number == rpc.FinalizedBlockNumber {
-		return b.eth.blockchain.CurrentFinalizedBlock(), nil
+		return b.eth.blockchain.CurrentBlock(), nil
 	}
 	return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumb`
`76`	`76`	`return b.eth.blockchain.CurrentBlock().Header(), nil`
`77`	`77`	`}`
`78`	`78`	`if number == rpc.FinalizedBlockNumber {`
`79`		`- return b.eth.blockchain.CurrentFinalizedBlock().Header(), nil`
	`79`	`+ return b.eth.blockchain.CurrentBlock().Header(), nil`
`80`	`80`	`}`
`81`	`81`	`return b.eth.blockchain.GetHeaderByNumber(uint64(number)), nil`
`82`	`82`	`}`
`@@ -113,7 +113,7 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe`
`113`	`113`	`return b.eth.blockchain.CurrentBlock(), nil`
`114`	`114`	`}`
`115`	`115`	`if number == rpc.FinalizedBlockNumber {`
`116`		`- return b.eth.blockchain.CurrentFinalizedBlock(), nil`
	`116`	`+ return b.eth.blockchain.CurrentBlock(), nil`
`117`	`117`	`}`
`118`	`118`	`return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil`
`119`	`119`	`}`