From 4913dcf7ab6f6b81accc21f4b2a463b49c0e3a6e Mon Sep 17 00:00:00 2001 From: Chihyun Song Date: Thu, 24 Nov 2022 13:51:51 +0900 Subject: [PATCH 1/2] Add hardfork blocks to chainConfig APIs --- governance/api.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/governance/api.go b/governance/api.go index 640d1d282b..07a6abb342 100644 --- a/governance/api.go +++ b/governance/api.go @@ -284,7 +284,16 @@ func (api *PublicGovernanceAPI) chainConfigAt(num *rpc.BlockNumber) *params.Chai if err != nil { return nil } - return pset.ToChainConfig() + + latestConfig := api.governance.BlockChain().Config() + config := pset.ToChainConfig() + config.IstanbulCompatibleBlock = latestConfig.IstanbulCompatibleBlock + config.LondonCompatibleBlock = latestConfig.LondonCompatibleBlock + config.EthTxTypeCompatibleBlock = latestConfig.EthTxTypeCompatibleBlock + config.MagmaCompatibleBlock = latestConfig.MagmaCompatibleBlock + config.KoreCompatibleBlock = latestConfig.KoreCompatibleBlock + + return config } func (api *PublicGovernanceAPI) NodeAddress() common.Address { From 2c536f81aaf28b3ca8872b88a2c49d28f1262536 Mon Sep 17 00:00:00 2001 From: Chihyun Song Date: Thu, 24 Nov 2022 15:25:02 +0900 Subject: [PATCH 2/2] Add ChainID to chainConfig APIs --- governance/api.go | 1 + 1 file changed, 1 insertion(+) diff --git a/governance/api.go b/governance/api.go index 07a6abb342..0e6feb3b68 100644 --- a/governance/api.go +++ b/governance/api.go @@ -287,6 +287,7 @@ func (api *PublicGovernanceAPI) chainConfigAt(num *rpc.BlockNumber) *params.Chai latestConfig := api.governance.BlockChain().Config() config := pset.ToChainConfig() + config.ChainID = latestConfig.ChainID config.IstanbulCompatibleBlock = latestConfig.IstanbulCompatibleBlock config.LondonCompatibleBlock = latestConfig.LondonCompatibleBlock config.EthTxTypeCompatibleBlock = latestConfig.EthTxTypeCompatibleBlock