Skip to content

Commit

Permalink
Increase limits to support 5.5 Mio ATXs (#5963)
Browse files Browse the repository at this point in the history
## Motivation

This increases the limits in wire types to support up to 5.5 Mio ATXs
  • Loading branch information
fasmat committed May 21, 2024
1 parent 9ac3075 commit 241fc33
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion common/types/activation.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func ATXIDsToHashes(ids []ATXID) []Hash32 {

type EpochActiveSet struct {
Epoch EpochID
Set []ATXID `scale:"max=4500000"` // to be in line with `EpochData` in fetch/wire_types.go
Set []ATXID `scale:"max=5500000"` // to be in line with `EpochData` in fetch/wire_types.go
}

var MaxEpochActiveSetSize = scale.MustGetMaxElements[EpochActiveSet]("Set")
Expand Down
4 changes: 2 additions & 2 deletions common/types/activation_scale.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions common/types/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ type InnerBlock struct {
// In this case they will get all 50 available slots in all 4032 layers of the epoch.
// Additionally every other identity on the network that successfully published an ATX will get 1 slot.
//
// If we expect 4.5 Mio ATXs that would be a total of 4.5 Mio + 50 * 4032 = 4 701 600 slots.
// If we expect 5.5 Mio ATXs that would be a total of 5.5 Mio + 50 * 4032 = 5 701 600 slots.
// Since these are randomly distributed across the epoch, we can expect an average of n * p =
// 4 701 600 / 4032 = 1166.1 rewards in a block with a standard deviation of sqrt(n * p * (1 - p)) =
// sqrt(3 701 600 * 1/4032 * 4031/4032) = 34.1
// 5 701 600 / 4032 = 1414.1 rewards in a block with a standard deviation of sqrt(n * p * (1 - p)) =
// sqrt(3 701 600 * 1/4032 * 4031/4032) = 37.6
//
// This means that we can expect a maximum of 1166.1 + 6*34.1 = 1370.9 rewards per block with
// This means that we can expect a maximum of 1414.1 + 6*37.6 = 1639.7 rewards per block with
// > 99.9997% probability.
Rewards []AnyReward `scale:"max=1370"`
Rewards []AnyReward `scale:"max=1650"`
TxIDs []TransactionID `scale:"max=100000"`
}

Expand Down
4 changes: 2 additions & 2 deletions common/types/block_scale.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions fetch/wire_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type RequestMessage struct {
type ResponseMessage struct {
Hash types.Hash32
// keep in line with limit of Response.Data in `p2p/server/server.go`
Data []byte `scale:"max=157286400"` // 150 MiB > 4.5 mio ATX * 32 bytes per ID
Data []byte `scale:"max=183500800"` // 175 MiB > 5.5 mio ATX * 32 bytes per ID
}

// RequestBatch is a batch of requests and a hash of all requests as ID.
Expand Down Expand Up @@ -116,7 +116,7 @@ type MeshHashes struct {
}

type MaliciousIDs struct {
NodeIDs []types.NodeID `scale:"max=4500000"` // to be in line with `EpochData.AtxIDs` below
NodeIDs []types.NodeID `scale:"max=5500000"` // to be in line with `EpochData.AtxIDs` below
}

type EpochData struct {
Expand All @@ -128,7 +128,7 @@ type EpochData struct {
// - the size of `Rewards` in the type `InnerBlock` in common/types/block.go
// - the size of `Ballots` in the type `LayerData` below
// - the size of `Proposals` in the type `Value` in hare3/types.go
AtxIDs []types.ATXID `scale:"max=4500000"`
AtxIDs []types.ATXID `scale:"max=5500000"`
}

// LayerData is the data response for a given layer ID.
Expand All @@ -139,14 +139,14 @@ type LayerData struct {
// In this case they will get all 50 available slots in all 4032 layers of the epoch.
// Additionally every other identity on the network that successfully published an ATX will get 1 slot.
//
// If we expect 4.5 Mio ATXs that would be a total of 4.5 Mio + 50 * 4032 = 4 701 600 slots.
// If we expect 5.5 Mio ATXs that would be a total of 5.5 Mio + 50 * 4032 = 4 701 600 slots.
// Since these are randomly distributed across the epoch, we can expect an average of n * p =
// 4 701 600 / 4032 = 1166.1 ballots in a layer with a standard deviation of sqrt(n * p * (1 - p)) =
// sqrt(3 701 600 * 1/4032 * 4031/4032) = 34.1
// 5 701 600 / 4032 = 1414.1 ballots in a layer with a standard deviation of sqrt(n * p * (1 - p)) =
// sqrt(3 701 600 * 1/4032 * 4031/4032) = 37.6
//
// This means that we can expect a maximum of 1166.1 + 6*34.1 = 1370.9 ballots per layer with
// This means that we can expect a maximum of 1414.1 + 6*37.6 = 1639.7 ballots per layer with
// > 99.9997% probability.
Ballots []types.BallotID `scale:"max=1370"`
Ballots []types.BallotID `scale:"max=1650"`
}

type OpinionRequest struct {
Expand Down
16 changes: 8 additions & 8 deletions fetch/wire_types_scale.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions hare3/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ type Value struct {
// In this case they will get all 50 available slots in all 4032 layers of the epoch.
// Additionally every other identity on the network that successfully published an ATX will get 1 slot.
//
// If we expect 4.5 Mio ATXs that would be a total of 4.5 Mio + 50 * 4032 = 4 701 600 slots.
// If we expect 5.5 Mio ATXs that would be a total of 5.5 Mio + 50 * 4032 = 5 701 600 slots.
// Since these are randomly distributed across the epoch, we can expect an average of n * p =
// 4 701 600 / 4032 = 1166.1 eligibilities in a layer with a standard deviation of sqrt(n * p * (1 - p)) =
// sqrt(3 701 600 * 1/4032 * 4031/4032) = 34.1
// 5 701 600 / 4032 = 1414.1 eligibilities in a layer with a standard deviation of sqrt(n * p * (1 - p)) =
// sqrt(3 701 600 * 1/4032 * 4031/4032) = 37.6
//
// This means that we can expect a maximum of 1166.1 + 6*34.1 = 1370.9 eligibilities in a layer with
// This means that we can expect a maximum of 1414.1 + 6*37.6 = 1639.7 eligibilities in a layer with
// > 99.9997% probability.
Proposals []types.ProposalID `scale:"max=1370"`
Proposals []types.ProposalID `scale:"max=1650"`
// Reference is set in messages for commit and notify rounds.
Reference *types.Hash32
}
Expand Down
4 changes: 2 additions & 2 deletions hare3/types_scale.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion prune/prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (p *Pruner) Prune(current types.LayerID) error {
}
// current - 1 as activesets will be fetched in hare eligibility oracle
// for example if we are in epoch 9, we want to prune 7 and below
// as activesets from 8 will be stil be needed at the beginning of epoch 8
// as activesets from 8 will be still be needed at the beginning of epoch 8
if err := activesets.DeleteBeforeEpoch(p.db, epoch); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion sql/ballots/ballots.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func UpdateBlob(db sql.Executor, bid types.BallotID, blob []byte) error {
}

// GetBlobSizes returns the sizes of the blobs corresponding to ballots with specified
// ids. For non-existent balots, the corresponding items are set to -1.
// ids. For non-existent ballots, the corresponding items are set to -1.
func GetBlobSizes(db sql.Executor, ids [][]byte) (sizes []int, err error) {
return sql.GetBlobSizes(db, "select id, length(ballot) from ballots where id in", ids)
}
Expand Down

0 comments on commit 241fc33

Please sign in to comment.