cr fix

chain/params.go

@@ -33,10 +33,6 @@ type Params struct {
 	BurnContract map[uint64]types.Address `json:"burnContract"`
 	// Destination address to initialize default burn contract with
 	BurnContractDestinationAddress types.Address `json:"burnContractDestinationAddress,omitempty"`
-
-	// ProxyContractsAdmin is the address that will have the privilege to change both the proxy
-	// implementation address and the admin
-	ProxyContractsAdmin types.Address `json:"proxyContractsAdmin,omitempty"`
 }
 
 type AddressListConfig struct {

command/genesis/polybft_params.go

@@ -200,7 +200,8 @@ func (p *genesisParams) generatePolyBftChainConfig(o command.OutputFormatter) er
 			WalletAddress: walletPremineInfo.address,
 			WalletAmount:  walletPremineInfo.amount,
 		},
-		BlockTimeDrift: p.blockTimeDrift,
+		BlockTimeDrift:      p.blockTimeDrift,
+		ProxyContractsAdmin: types.StringToAddress(p.proxyContractsAdmin),
 		GovernanceConfig: &polyCommon.GovernanceConfig{
 			VotingDelay:              voteDelay,
 			VotingPeriod:             votingPeriod,
@@ -370,8 +371,6 @@ func (p *genesisParams) generatePolyBftChainConfig(o command.OutputFormatter) er
 		chainConfig.Genesis.BaseFeeEM = command.DefaultGenesisBaseFeeEM
 	}
 
-	chainConfig.Params.ProxyContractsAdmin = types.StringToAddress(p.proxyContractsAdmin)
-
 	return helper.WriteGenesisConfigToDisk(chainConfig, params.genesisPath)
 }
 

consensus/polybft/common/polybft_config.go

@@ -63,6 +63,10 @@ type PolyBFTConfig struct {
 
 	// GovernanceConfig defines on chain governance configuration
 	GovernanceConfig *GovernanceConfig `json:"governanceConfig,omitempty"`
+
+	// ProxyContractsAdmin is the address that will have the privilege to change both the proxy
+	// implementation address and the admin
+	ProxyContractsAdmin types.Address `json:"proxyContractsAdmin,omitempty"`
 }
 
 // LoadPolyBFTConfig loads chain config from provided path and unmarshals PolyBFTConfig

consensus/polybft/polybft.go

@@ -161,7 +161,7 @@ func GenesisPostHookFactory(config *chain.Chain, engineName string) func(txn *st
 			proxyAddr[contracts.RewardTokenContract] = contracts.RewardTokenContractV1
 		}
 
-		if err = setUpProxies(transition, config.Params.ProxyContractsAdmin, proxyAddr); err != nil {
+		if err = setUpProxies(transition, polyBFTConfig.ProxyContractsAdmin, proxyAddr); err != nil {
 			return err
 		}