Comments fix

command/genesis/params.go

@@ -73,7 +73,6 @@ var (
 	errReserveAccMustBePremined = errors.New("it is mandatory to premine reserve account (0x0 address)")
 	errInvalidVotingPeriod      = errors.New("voting period can not be zero")
 	errInvalidGovernorAdmin     = errors.New("governor admin address must be defined")
-	errBlockTrackerPollInterval = errors.New("block tracker poll interval must be greater than 0")
 )
 
 type genesisParams struct {
@@ -556,7 +555,7 @@ func (p *genesisParams) validateGovernorAdminAddr() error {
 // which can not be 0
 func (p *genesisParams) validateBlockTrackerPollInterval() error {
 	if p.blockTrackerPollInterval == 0 {
-		return errBlockTrackerPollInterval
+		return helper.ErrBlockTrackerPollInterval
 	}
 
 	return nil

command/helper/helper.go

@@ -22,6 +22,8 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
+var ErrBlockTrackerPollInterval = errors.New("block tracker poll interval must be greater than 0")
+
 type ClientCloseResult struct {
 	Message string `json:"message"`
 }

command/server/config/config.go

@@ -33,13 +33,12 @@ type Config struct {
 	JSONLogFormat            bool       `json:"json_log_format" yaml:"json_log_format"`
 	CorsAllowedOrigins       []string   `json:"cors_allowed_origins" yaml:"cors_allowed_origins"`
 
-	Relayer               bool   `json:"relayer" yaml:"relayer"`
-	NumBlockConfirmations uint64 `json:"num_block_confirmations" yaml:"num_block_confirmations"`
+	Relayer                    bool          `json:"relayer" yaml:"relayer"`
+	NumBlockConfirmations      uint64        `json:"num_block_confirmations" yaml:"num_block_confirmations"`
+	RelayerTrackerPollInterval time.Duration `json:"relayer_tracker_poll_interval" yaml:"relayer_tracker_poll_interval"`
 
 	ConcurrentRequestsDebug uint64 `json:"concurrent_requests_debug" yaml:"concurrent_requests_debug"`
 	WebSocketReadLimit      uint64 `json:"web_socket_read_limit" yaml:"web_socket_read_limit"`
-
-	RelayerTrackerPollInterval time.Duration `json:"relayer_tracker_poll_interval" yaml:"relayer_tracker_poll_interval"`
 }
 
 // Telemetry holds the config details for metric services.

command/server/init.go

@@ -58,6 +58,10 @@ func (p *serverParams) initRawParams() error {
 
 	p.relayer = p.rawConfig.Relayer
 
+	if p.relayer && p.rawConfig.RelayerTrackerPollInterval == 0 {
+		return helper.ErrBlockTrackerPollInterval
+	}
+
 	return p.initAddresses()
 }
 

consensus/polybft/consensus_runtime.go

@@ -202,7 +202,7 @@ func (c *consensusRuntime) initStateSyncManager(logger hcf.Logger) error {
 				topic:                    c.config.bridgeTopic,
 				maxCommitmentSize:        maxCommitmentSize,
 				numBlockConfirmations:    c.config.numBlockConfirmations,
-				blockTrackerPollInterval: c.config.GenesisPolyBFTConfig.BlockTrackerPollInterval,
+				blockTrackerPollInterval: c.config.GenesisPolyBFTConfig.BlockTrackerPollInterval.Duration,
 			},
 			c,
 		)

consensus/polybft/state_sync_manager.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"path"
 	"sync"
+	"time"
 
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/bitmap"
 	polybftCommon "github.com/0xPolygon/polygon-edge/consensus/polybft/common"
@@ -16,7 +17,6 @@ import (
 	bls "github.com/0xPolygon/polygon-edge/consensus/polybft/signer"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/validator"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/wallet"
-	"github.com/0xPolygon/polygon-edge/helper/common"
 	"github.com/0xPolygon/polygon-edge/tracker"
 	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/hashicorp/go-hclog"
@@ -70,7 +70,7 @@ type stateSyncConfig struct {
 	key                      *wallet.Key
 	maxCommitmentSize        uint64
 	numBlockConfirmations    uint64
-	blockTrackerPollInterval common.Duration
+	blockTrackerPollInterval time.Duration
 }
 
 var _ StateSyncManager = (*stateSyncManager)(nil)

consensus/polybft/statesyncrelayer/state_sync_relayer.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/contracts"
-	"github.com/0xPolygon/polygon-edge/helper/common"
 	"github.com/0xPolygon/polygon-edge/tracker"
 	"github.com/0xPolygon/polygon-edge/txrelayer"
 	"github.com/0xPolygon/polygon-edge/types"
@@ -32,7 +31,7 @@ type StateSyncRelayer struct {
 	txRelayer              txrelayer.TxRelayer
 	key                    ethgo.Key
 	closeCh                chan struct{}
-	pollInterval           common.Duration
+	pollInterval           time.Duration
 }
 
 func sanitizeRPCEndpoint(rpcEndpoint string) string {
@@ -82,7 +81,7 @@ func NewRelayer(
 		key:                    key,
 		closeCh:                make(chan struct{}),
 		eventTrackerStartBlock: stateReceiverTrackerStartBlock,
-		pollInterval:           common.Duration{Duration: pollInterval},
+		pollInterval:           pollInterval,
 	}
 }
 

tracker/event_tracker.go

@@ -26,7 +26,7 @@ type EventTracker struct {
 	subscriber            eventSubscription
 	logger                hcf.Logger
 	numBlockConfirmations uint64 // minimal number of child blocks required for the parent block to be considered final
-	pollInterval          common.Duration
+	pollInterval          time.Duration
 }
 
 func NewEventTracker(
@@ -37,7 +37,7 @@ func NewEventTracker(
 	numBlockConfirmations uint64,
 	startBlock uint64,
 	logger hcf.Logger,
-	pollInterval common.Duration,
+	pollInterval time.Duration,
 ) *EventTracker {
 	return &EventTracker{
 		dbPath:                dbPath,
@@ -75,7 +75,7 @@ func (e *EventTracker) Start(ctx context.Context) error {
 	}
 
 	jsonBlockTracker := blocktracker.NewJSONBlockTracker(provider.Eth())
-	jsonBlockTracker.PollInterval = e.pollInterval.Duration
+	jsonBlockTracker.PollInterval = e.pollInterval
 	blockTracker := blocktracker.NewBlockTracker(
 		provider.Eth(),
 		blocktracker.WithBlockMaxBacklog(blockMaxBacklog),