diff --git a/beacon-chain/blockchain/kzg/trusted_setup.go b/beacon-chain/blockchain/kzg/trusted_setup.go index 83489ee210..c3687b65db 100644 --- a/beacon-chain/blockchain/kzg/trusted_setup.go +++ b/beacon-chain/blockchain/kzg/trusted_setup.go @@ -11,7 +11,7 @@ import ( ) var ( - // https://github.com/ethereum/consensus-specs/blob/dev/presets/mainnet/trusted_setups/trusted_setup_4096.json + // https://github.com/ethereum/consensus-specs/blob/master/presets/mainnet/trusted_setups/trusted_setup_4096.json //go:embed trusted_setup_4096.json embeddedTrustedSetup []byte // 1.2Mb kzgContext *GoKZG.Context diff --git a/beacon-chain/blockchain/receive_attestation.go b/beacon-chain/blockchain/receive_attestation.go index a96e3132fd..84ce75293e 100644 --- a/beacon-chain/blockchain/receive_attestation.go +++ b/beacon-chain/blockchain/receive_attestation.go @@ -177,7 +177,7 @@ func (s *Service) processAttestations(ctx context.Context, disparity time.Durati for _, a := range atts { // Based on the spec, don't process the attestation until the subsequent slot. // This delays consideration in the fork choice until their slot is in the past. - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/fork-choice.md#validate_on_attestation + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/fork-choice.md#validate_on_attestation nextSlot := a.GetData().Slot + 1 if err := slots.VerifyTime(s.genesisTime, nextSlot, disparity); err != nil { continue diff --git a/beacon-chain/core/helpers/weak_subjectivity.go b/beacon-chain/core/helpers/weak_subjectivity.go index b8f664cbcd..9b708b2801 100644 --- a/beacon-chain/core/helpers/weak_subjectivity.go +++ b/beacon-chain/core/helpers/weak_subjectivity.go @@ -206,9 +206,9 @@ func ParseWeakSubjectivityInputString(wsCheckpointString string) (*v1alpha1.Chec // MinEpochsForBlockRequests computes the number of epochs of block history that we need to maintain, // relative to the current epoch, per the p2p specs. This is used to compute the slot where backfill is complete. // value defined: -// https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/p2p-interface.md#configuration +// https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#configuration // MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2 (= 33024, ~5 months) -// detailed rationale: https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/p2p-interface.md#why-are-blocksbyrange-requests-only-required-to-be-served-for-the-latest-min_epochs_for_block_requests-epochs +// detailed rationale: https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#why-are-blocksbyrange-requests-only-required-to-be-served-for-the-latest-min_epochs_for_block_requests-epochs func MinEpochsForBlockRequests() primitives.Epoch { return params.BeaconConfig().MinValidatorWithdrawabilityDelay + primitives.Epoch(params.BeaconConfig().ChurnLimitQuotient/2) diff --git a/beacon-chain/core/helpers/weak_subjectivity_test.go b/beacon-chain/core/helpers/weak_subjectivity_test.go index 43a20d93c5..b488008365 100644 --- a/beacon-chain/core/helpers/weak_subjectivity_test.go +++ b/beacon-chain/core/helpers/weak_subjectivity_test.go @@ -292,7 +292,7 @@ func TestMinEpochsForBlockRequests(t *testing.T) { params.SetActiveTestCleanup(t, params.MainnetConfig()) var expected primitives.Epoch = 33024 // expected value of 33024 via spec commentary: - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/p2p-interface.md#why-are-blocksbyrange-requests-only-required-to-be-served-for-the-latest-min_epochs_for_block_requests-epochs + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#why-are-blocksbyrange-requests-only-required-to-be-served-for-the-latest-min_epochs_for_block_requests-epochs // MIN_EPOCHS_FOR_BLOCK_REQUESTS is calculated using the arithmetic from compute_weak_subjectivity_period found in the weak subjectivity guide. Specifically to find this max epoch range, we use the worst case event of a very large validator size (>= MIN_PER_EPOCH_CHURN_LIMIT * CHURN_LIMIT_QUOTIENT). // // MIN_EPOCHS_FOR_BLOCK_REQUESTS = ( diff --git a/beacon-chain/das/availability_columns.go b/beacon-chain/das/availability_columns.go index 2ad8c0aff4..83cb3274ad 100644 --- a/beacon-chain/das/availability_columns.go +++ b/beacon-chain/das/availability_columns.go @@ -126,7 +126,7 @@ func (s *LazilyPersistentStoreColumn) IsDataAvailable(ctx context.Context, curre return errors.Wrap(err, "entry filter") } - // https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#datacolumnsidecarsbyrange-v1 + // https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#datacolumnsidecarsbyrange-v1 verifier := s.newDataColumnsVerifier(roDataColumns, verification.ByRangeRequestDataColumnSidecarRequirements) if err := verifier.ValidFields(); err != nil { diff --git a/beacon-chain/db/filesystem/doc.go b/beacon-chain/db/filesystem/doc.go index 2231be4ef8..8368774174 100644 --- a/beacon-chain/db/filesystem/doc.go +++ b/beacon-chain/db/filesystem/doc.go @@ -75,7 +75,7 @@ data-columns Computation of the maximum size of a DataColumnSidecar ------------------------------------------------------ -https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/das-core.md#datacolumnsidecar +https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/das-core.md#datacolumnsidecar class DataColumnSidecar(Container): diff --git a/beacon-chain/p2p/doc.go b/beacon-chain/p2p/doc.go index 84507460d6..38dee8f35c 100644 --- a/beacon-chain/p2p/doc.go +++ b/beacon-chain/p2p/doc.go @@ -1,7 +1,7 @@ /* Package p2p implements the Ethereum consensus networking specification. -Canonical spec reference: https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/p2p-interface.md +Canonical spec reference: https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md Prysm specific implementation design docs - Networking Design Doc: https://docs.google.com/document/d/1VyhobQRkEjEkEPxmmdWvaHfKWn0j6dEae_wLZlrFtfU/view diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go index b6750e7d56..8e7c119fca 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go @@ -315,7 +315,7 @@ func (bs *Server) ListIndexedAttestationsElectra( // that it was included in a block. The attestation may have expired. // Refer to the ethereum consensus specification for more details on how // attestations are processed and when they are no longer valid. -// https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#attestations +// https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#attestations func (bs *Server) AttestationPool(_ context.Context, req *ethpb.AttestationPoolRequest) (*ethpb.AttestationPoolResponse, error) { var atts []*ethpb.Attestation var err error diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status.go index 9dd19ab828..e42a3bd876 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status.go @@ -262,7 +262,7 @@ func (vs *Server) activationStatus( // It cannot faithfully attest to the head block of the chain, since it has not fully verified that block. // // Spec: -// https://github.com/ethereum/consensus-specs/blob/dev/sync/optimistic.md +// https://github.com/ethereum/consensus-specs/blob/master/sync/optimistic.md func (vs *Server) optimisticStatus(ctx context.Context) error { if slots.ToEpoch(vs.TimeFetcher.CurrentSlot()) < params.BeaconConfig().BellatrixForkEpoch { return nil diff --git a/beacon-chain/sync/rpc.go b/beacon-chain/sync/rpc.go index d04c529c41..2a0fcb2ff3 100644 --- a/beacon-chain/sync/rpc.go +++ b/beacon-chain/sync/rpc.go @@ -40,7 +40,7 @@ type rpcHandler func(context.Context, interface{}, libp2pcore.Stream) error // rpcHandlerByTopicFromFork returns the RPC handlers for a given fork index. func (s *Service) rpcHandlerByTopicFromFork(forkIndex int) (map[string]rpcHandler, error) { - // Fulu: https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#messages + // Fulu: https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#messages if forkIndex >= version.Fulu { return map[string]rpcHandler{ p2p.RPCGoodByeTopicV1: s.goodbyeRPCHandler, @@ -55,7 +55,7 @@ func (s *Service) rpcHandlerByTopicFromFork(forkIndex int) (map[string]rpcHandle }, nil } - // Electra: https://github.com/ethereum/consensus-specs/blob/dev/specs/electra/p2p-interface.md#messages + // Electra: https://github.com/ethereum/consensus-specs/blob/master/specs/electra/p2p-interface.md#messages if forkIndex >= version.Electra { return map[string]rpcHandler{ p2p.RPCStatusTopicV1: s.statusRPCHandler, @@ -69,7 +69,7 @@ func (s *Service) rpcHandlerByTopicFromFork(forkIndex int) (map[string]rpcHandle }, nil } - // Deneb: https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/p2p-interface.md#messages + // Deneb: https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/p2p-interface.md#messages if forkIndex >= version.Deneb { return map[string]rpcHandler{ p2p.RPCStatusTopicV1: s.statusRPCHandler, @@ -83,9 +83,9 @@ func (s *Service) rpcHandlerByTopicFromFork(forkIndex int) (map[string]rpcHandle }, nil } - // Capella: https://github.com/ethereum/consensus-specs/blob/dev/specs/capella/p2p-interface.md#messages - // Bellatrix: https://github.com/ethereum/consensus-specs/blob/dev/specs/bellatrix/p2p-interface.md#messages - // Altair: https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/p2p-interface.md#messages + // Capella: https://github.com/ethereum/consensus-specs/blob/master/specs/capella/p2p-interface.md#messages + // Bellatrix: https://github.com/ethereum/consensus-specs/blob/master/specs/bellatrix/p2p-interface.md#messages + // Altair: https://github.com/ethereum/consensus-specs/blob/master/specs/altair/p2p-interface.md#messages if forkIndex >= version.Altair { handler := map[string]rpcHandler{ p2p.RPCStatusTopicV1: s.statusRPCHandler, @@ -106,7 +106,7 @@ func (s *Service) rpcHandlerByTopicFromFork(forkIndex int) (map[string]rpcHandle return handler, nil } - // PhaseO: https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/p2p-interface.md#messages + // PhaseO: https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#messages if forkIndex >= version.Phase0 { return map[string]rpcHandler{ p2p.RPCStatusTopicV1: s.statusRPCHandler, diff --git a/beacon-chain/sync/rpc_data_column_sidecars_by_root.go b/beacon-chain/sync/rpc_data_column_sidecars_by_root.go index 441262164a..a20903403a 100644 --- a/beacon-chain/sync/rpc_data_column_sidecars_by_root.go +++ b/beacon-chain/sync/rpc_data_column_sidecars_by_root.go @@ -27,7 +27,7 @@ var ( ) // dataColumnSidecarByRootRPCHandler handles the data column sidecars by root RPC request. -// https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#datacolumnsidecarsbyroot-v1 +// https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#datacolumnsidecarsbyroot-v1 func (s *Service) dataColumnSidecarByRootRPCHandler(ctx context.Context, msg interface{}, stream libp2pcore.Stream) error { ctx, span := trace.StartSpan(ctx, "sync.dataColumnSidecarByRootRPCHandler") defer span.End() diff --git a/beacon-chain/sync/validate_data_column.go b/beacon-chain/sync/validate_data_column.go index 6039012f80..99666a63dd 100644 --- a/beacon-chain/sync/validate_data_column.go +++ b/beacon-chain/sync/validate_data_column.go @@ -25,7 +25,7 @@ import ( "github.com/sirupsen/logrus" ) -// https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#the-gossip-domain-gossipsub +// https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#the-gossip-domain-gossipsub func (s *Service) validateDataColumn(ctx context.Context, pid peer.ID, msg *pubsub.Message) (pubsub.ValidationResult, error) { const dataColumnSidecarSubTopic = "/data_column_sidecar_%d/" @@ -74,7 +74,7 @@ func (s *Service) validateDataColumn(ctx context.Context, pid peer.ID, msg *pubs verifier := s.newColumnsVerifier(roDataColumns, verification.GossipDataColumnSidecarRequirements) // Start the verification process. - // https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#the-gossip-domain-gossipsub + // https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#the-gossip-domain-gossipsub // [REJECT] The sidecar is valid as verified by `verify_data_column_sidecar(sidecar)`. if err := verifier.ValidFields(); err != nil { diff --git a/beacon-chain/verification/data_column.go b/beacon-chain/verification/data_column.go index 888d500715..f74da826cf 100644 --- a/beacon-chain/verification/data_column.go +++ b/beacon-chain/verification/data_column.go @@ -22,7 +22,7 @@ import ( var ( // GossipDataColumnSidecarRequirements defines the set of requirements that DataColumnSidecars received on gossip // must satisfy in order to upgrade an RODataColumn to a VerifiedRODataColumn. - // https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#data_column_sidecar_subnet_id + // https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#data_column_sidecar_subnet_id GossipDataColumnSidecarRequirements = []Requirement{ RequireValidFields, RequireCorrectSubnet, @@ -40,7 +40,7 @@ var ( // ByRangeRequestDataColumnSidecarRequirements defines the set of requirements that DataColumnSidecars received // via the by range request must satisfy in order to upgrade an RODataColumn to a VerifiedRODataColumn. - // https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#datacolumnsidecarsbyrange-v1 + // https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/p2p-interface.md#datacolumnsidecarsbyrange-v1 ByRangeRequestDataColumnSidecarRequirements = []Requirement{ RequireValidFields, RequireSidecarInclusionProven, diff --git a/changelog/jtraglia_dev-to-master.md b/changelog/jtraglia_dev-to-master.md new file mode 100644 index 0000000000..97e073b2a3 --- /dev/null +++ b/changelog/jtraglia_dev-to-master.md @@ -0,0 +1,3 @@ +### Changed + +- Update links to consensus-specs to point to `master` branch diff --git a/encoding/ssz/detect/configfork.go b/encoding/ssz/detect/configfork.go index 8c9d456a48..accf3e06b8 100644 --- a/encoding/ssz/detect/configfork.go +++ b/encoding/ssz/detect/configfork.go @@ -27,7 +27,7 @@ type VersionedUnmarshaler struct { // Fork aligns with the fork names in config/params/values.go Fork int // Version corresponds to the Version type defined in the beacon-chain spec, aka a "fork version number": - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#custom-types + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#custom-types Version [fieldparams.VersionLength]byte } diff --git a/proto/eth/v1/beacon_block.proto b/proto/eth/v1/beacon_block.proto index 9e9f28ace6..cfa5e14213 100644 --- a/proto/eth/v1/beacon_block.proto +++ b/proto/eth/v1/beacon_block.proto @@ -73,7 +73,7 @@ message BeaconBlockBody { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 diff --git a/proto/prysm/v1alpha1/beacon_block.proto b/proto/prysm/v1alpha1/beacon_block.proto index b9d50dd367..c03d7c2095 100644 --- a/proto/prysm/v1alpha1/beacon_block.proto +++ b/proto/prysm/v1alpha1/beacon_block.proto @@ -171,7 +171,7 @@ message BeaconBlockBody { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 @@ -402,7 +402,7 @@ message BeaconBlockBodyAltair { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 @@ -487,7 +487,7 @@ message BeaconBlockBodyBellatrix { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 @@ -629,7 +629,7 @@ message BeaconBlockBodyCapella { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 @@ -813,7 +813,7 @@ message BeaconBlockBodyDeneb { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/core/0_beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/core/0_beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 @@ -1040,7 +1040,7 @@ message BeaconBlockBodyElectra { // Block operations // Refer to spec constants at - // https://github.com/ethereum/consensus-specs/blob/dev/specs/core/0_beacon-chain.md#max-operations-per-block + // https://github.com/ethereum/consensus-specs/blob/master/specs/core/0_beacon-chain.md#max-operations-per-block // At most MAX_PROPOSER_SLASHINGS. repeated ProposerSlashing proposer_slashings = 4 diff --git a/proto/prysm/v1alpha1/beacon_chain.proto b/proto/prysm/v1alpha1/beacon_chain.proto index 4e13946b38..2946d8191c 100644 --- a/proto/prysm/v1alpha1/beacon_chain.proto +++ b/proto/prysm/v1alpha1/beacon_chain.proto @@ -100,7 +100,7 @@ service BeaconChain { // that it was included in a block. The attestation may have expired. // Refer to the Ethereum Beacon Chain specification for more details on how // attestations are processed and when they are no longer valid. - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#attestations + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#attestations rpc AttestationPool(AttestationPoolRequest) returns (AttestationPoolResponse) { option deprecated = true; @@ -117,7 +117,7 @@ service BeaconChain { // that it was included in a block. The attestation may have expired. // Refer to the Ethereum Beacon Chain specification for more details on how // attestations are processed and when they are no longer valid. - // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#attestations + // https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#attestations rpc AttestationPoolElectra(AttestationPoolRequest) returns (AttestationPoolElectraResponse) { option deprecated = true; diff --git a/proto/prysm/v1alpha1/beacon_state.proto b/proto/prysm/v1alpha1/beacon_state.proto index bddef086d4..c12ce10892 100644 --- a/proto/prysm/v1alpha1/beacon_state.proto +++ b/proto/prysm/v1alpha1/beacon_state.proto @@ -191,7 +191,7 @@ message PowBlock { // The beacon state for Altair hard fork 1. // Reference: -// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/beacon-chain.md#beaconstate +// https://github.com/ethereum/consensus-specs/blob/master/specs/altair/beacon-chain.md#beaconstate message BeaconStateAltair { // Versioning [1001-2000] uint64 genesis_time = 1001; @@ -747,4 +747,4 @@ message BeaconStateFulu { // Fields introduced in Fulu fork [13001-14000] repeated uint64 proposer_lookahead = 13001 [ (ethereum.eth.ext.ssz_size) = "proposer_lookahead_size" ]; -} \ No newline at end of file +}