Skip to content

Commit

Permalink
Extend manifest with chain exchange configuration
Browse files Browse the repository at this point in the history
Add chain exchange configuration to the manifest along with validation.

Part of #792
  • Loading branch information
masih committed Dec 20, 2024
1 parent 7f984d8 commit 0c8b3e4
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 1 deletion.
1 change: 1 addition & 0 deletions f3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ var base = manifest.Manifest{
CertificateExchange: manifest.DefaultCxConfig,
CatchUpAlignment: manifest.DefaultCatchUpAlignment,
PubSub: manifest.DefaultPubSubConfig,
ChainExchange: manifest.DefaultChainExchangeConfig,
}

type testNode struct {
Expand Down
51 changes: 50 additions & 1 deletion manifest/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ var (
CompressionEnabled: false,
}

DefaultChainExchangeConfig = ChainExchangeConfig{
SubscriptionBufferSize: 32,
MaxChainLength: gpbft.ChainDefaultLen,
MaxInstanceLookahead: DefaultCommitteeLookback,
MaxDiscoveredChainsPerInstance: 1_000,
MaxWantedChainsPerInstance: 1_000,
}

// Default instance alignment when catching up.
DefaultCatchUpAlignment = DefaultEcConfig.Period / 2
)
Expand Down Expand Up @@ -164,7 +172,7 @@ type EcConfig struct {
BaseDecisionBackoffTable []float64
// HeadLookback number of unfinalized tipsets to remove from the head
HeadLookback int
// Finalize indicates whether or not F3 should finalize tipsets as F3 agrees on them.
// Finalize indicates whether F3 should finalize tipsets as F3 agrees on them.
Finalize bool
}

Expand Down Expand Up @@ -204,6 +212,31 @@ type PubSubConfig struct {

func (p *PubSubConfig) Validate() error { return nil }

type ChainExchangeConfig struct {
SubscriptionBufferSize int
MaxChainLength int
MaxInstanceLookahead uint64
MaxDiscoveredChainsPerInstance int
MaxWantedChainsPerInstance int
}

func (cx *ChainExchangeConfig) Validate() error {
// Note that MaxInstanceLookahead may be zero, which indicates that the chain
// exchange will only accept discovery of chains from current instance.
switch {
case cx.SubscriptionBufferSize < 1:
return fmt.Errorf("chain exchange subscription buffer size must be at least 1, got: %d", cx.SubscriptionBufferSize)
case cx.MaxChainLength < 1:
return fmt.Errorf("chain exchange max chain length must be at least 1, got: %d", cx.MaxChainLength)
case cx.MaxDiscoveredChainsPerInstance < 1:
return fmt.Errorf("chain exchange max discovered chains per instance must be at least 1, got: %d", cx.MaxDiscoveredChainsPerInstance)
case cx.MaxWantedChainsPerInstance < 1:
return fmt.Errorf("chain exchange max wanted chains per instance must be at least 1, got: %d", cx.MaxWantedChainsPerInstance)

Check warning on line 234 in manifest/manifest.go

View check run for this annotation

Codecov / codecov/patch

manifest/manifest.go#L227-L234

Added lines #L227 - L234 were not covered by tests
default:
return nil
}
}

// Manifest identifies the specific configuration for the F3 instance currently running.
type Manifest struct {
// Pause stops the participation in F3.
Expand Down Expand Up @@ -239,6 +272,8 @@ type Manifest struct {
CertificateExchange CxConfig
// PubSubConfig specifies the pubsub related configuration.
PubSub PubSubConfig
// ChainExchange specifies the chain exchange configuration parameters.
ChainExchange ChainExchangeConfig
}

func (m *Manifest) Equal(o *Manifest) bool {
Expand Down Expand Up @@ -304,6 +339,15 @@ func (m *Manifest) Validate() error {
if err := m.PubSub.Validate(); err != nil {
return fmt.Errorf("invalid manifest: invalid pubsub config: %w", err)
}
if err := m.ChainExchange.Validate(); err != nil {
return fmt.Errorf("invalid manifest: invalid chain exchange config: %w", err)
}

Check warning on line 344 in manifest/manifest.go

View check run for this annotation

Codecov / codecov/patch

manifest/manifest.go#L343-L344

Added lines #L343 - L344 were not covered by tests
if m.ChainExchange.MaxChainLength > m.Gpbft.ChainProposedLength {
return fmt.Errorf("invalid manifest: chain exchange max chain length %d exceeds gpbft proposed chain length %d", m.ChainExchange.MaxChainLength, m.Gpbft.ChainProposedLength)
}

Check warning on line 347 in manifest/manifest.go

View check run for this annotation

Codecov / codecov/patch

manifest/manifest.go#L346-L347

Added lines #L346 - L347 were not covered by tests
if m.ChainExchange.MaxInstanceLookahead > m.CommitteeLookback {
return fmt.Errorf("invalid manifest: chain exchange max instance lookahead %d exceeds committee lookback %d", m.ChainExchange.MaxInstanceLookahead, m.CommitteeLookback)
}

Check warning on line 350 in manifest/manifest.go

View check run for this annotation

Codecov / codecov/patch

manifest/manifest.go#L349-L350

Added lines #L349 - L350 were not covered by tests

return nil
}
Expand All @@ -321,6 +365,7 @@ func LocalDevnetManifest() *Manifest {
CertificateExchange: DefaultCxConfig,
CatchUpAlignment: DefaultCatchUpAlignment,
PubSub: DefaultPubSubConfig,
ChainExchange: DefaultChainExchangeConfig,
}
return m
}
Expand Down Expand Up @@ -356,6 +401,10 @@ func PubSubTopicFromNetworkName(nn gpbft.NetworkName) string {
return "/f3/granite/0.0.2/" + string(nn)
}

func ChainExchangeTopicFromNetworkName(nn gpbft.NetworkName) string {
return "/f3/chainexchange/0.0.1/" + string(nn)

Check warning on line 405 in manifest/manifest.go

View check run for this annotation

Codecov / codecov/patch

manifest/manifest.go#L404-L405

Added lines #L404 - L405 were not covered by tests
}

func (m *Manifest) GpbftOptions() []gpbft.Option {
return m.Gpbft.ToOptions()
}
2 changes: 2 additions & 0 deletions manifest/manifest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ var base = manifest.Manifest{
MinimumPollInterval: 30 * time.Second,
MaximumPollInterval: 2 * time.Minute,
},
PubSub: manifest.DefaultPubSubConfig,
ChainExchange: manifest.DefaultChainExchangeConfig,
CatchUpAlignment: 0,
}

Expand Down

0 comments on commit 0c8b3e4

Please sign in to comment.