Skip to content

Commit

Permalink
Merge pull request #60 from cyyber/main
Browse files Browse the repository at this point in the history
Fixed incorrect values in params & re-generated proto + ssz files
  • Loading branch information
cyyber authored Jan 21, 2024
2 parents 5eba514 + 1567967 commit b8b0360
Show file tree
Hide file tree
Showing 13 changed files with 1,526 additions and 1,530 deletions.
12 changes: 6 additions & 6 deletions config/fieldparams/mainnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ package field_params

const (
Preset = "mainnet"
BlockRootsLength = 8192 // SLOTS_PER_HISTORICAL_ROOT
StateRootsLength = 8192 // SLOTS_PER_HISTORICAL_ROOT
BlockRootsLength = 1024 // SLOTS_PER_HISTORICAL_ROOT
StateRootsLength = 1024 // SLOTS_PER_HISTORICAL_ROOT
RandaoMixesLength = 65536 // EPOCHS_PER_HISTORICAL_VECTOR
HistoricalRootsLength = 16777216 // HISTORICAL_ROOTS_LIMIT
ValidatorRegistryLimit = 1099511627776 // VALIDATOR_REGISTRY_LIMIT
Eth1DataVotesLength = 2048 // SLOTS_PER_ETH1_VOTING_PERIOD
PreviousEpochAttestationsLength = 4096 // MAX_ATTESTATIONS * SLOTS_PER_EPOCH
CurrentEpochAttestationsLength = 4096 // MAX_ATTESTATIONS * SLOTS_PER_EPOCH
SlashingsLength = 8192 // EPOCHS_PER_SLASHINGS_VECTOR
Eth1DataVotesLength = 2 // SLOTS_PER_ETH1_VOTING_PERIOD
PreviousEpochAttestationsLength = 16384 // MAX_ATTESTATIONS * SLOTS_PER_EPOCH
CurrentEpochAttestationsLength = 16384 // MAX_ATTESTATIONS * SLOTS_PER_EPOCH
SlashingsLength = 1024 // EPOCHS_PER_SLASHINGS_VECTOR
SyncCommitteeLength = 16 // SYNC_COMMITTEE_SIZE // TODO (cyyber) : Original value 512, new value needs to be decided
RootLength = 32 // RootLength defines the byte length of a Merkle root.
BLSSignatureLength = 96 // BLSSignatureLength defines the byte length of a BLSSignature.
Expand Down
12 changes: 6 additions & 6 deletions config/params/mainnet_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ var mainnetBeaconConfig = &BeaconChainConfig{
SqrRootSlotsPerEpoch: 11,
MinSeedLookahead: 1,
MaxSeedLookahead: 4,
EpochsPerEth1VotingPeriod: 2, // TODO (cyyber) : Re-evaluate the value
SlotsPerHistoricalRoot: 8192,
MinValidatorWithdrawabilityDelay: 256,
ShardCommitteePeriod: 256,
EpochsPerEth1VotingPeriod: 2, // TODO (cyyber) : Re-evaluate the value
SlotsPerHistoricalRoot: 1024, // TODO (cyyber) : Re-evaluate the value
MinValidatorWithdrawabilityDelay: 16, // TODO (cyyber) : Re-evaluate the value
ShardCommitteePeriod: 16, // TODO (cyyber) : Re-evaluate the value
MinEpochsToInactivityPenalty: 4,
Eth1FollowDistance: 0, // TODO (cyyber) : Re-evaluate the value

Expand Down Expand Up @@ -144,7 +144,7 @@ var mainnetBeaconConfig = &BeaconChainConfig{

// State list length constants.
EpochsPerHistoricalVector: 65536,
EpochsPerSlashingsVector: 8192,
EpochsPerSlashingsVector: 1024,
HistoricalRootsLimit: 16777216,
ValidatorRegistryLimit: 1099511627776,

Expand Down Expand Up @@ -246,7 +246,7 @@ var mainnetBeaconConfig = &BeaconChainConfig{
SyncCommitteeSize: 16, // TODO: (cyyber) finalize SyncCommitteeSize, original value was 512
InactivityScoreBias: 4,
InactivityScoreRecoveryRate: 16,
EpochsPerSyncCommitteePeriod: 256,
EpochsPerSyncCommitteePeriod: 8, // TODO: (cyyber) finalize EpochsPerSyncCommitteePeriod, original value was 512

// Updated penalty values.
InactivityPenaltyQuotientAltair: 3 * 1 << 24, //50331648
Expand Down
4 changes: 2 additions & 2 deletions deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5707,8 +5707,8 @@ def go_dependencies():
patches = [
"//third_party:com_github_theqrl_go_zond_secp256k1.patch",
],
sum = "h1:Gt7hMvqxfEEt3TKGFunMkbkNndnNJ11HCDOiCN/RDzY=",
version = "v0.0.0-20240109134606-45a2c3abad1d",
sum = "h1:1sQh2jTCFNZW29cJo9KvwjKXemIlASZlfQx8rLwYa5E=",
version = "v0.0.0-20240121131316-e347fd2f1f3d",
)
go_repository(
name = "com_github_theqrl_go_zond_types",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ require (
github.com/supranational/blst v0.3.11
github.com/theQRL/go-bitfield v0.0.0-20231204084259-f3b877be8f63
github.com/theQRL/go-qrllib v0.0.0-20230406170304-b7eb19c367e1
github.com/theQRL/go-zond v0.0.0-20240109134606-45a2c3abad1d
github.com/theQRL/go-zond v0.0.0-20240121131316-e347fd2f1f3d
github.com/theQRL/go-zond-wallet-encryptor-keystore v0.0.0-20231020114450-f6f12b82ea8b
github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e
github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279
Expand Down
8 changes: 2 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM
github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s=
github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
Expand Down Expand Up @@ -247,8 +246,6 @@ github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDt
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
github.com/cyyber/go-zond v0.0.0-20231201081419-5ed6809e9a97 h1:0TEb3qShhSSHtryqrKkOqYT5EYsJxY3ti/l12JVdBso=
github.com/cyyber/go-zond v0.0.0-20231201081419-5ed6809e9a97/go.mod h1:05izEtGhNkKpq/ZSK+sD7IrDVOrL9MafXENrGmzkEp0=
github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
Expand Down Expand Up @@ -395,7 +392,6 @@ github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgO
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down Expand Up @@ -1266,8 +1262,8 @@ github.com/theQRL/go-bitfield v0.0.0-20231204084259-f3b877be8f63 h1:cU1QlEDDZ3zI
github.com/theQRL/go-bitfield v0.0.0-20231204084259-f3b877be8f63/go.mod h1:Xm3tb2axH6IT4miFd3hKIeD877Y6aA9Hxf2jOYtfTIk=
github.com/theQRL/go-qrllib v0.0.0-20230406170304-b7eb19c367e1 h1:YvUxImh18qCxX1rjvYF9wqAAL236s2FqrjzTRqg5Alg=
github.com/theQRL/go-qrllib v0.0.0-20230406170304-b7eb19c367e1/go.mod h1:IspDEOeIlmm6GujPeTNygL3T72MUluDDyUa20AisjaQ=
github.com/theQRL/go-zond v0.0.0-20240109134606-45a2c3abad1d h1:Gt7hMvqxfEEt3TKGFunMkbkNndnNJ11HCDOiCN/RDzY=
github.com/theQRL/go-zond v0.0.0-20240109134606-45a2c3abad1d/go.mod h1:vopU4opPUSj6HxhT6mqISmGbTejKcciluUp6OWJvUfI=
github.com/theQRL/go-zond v0.0.0-20240121131316-e347fd2f1f3d h1:1sQh2jTCFNZW29cJo9KvwjKXemIlASZlfQx8rLwYa5E=
github.com/theQRL/go-zond v0.0.0-20240121131316-e347fd2f1f3d/go.mod h1:5sKqD/AAXtpWCmmuisw5bDT5/j3sWG5Bxnh1TYe1BZU=
github.com/theQRL/go-zond-types v0.0.0-20230824233758-ea0b707a1e23 h1:9ifrMzlO0V61aT0nThIPFaEu83VAImLhAWGg5ppDf9A=
github.com/theQRL/go-zond-wallet-encryptor-keystore v0.0.0-20231020114450-f6f12b82ea8b h1:tX4WpoKWAXMyHFLMTQugNISJlPzP+V64y81RClFbufU=
github.com/theQRL/go-zond-wallet-encryptor-keystore v0.0.0-20231020114450-f6f12b82ea8b/go.mod h1:I5bUryQPoIVh1OJ1rEsrzCiX7Z9UNThZv5Z39vhU9aE=
Expand Down
24 changes: 12 additions & 12 deletions proto/engine/v1/generated.ssz.go

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

Loading

0 comments on commit b8b0360

Please sign in to comment.