From 99997fa2e3c344dbd5b8d28b884f737041bf1ae0 Mon Sep 17 00:00:00 2001 From: Potuz Date: Thu, 16 Mar 2023 14:27:30 -0300 Subject: [PATCH 01/10] forkchoice changes (#12126) * forkchoice changes * gazelle * remove best justified from forkchoice dump * keep protobufs and update comment * remove phase0 tests * bumb spectests version * missing sha * Fix sha256 for spec * rpc tests * Mark field 3 as reserved so it will never be used it again --------- Co-authored-by: terence tsao Co-authored-by: Preston Van Loon --- WORKSPACE | 10 +- beacon-chain/blockchain/chain_info.go | 8 - .../forkchoice/doubly-linked-tree/BUILD.bazel | 1 - .../doubly-linked-tree/ffg_update_test.go | 1 - .../doubly-linked-tree/forkchoice.go | 75 +---- .../doubly-linked-tree/forkchoice_test.go | 54 ---- .../forkchoice/doubly-linked-tree/node.go | 3 +- .../forkchoice/doubly-linked-tree/on_tick.go | 32 +-- .../doubly-linked-tree/on_tick_test.go | 74 +++-- .../forkchoice/doubly-linked-tree/types.go | 1 - .../unrealized_justification.go | 12 - .../unrealized_justification_test.go | 6 - beacon-chain/forkchoice/interfaces.go | 1 - beacon-chain/rpc/eth/beacon/config_test.go | 3 +- config/features/config.go | 11 - config/features/flags.go | 11 - config/params/config.go | 2 +- config/params/configset_test.go | 2 +- config/params/loader_test.go | 2 +- config/params/mainnet_config.go | 1 - config/params/minimal_config.go | 1 - config/params/testnet_config_test.go | 2 +- proto/eth/v1/beacon_chain.pb.go | 268 +++++++++--------- proto/eth/v1/beacon_chain.proto | 3 +- .../mainnet/altair/forkchoice/BUILD.bazel | 1 - .../altair/forkchoice/forkchoice_test.go | 6 - .../mainnet/bellatrix/forkchoice/BUILD.bazel | 1 - .../bellatrix/forkchoice/forkchoice_test.go | 6 - .../mainnet/capella/forkchoice/BUILD.bazel | 1 - .../capella/forkchoice/forkchoice_test.go | 7 - .../mainnet/phase0/forkchoice/BUILD.bazel | 17 -- .../phase0/forkchoice/forkchoice_test.go | 18 -- .../minimal/altair/forkchoice/BUILD.bazel | 1 - .../altair/forkchoice/forkchoice_test.go | 6 - .../minimal/bellatrix/forkchoice/BUILD.bazel | 1 - .../bellatrix/forkchoice/forkchoice_test.go | 6 - .../minimal/capella/forkchoice/BUILD.bazel | 1 - .../capella/forkchoice/forkchoice_test.go | 6 - .../minimal/phase0/forkchoice/BUILD.bazel | 21 -- .../phase0/forkchoice/forkchoice_test.go | 18 -- .../shared/common/forkchoice/builder.go | 8 - 41 files changed, 179 insertions(+), 530 deletions(-) delete mode 100644 testing/spectest/mainnet/phase0/forkchoice/BUILD.bazel delete mode 100644 testing/spectest/mainnet/phase0/forkchoice/forkchoice_test.go delete mode 100644 testing/spectest/minimal/phase0/forkchoice/BUILD.bazel delete mode 100644 testing/spectest/minimal/phase0/forkchoice/forkchoice_test.go diff --git a/WORKSPACE b/WORKSPACE index e498355a744f..67d84d17d134 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -205,7 +205,7 @@ filegroup( url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz", ) -consensus_spec_version = "v1.3.0-rc.3" +consensus_spec_version = "v1.3.0-rc.4" bls_test_version = "v0.1.1" @@ -221,7 +221,7 @@ filegroup( visibility = ["//visibility:public"], ) """, - sha256 = "c56ea4e8fb2fea4b0b23d2191a87bc7e676738dd8a623b44ac847bfeaae5fe64", + sha256 = "519da3cbb181fe927e41b0d13c3aaad5f5f38fe0ba87ca51bd09a661c738bd6c", url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/general.tar.gz" % consensus_spec_version, ) @@ -237,7 +237,7 @@ filegroup( visibility = ["//visibility:public"], ) """, - sha256 = "c97730b372b81e9ee698c4f09eafaec3fb4be177fab323b32e5ef78d0873fb5c", + sha256 = "894404302d3d4b0f3080d3221204c19de4e837f1b129f468a66747103174412e", url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/minimal.tar.gz" % consensus_spec_version, ) @@ -253,7 +253,7 @@ filegroup( visibility = ["//visibility:public"], ) """, - sha256 = "bdd8255c8a536fa83366144aa32fcc3df92a4997401f88f7cda934d13e90d11c", + sha256 = "ca7a594a2f4be1103e01b5a1416f75a328b7555eae8b26308c07f80fa6d0f255", url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/mainnet.tar.gz" % consensus_spec_version, ) @@ -268,7 +268,7 @@ filegroup( visibility = ["//visibility:public"], ) """, - sha256 = "f6539e19b8e4e45f45b80da39c87dfe7c61d9d7cb51fa7a3a36bdaca11a89693", + sha256 = "b4ed6c077c5f0857361412515b319fc8b26730c7d701d3245b5e6849b3974a4f", strip_prefix = "consensus-specs-" + consensus_spec_version[1:], url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version, ) diff --git a/beacon-chain/blockchain/chain_info.go b/beacon-chain/blockchain/chain_info.go index 4e7fb16fa0c9..121ed7a89893 100644 --- a/beacon-chain/blockchain/chain_info.go +++ b/beacon-chain/blockchain/chain_info.go @@ -118,14 +118,6 @@ func (s *Service) CurrentJustifiedCheckpt() *ethpb.Checkpoint { return ðpb.Checkpoint{Epoch: cp.Epoch, Root: bytesutil.SafeCopyBytes(cp.Root[:])} } -// BestJustifiedCheckpt returns the best justified checkpoint from store. -func (s *Service) BestJustifiedCheckpt() *ethpb.Checkpoint { - s.ForkChoicer().RLock() - defer s.ForkChoicer().RUnlock() - cp := s.ForkChoicer().BestJustifiedCheckpoint() - return ðpb.Checkpoint{Epoch: cp.Epoch, Root: bytesutil.SafeCopyBytes(cp.Root[:])} -} - // HeadSlot returns the slot of the head of the chain. func (s *Service) HeadSlot() primitives.Slot { s.headLock.RLock() diff --git a/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel b/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel index a13fb997284a..dcca93bb98c1 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel +++ b/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel @@ -65,7 +65,6 @@ go_test( "//beacon-chain/forkchoice/types:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/state-native:go_default_library", - "//config/features:go_default_library", "//config/params:go_default_library", "//consensus-types/blocks:go_default_library", "//consensus-types/primitives:go_default_library", diff --git a/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go b/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go index 9e442e20a34d..e5e1ba8ff2b7 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go @@ -219,7 +219,6 @@ func setup(justifiedEpoch, finalizedEpoch primitives.Epoch) *ForkChoice { ctx := context.Background() f := New() f.store.justifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: justifiedEpoch, Root: params.BeaconConfig().ZeroHash} - f.store.bestJustifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: justifiedEpoch, Root: params.BeaconConfig().ZeroHash} f.store.finalizedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: finalizedEpoch, Root: params.BeaconConfig().ZeroHash} state, blkRoot, err := prepareForkchoiceState(ctx, 0, params.BeaconConfig().ZeroHash, [32]byte{}, params.BeaconConfig().ZeroHash, justifiedEpoch, finalizedEpoch) if err != nil { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go index 2d63d07e37d6..21c7ba03e6c0 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go @@ -10,7 +10,6 @@ import ( "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" @@ -27,7 +26,6 @@ import ( func New() *ForkChoice { s := &Store{ justifiedCheckpoint: &forkchoicetypes.Checkpoint{}, - bestJustifiedCheckpoint: &forkchoicetypes.Checkpoint{}, unrealizedJustifiedCheckpoint: &forkchoicetypes.Checkpoint{}, unrealizedFinalizedCheckpoint: &forkchoicetypes.Checkpoint{}, prevJustifiedCheckpoint: &forkchoicetypes.Checkpoint{}, @@ -142,60 +140,18 @@ func (f *ForkChoice) InsertNode(ctx context.Context, state state.BeaconState, ro return err } - if !features.Get().DisablePullTips { - jc, fc = f.store.pullTips(state, node, jc, fc) - } + jc, fc = f.store.pullTips(state, node, jc, fc) return f.updateCheckpoints(ctx, jc, fc) } // updateCheckpoints update the checkpoints when inserting a new node. func (f *ForkChoice) updateCheckpoints(ctx context.Context, jc, fc *ethpb.Checkpoint) error { if jc.Epoch > f.store.justifiedCheckpoint.Epoch { - if jc.Epoch > f.store.bestJustifiedCheckpoint.Epoch { - f.store.bestJustifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, - Root: bytesutil.ToBytes32(jc.Root)} - } - if !features.Get().EnableDefensivePull { - currentSlot := slots.CurrentSlot(f.store.genesisTime) - if slots.SinceEpochStarts(currentSlot) < params.BeaconConfig().SafeSlotsToUpdateJustified { - f.store.prevJustifiedCheckpoint = f.store.justifiedCheckpoint - root := bytesutil.ToBytes32(jc.Root) - f.store.justifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, - Root: root} - if err := f.updateJustifiedBalances(ctx, root); err != nil { - return errors.Wrap(err, "could not update justified balances") - } - } else { - currentJcp := f.store.justifiedCheckpoint - currentRoot := currentJcp.Root - if currentRoot == params.BeaconConfig().ZeroHash { - currentRoot = f.store.originRoot - } - jSlot, err := slots.EpochStart(currentJcp.Epoch) - if err != nil { - return err - } - jcRoot := bytesutil.ToBytes32(jc.Root) - root, err := f.AncestorRoot(ctx, jcRoot, jSlot) - if err != nil { - return err - } - if root == currentRoot { - f.store.prevJustifiedCheckpoint = f.store.justifiedCheckpoint - f.store.justifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, - Root: jcRoot} - if err := f.updateJustifiedBalances(ctx, jcRoot); err != nil { - return errors.Wrap(err, "could not update justified balances") - } - } - } - } else { - f.store.prevJustifiedCheckpoint = f.store.justifiedCheckpoint - jcRoot := bytesutil.ToBytes32(jc.Root) - f.store.justifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, Root: jcRoot} - if err := f.updateJustifiedBalances(ctx, jcRoot); err != nil { - return errors.Wrap(err, "could not update justified balances") - } + f.store.prevJustifiedCheckpoint = f.store.justifiedCheckpoint + jcRoot := bytesutil.ToBytes32(jc.Root) + f.store.justifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, Root: jcRoot} + if err := f.updateJustifiedBalances(ctx, jcRoot); err != nil { + return errors.Wrap(err, "could not update justified balances") } } // Update finalization @@ -204,14 +160,6 @@ func (f *ForkChoice) updateCheckpoints(ctx context.Context, jc, fc *ethpb.Checkp } f.store.finalizedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: fc.Epoch, Root: bytesutil.ToBytes32(fc.Root)} - if !features.Get().EnableDefensivePull { - root := bytesutil.ToBytes32(jc.Root) - f.store.justifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, - Root: root} - if err := f.updateJustifiedBalances(ctx, root); err != nil { - return errors.Wrap(err, "could not update justified balances") - } - } return f.store.prune(ctx) } @@ -370,11 +318,6 @@ func (f *ForkChoice) SetOptimisticToValid(ctx context.Context, root [fieldparams return node.setNodeAndParentValidated(ctx) } -// BestJustifiedCheckpoint of fork choice store. -func (f *ForkChoice) BestJustifiedCheckpoint() *forkchoicetypes.Checkpoint { - return f.store.bestJustifiedCheckpoint -} - // PreviousJustifiedCheckpoint of fork choice store. func (f *ForkChoice) PreviousJustifiedCheckpoint() *forkchoicetypes.Checkpoint { return f.store.prevJustifiedCheckpoint @@ -434,7 +377,6 @@ func (f *ForkChoice) UpdateJustifiedCheckpoint(ctx context.Context, jc *forkchoi } f.store.prevJustifiedCheckpoint = f.store.justifiedCheckpoint f.store.justifiedCheckpoint = jc - f.store.bestJustifiedCheckpoint = &forkchoicetypes.Checkpoint{Epoch: jc.Epoch, Root: jc.Root} if err := f.updateJustifiedBalances(ctx, jc.Root); err != nil { return errors.Wrap(err, "could not update justified balances") } @@ -572,10 +514,6 @@ func (f *ForkChoice) ForkChoiceDump(ctx context.Context) (*v1.ForkChoiceDump, er Epoch: f.store.justifiedCheckpoint.Epoch, Root: f.store.justifiedCheckpoint.Root[:], } - bjc := &v1.Checkpoint{ - Epoch: f.store.bestJustifiedCheckpoint.Epoch, - Root: f.store.bestJustifiedCheckpoint.Root[:], - } ujc := &v1.Checkpoint{ Epoch: f.store.unrealizedJustifiedCheckpoint.Epoch, Root: f.store.unrealizedJustifiedCheckpoint.Root[:], @@ -602,7 +540,6 @@ func (f *ForkChoice) ForkChoiceDump(ctx context.Context) (*v1.ForkChoiceDump, er } resp := &v1.ForkChoiceDump{ JustifiedCheckpoint: jc, - BestJustifiedCheckpoint: bjc, UnrealizedJustifiedCheckpoint: ujc, FinalizedCheckpoint: fc, UnrealizedFinalizedCheckpoint: ufc, diff --git a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go index a1513dea96d0..f9d0221314c1 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go @@ -622,7 +622,6 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { tests := []struct { name string justified *forkchoicetypes.Checkpoint - bestJustified *forkchoicetypes.Checkpoint finalized *forkchoicetypes.Checkpoint newJustified *forkchoicetypes.Checkpoint newFinalized *forkchoicetypes.Checkpoint @@ -636,7 +635,6 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { name: "lower than store justified and finalized", justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, newJustified: &forkchoicetypes.Checkpoint{Epoch: 1}, newFinalized: &forkchoicetypes.Checkpoint{Epoch: 0}, wantedJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, @@ -646,7 +644,6 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { { name: "higher than store justified, early slot, direct descendant", justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, newJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'b'}}, newFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'g'}}, @@ -657,7 +654,6 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { { name: "higher than store justified, early slot, not a descendant", justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, newJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, newFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'g'}}, @@ -665,59 +661,12 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { wantedBestJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, wantedFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, }, - { - name: "higher than store justified, late slot, descendant", - justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - newJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'b'}}, - newFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'g'}}, - wantedJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'b'}}, - wantedFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - wantedBestJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'b'}}, - currentSlot: params.BeaconConfig().SafeSlotsToUpdateJustified.Add(1), - }, - { - name: "higher than store justified, late slot, not descendant", - justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - newJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, - newFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'g'}}, - wantedJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - wantedFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - wantedBestJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, - currentSlot: params.BeaconConfig().SafeSlotsToUpdateJustified.Add(1), - }, - { - name: "higher than store finalized, late slot, not descendant", - justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - newJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, - newFinalized: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'h'}}, - wantedJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, - wantedFinalized: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'h'}}, - wantedBestJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'c'}}, - currentSlot: params.BeaconConfig().SafeSlotsToUpdateJustified.Add(1), - }, - { - name: "Unknown checkpoint root, late slot", - justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'j'}}, - finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'f'}}, - newJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: [32]byte{'d'}}, - newFinalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'h'}}, - currentSlot: params.BeaconConfig().SafeSlotsToUpdateJustified.Add(1), - wantedErr: "could not determine ancestor root", - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { fcs := setup(tt.justified.Epoch, tt.finalized.Epoch) fcs.store.justifiedCheckpoint = tt.justified fcs.store.finalizedCheckpoint = tt.finalized - fcs.store.bestJustifiedCheckpoint = tt.bestJustified fcs.store.genesisTime = uint64(time.Now().Unix()) - uint64(tt.currentSlot)*params.BeaconConfig().SecondsPerSlot st, blkRoot, err := prepareForkchoiceState(ctx, 32, [32]byte{'f'}, @@ -743,7 +692,6 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { // restart justifications cause insertion messed it up fcs.store.justifiedCheckpoint = tt.justified fcs.store.finalizedCheckpoint = tt.finalized - fcs.store.bestJustifiedCheckpoint = tt.bestJustified jc := ðpb.Checkpoint{Epoch: tt.newJustified.Epoch, Root: tt.newJustified.Root[:]} fc := ðpb.Checkpoint{Epoch: tt.newFinalized.Epoch, Root: tt.newFinalized.Root[:]} @@ -756,8 +704,6 @@ func TestForkChoice_UpdateCheckpoints(t *testing.T) { require.Equal(t, tt.wantedFinalized.Epoch, fcs.store.finalizedCheckpoint.Epoch) require.Equal(t, tt.wantedJustified.Root, fcs.store.justifiedCheckpoint.Root) require.Equal(t, tt.wantedFinalized.Root, fcs.store.finalizedCheckpoint.Root) - require.Equal(t, tt.wantedBestJustified.Epoch, fcs.store.bestJustifiedCheckpoint.Epoch) - require.Equal(t, tt.wantedBestJustified.Root, fcs.store.bestJustifiedCheckpoint.Root) } }) } diff --git a/beacon-chain/forkchoice/doubly-linked-tree/node.go b/beacon-chain/forkchoice/doubly-linked-tree/node.go index cbf3510e1d68..7a2bb5f981f1 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/node.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/node.go @@ -5,7 +5,6 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" @@ -99,7 +98,7 @@ func (n *Node) updateBestDescendant(ctx context.Context, justifiedEpoch, finaliz // the ones in fork choice store should not be viable to head. func (n *Node) viableForHead(justifiedEpoch, currentEpoch primitives.Epoch) bool { justified := justifiedEpoch == n.justifiedEpoch || justifiedEpoch == 0 - if features.Get().EnableDefensivePull && !justified && justifiedEpoch+1 == currentEpoch { + if !justified && justifiedEpoch+1 == currentEpoch { if n.unrealizedJustifiedEpoch+1 >= currentEpoch && n.justifiedEpoch+2 >= currentEpoch { justified = true } diff --git a/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go b/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go index cb80f68ac2ad..3118963cfbbe 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go @@ -4,7 +4,6 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" "github.com/prysmaticlabs/prysm/v3/time/slots" ) @@ -42,35 +41,8 @@ func (f *ForkChoice) NewSlot(ctx context.Context, slot primitives.Slot) error { } // Update store.justified_checkpoint if a better checkpoint on the store.finalized_checkpoint chain - bjcp := f.store.bestJustifiedCheckpoint - jcp := f.store.justifiedCheckpoint - fcp := f.store.finalizedCheckpoint - if bjcp.Epoch > jcp.Epoch { - finalizedSlot, err := slots.EpochStart(fcp.Epoch) - if err != nil { - return err - } - - // We check that the best justified checkpoint is a descendant of the finalized checkpoint. - // This should always happen as forkchoice enforces that every node is a descendant of the - // finalized checkpoint. This check is here for additional security, consider removing the extra - // loop call here. - r, err := f.AncestorRoot(ctx, bjcp.Root, finalizedSlot) - if err != nil { - return err - } - if r == fcp.Root { - f.store.prevJustifiedCheckpoint = jcp - f.store.justifiedCheckpoint = bjcp - if err := f.updateJustifiedBalances(ctx, bjcp.Root); err != nil { - log.Error("could not update justified balances") - } - } - } - if !features.Get().DisablePullTips { - if err := f.updateUnrealizedCheckpoints(ctx); err != nil { - return errors.Wrap(err, "could not update unrealized checkpoints") - } + if err := f.updateUnrealizedCheckpoints(ctx); err != nil { + return errors.Wrap(err, "could not update unrealized checkpoints") } return f.store.prune(ctx) } diff --git a/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go b/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go index 7c3ed5e2545c..640505de7bdb 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go @@ -55,51 +55,41 @@ func TestStore_NewSlot(t *testing.T) { shouldEqual: false, }, }, - { - name: "Best justified on the same chain as finalized. Yes change", - args: args{ - slot: params.BeaconConfig().SlotsPerEpoch, - finalized: &forkchoicetypes.Checkpoint{Epoch: 1, Root: [32]byte{'a'}}, - justified: &forkchoicetypes.Checkpoint{Epoch: 2, Root: [32]byte{'b'}}, - bestJustified: &forkchoicetypes.Checkpoint{Epoch: 3, Root: bj}, - shouldEqual: true, - }, - }, } for _, test := range tests { - f := setup(test.args.justified.Epoch, test.args.finalized.Epoch) - state, blkRoot, err := prepareForkchoiceState(ctx, 0, [32]byte{}, [32]byte{}, [32]byte{}, 0, 0) - require.NoError(t, err) - require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // genesis - state, blkRoot, err = prepareForkchoiceState(ctx, 32, [32]byte{'a'}, [32]byte{}, [32]byte{}, 0, 0) - require.NoError(t, err) - require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // finalized - state, blkRoot, err = prepareForkchoiceState(ctx, 64, [32]byte{'b'}, [32]byte{'a'}, [32]byte{}, 0, 0) - require.NoError(t, err) - require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // justified - state, blkRoot, err = prepareForkchoiceState(ctx, 96, bj, [32]byte{'a'}, [32]byte{}, 0, 0) - require.NoError(t, err) - require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // best justified - state, blkRoot, err = prepareForkchoiceState(ctx, 97, [32]byte{'d'}, [32]byte{}, [32]byte{}, 0, 0) - require.NoError(t, err) - require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // bad + t.Run(test.name, func(t *testing.T) { + f := setup(test.args.justified.Epoch, test.args.finalized.Epoch) + state, blkRoot, err := prepareForkchoiceState(ctx, 0, [32]byte{}, [32]byte{}, [32]byte{}, 0, 0) + require.NoError(t, err) + require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // genesis + state, blkRoot, err = prepareForkchoiceState(ctx, 32, [32]byte{'a'}, [32]byte{}, [32]byte{}, 0, 0) + require.NoError(t, err) + require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // finalized + state, blkRoot, err = prepareForkchoiceState(ctx, 64, [32]byte{'b'}, [32]byte{'a'}, [32]byte{}, 0, 0) + require.NoError(t, err) + require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // justified + state, blkRoot, err = prepareForkchoiceState(ctx, 96, bj, [32]byte{'a'}, [32]byte{}, 0, 0) + require.NoError(t, err) + require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // best justified + state, blkRoot, err = prepareForkchoiceState(ctx, 97, [32]byte{'d'}, [32]byte{}, [32]byte{}, 0, 0) + require.NoError(t, err) + require.NoError(t, f.InsertNode(ctx, state, blkRoot)) // bad - require.NoError(t, f.UpdateFinalizedCheckpoint(test.args.finalized)) - require.NoError(t, f.UpdateJustifiedCheckpoint(ctx, test.args.justified)) - f.store.bestJustifiedCheckpoint = test.args.bestJustified + require.NoError(t, f.UpdateFinalizedCheckpoint(test.args.finalized)) + require.NoError(t, f.UpdateJustifiedCheckpoint(ctx, test.args.justified)) - require.NoError(t, f.NewSlot(ctx, test.args.slot)) - if test.args.shouldEqual { - bcp := f.BestJustifiedCheckpoint() - cp := f.JustifiedCheckpoint() - require.Equal(t, bcp.Epoch, cp.Epoch) - require.Equal(t, bcp.Root, cp.Root) - } else { - bcp := f.BestJustifiedCheckpoint() - cp := f.JustifiedCheckpoint() - epochsEqual := bcp.Epoch == cp.Epoch - rootsEqual := bcp.Root == cp.Root - require.Equal(t, false, epochsEqual && rootsEqual) - } + require.NoError(t, f.NewSlot(ctx, test.args.slot)) + bcp := test.args.bestJustified + if test.args.shouldEqual { + cp := f.JustifiedCheckpoint() + require.Equal(t, bcp.Epoch, cp.Epoch) + require.Equal(t, bcp.Root, cp.Root) + } else { + cp := f.JustifiedCheckpoint() + epochsEqual := bcp.Epoch == cp.Epoch + rootsEqual := bcp.Root == cp.Root + require.Equal(t, false, epochsEqual && rootsEqual) + } + }) } } diff --git a/beacon-chain/forkchoice/doubly-linked-tree/types.go b/beacon-chain/forkchoice/doubly-linked-tree/types.go index 92aea93f0617..58cea7ac1321 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/types.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/types.go @@ -23,7 +23,6 @@ type ForkChoice struct { // Store defines the fork choice store which includes block nodes and the last view of checkpoint information. type Store struct { justifiedCheckpoint *forkchoicetypes.Checkpoint // latest justified epoch in store. - bestJustifiedCheckpoint *forkchoicetypes.Checkpoint // best justified checkpoint in store. unrealizedJustifiedCheckpoint *forkchoicetypes.Checkpoint // best unrealized justified checkpoint in store. unrealizedFinalizedCheckpoint *forkchoicetypes.Checkpoint // best unrealized finalized checkpoint in store. prevJustifiedCheckpoint *forkchoicetypes.Checkpoint // previous justified checkpoint in store. diff --git a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go index 1f7b7dec9af2..d418d045c857 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go @@ -7,7 +7,6 @@ import ( "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" @@ -51,19 +50,8 @@ func (f *ForkChoice) updateUnrealizedCheckpoints(ctx context.Context) error { if err := f.updateJustifiedBalances(ctx, f.store.justifiedCheckpoint.Root); err != nil { return errors.Wrap(err, "could not update justified balances") } - if !features.Get().EnableDefensivePull && node.justifiedEpoch > f.store.bestJustifiedCheckpoint.Epoch { - f.store.bestJustifiedCheckpoint = f.store.unrealizedJustifiedCheckpoint - } } if node.finalizedEpoch > f.store.finalizedCheckpoint.Epoch { - if !features.Get().EnableDefensivePull { - if f.store.unrealizedJustifiedCheckpoint.Epoch != f.store.justifiedCheckpoint.Epoch { - if err := f.updateJustifiedBalances(ctx, f.store.unrealizedJustifiedCheckpoint.Root); err != nil { - return errors.Wrap(err, "could not update justified balances") - } - f.store.justifiedCheckpoint = f.store.unrealizedJustifiedCheckpoint - } - } f.store.finalizedCheckpoint = f.store.unrealizedFinalizedCheckpoint } } diff --git a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go index 697ac1a53d6b..b1f4e8fcf804 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go @@ -5,7 +5,6 @@ import ( "testing" forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" "github.com/prysmaticlabs/prysm/v3/testing/require" @@ -196,11 +195,6 @@ func TestStore_NoDeadLock(t *testing.T) { // // D justifies and comes late. func TestStore_ForkNextEpoch(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: true, - }) - defer resetCfg() - f := setup(1, 0) ctx := context.Background() diff --git a/beacon-chain/forkchoice/interfaces.go b/beacon-chain/forkchoice/interfaces.go index 73485e0459d9..9a19530584e8 100644 --- a/beacon-chain/forkchoice/interfaces.go +++ b/beacon-chain/forkchoice/interfaces.go @@ -57,7 +57,6 @@ type Getter interface { JustifiedCheckpoint() *forkchoicetypes.Checkpoint PreviousJustifiedCheckpoint() *forkchoicetypes.Checkpoint JustifiedPayloadBlockHash() [32]byte - BestJustifiedCheckpoint() *forkchoicetypes.Checkpoint NodeCount() int HighestReceivedBlockSlot() primitives.Slot ReceivedBlocksLastEpoch() (uint64, error) diff --git a/beacon-chain/rpc/eth/beacon/config_test.go b/beacon-chain/rpc/eth/beacon/config_test.go index 94f8b9fce0d5..c428fa70ddc9 100644 --- a/beacon-chain/rpc/eth/beacon/config_test.go +++ b/beacon-chain/rpc/eth/beacon/config_test.go @@ -32,7 +32,6 @@ func TestGetSpec(t *testing.T) { config.HysteresisQuotient = 9 config.HysteresisDownwardMultiplier = 10 config.HysteresisUpwardMultiplier = 11 - config.SafeSlotsToUpdateJustified = 12 config.Eth1FollowDistance = 13 config.TargetAggregatorsPerCommittee = 14 config.RandomSubnetsPerValidator = 15 @@ -167,7 +166,7 @@ func TestGetSpec(t *testing.T) { case "HYSTERESIS_UPWARD_MULTIPLIER": assert.Equal(t, "11", v) case "SAFE_SLOTS_TO_UPDATE_JUSTIFIED": - assert.Equal(t, "12", v) + assert.Equal(t, "0", v) case "ETH1_FOLLOW_DISTANCE": assert.Equal(t, "13", v) case "TARGET_AGGREGATORS_PER_COMMITTEE": diff --git a/config/features/config.go b/config/features/config.go index ec5d428f9634..17b9874a0d95 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -62,8 +62,6 @@ type Flags struct { // EnableSlashingProtectionPruning for the validator client. EnableSlashingProtectionPruning bool - DisablePullTips bool // DisablePullTips disables experimental disabling of boundary checks. - EnableDefensivePull bool // EnableDefensivePull enables exerimental back boundary checks. EnableVectorizedHTR bool // EnableVectorizedHTR specifies whether the beacon state will use the optimized sha256 routines. DisableForkchoiceDoublyLinkedTree bool // DisableForkChoiceDoublyLinkedTree specifies whether fork choice store will use a doubly linked tree. EnableBatchGossipAggregation bool // EnableBatchGossipAggregation specifies whether to further aggregate our gossip batches before verifying them. @@ -193,15 +191,6 @@ func ConfigureBeaconChain(ctx *cli.Context) error { log.WithField(enableHistoricalSpaceRepresentation.Name, enableHistoricalSpaceRepresentation.Usage).Warn(enabledFeatureFlag) cfg.EnableHistoricalSpaceRepresentation = true } - if ctx.Bool(disablePullTips.Name) { - logEnabled(disablePullTips) - cfg.DisablePullTips = true - } - cfg.EnableDefensivePull = true - if ctx.Bool(disableDefensivePull.Name) { - logEnabled(disableDefensivePull) - cfg.EnableDefensivePull = false - } if ctx.Bool(disableStakinContractCheck.Name) { logEnabled(disableStakinContractCheck) cfg.DisableStakinContractCheck = true diff --git a/config/features/flags.go b/config/features/flags.go index 6d63d8d15c99..b9f2c6aed9dc 100644 --- a/config/features/flags.go +++ b/config/features/flags.go @@ -88,15 +88,6 @@ var ( " (Warning): Once enabled, this feature migrates your database in to a new schema and " + "there is no going back. At worst, your entire database might get corrupted.", } - disablePullTips = &cli.BoolFlag{ - Name: "experimental-enable-boundary-checks", - Usage: "Experimental enable of boundary checks, useful for debugging, may cause bad votes.", - } - disableDefensivePull = &cli.BoolFlag{ - Name: "disable-back-pull", - Usage: "Experimental disable of past boundary checks, useful for debugging, may cause bad votes.", - Hidden: true, - } disableVecHTR = &cli.BoolFlag{ Name: "disable-vectorized-htr", Usage: "Disables the new go sha256 library which utilizes optimized routines for merkle trees", @@ -171,14 +162,12 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c enableSlasherFlag, enableHistoricalSpaceRepresentation, disableStakinContractCheck, - disablePullTips, disableVecHTR, enableReorgLateBlocks, disableForkChoiceDoublyLinkedTree, disableGossipBatchAggregation, SaveFullExecutionPayloads, enableStartupOptimistic, - disableDefensivePull, enableFullSSZDataLogging, enableVerboseSigVerification, EnableOptionalEngineMethods, diff --git a/config/params/config.go b/config/params/config.go index 8b3e49e1494f..6a3482222084 100644 --- a/config/params/config.go +++ b/config/params/config.go @@ -62,7 +62,7 @@ type BeaconChainConfig struct { ShardCommitteePeriod primitives.Epoch `yaml:"SHARD_COMMITTEE_PERIOD" spec:"true"` // ShardCommitteePeriod is the minimum amount of epochs a validator must participate before exiting. MinEpochsToInactivityPenalty primitives.Epoch `yaml:"MIN_EPOCHS_TO_INACTIVITY_PENALTY" spec:"true"` // MinEpochsToInactivityPenalty defines the minimum amount of epochs since finality to begin penalizing inactivity. Eth1FollowDistance uint64 `yaml:"ETH1_FOLLOW_DISTANCE" spec:"true"` // Eth1FollowDistance is the number of eth1.0 blocks to wait before considering a new deposit for voting. This only applies after the chain as been started. - SafeSlotsToUpdateJustified primitives.Slot `yaml:"SAFE_SLOTS_TO_UPDATE_JUSTIFIED" spec:"true"` // SafeSlotsToUpdateJustified is the minimal slots needed to update justified check point. + DeprecatedSafeSlotsToUpdateJustified primitives.Slot `yaml:"SAFE_SLOTS_TO_UPDATE_JUSTIFIED" spec:"true"` // DeprecateSafeSlotsToUpdateJustified is the minimal slots needed to update justified check point. DeprecatedSafeSlotsToImportOptimistically primitives.Slot `yaml:"SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY" spec:"true"` // SafeSlotsToImportOptimistically is the minimal number of slots to wait before importing optimistically a pre-merge block SecondsPerETH1Block uint64 `yaml:"SECONDS_PER_ETH1_BLOCK" spec:"true"` // SecondsPerETH1Block is the approximate time for a single eth1 block to be produced. diff --git a/config/params/configset_test.go b/config/params/configset_test.go index 57a423a7da92..518e17e39ba6 100644 --- a/config/params/configset_test.go +++ b/config/params/configset_test.go @@ -112,7 +112,7 @@ func compareConfigs(t *testing.T, expected, actual *BeaconChainConfig) { require.DeepEqual(t, expected.ShardCommitteePeriod, actual.ShardCommitteePeriod) require.DeepEqual(t, expected.MinEpochsToInactivityPenalty, actual.MinEpochsToInactivityPenalty) require.DeepEqual(t, expected.Eth1FollowDistance, actual.Eth1FollowDistance) - require.DeepEqual(t, expected.SafeSlotsToUpdateJustified, actual.SafeSlotsToUpdateJustified) + require.DeepEqual(t, expected.DeprecatedSafeSlotsToUpdateJustified, actual.DeprecatedSafeSlotsToUpdateJustified) require.DeepEqual(t, expected.SecondsPerETH1Block, actual.SecondsPerETH1Block) require.DeepEqual(t, expected.ProposerScoreBoost, actual.ProposerScoreBoost) require.DeepEqual(t, expected.IntervalsPerSlot, actual.IntervalsPerSlot) diff --git a/config/params/loader_test.go b/config/params/loader_test.go index 1f518c8404d9..45cc3102f38f 100644 --- a/config/params/loader_test.go +++ b/config/params/loader_test.go @@ -37,7 +37,7 @@ func assertEqualConfigs(t *testing.T, name string, fields []string, expected, ac assert.Equal(t, expected.HysteresisUpwardMultiplier, actual.HysteresisUpwardMultiplier, "%s: HysteresisUpwardMultiplier", name) // Fork Choice params. - assert.Equal(t, expected.SafeSlotsToUpdateJustified, actual.SafeSlotsToUpdateJustified, "%s: SafeSlotsToUpdateJustified", name) + assert.Equal(t, expected.DeprecatedSafeSlotsToUpdateJustified, actual.DeprecatedSafeSlotsToUpdateJustified, "%s: SafeSlotsToUpdateJustified", name) // Validator params. assert.Equal(t, expected.Eth1FollowDistance, actual.Eth1FollowDistance, "%s: Eth1FollowDistance", name) diff --git a/config/params/mainnet_config.go b/config/params/mainnet_config.go index 98580c0e1a32..49a7aa38c056 100644 --- a/config/params/mainnet_config.go +++ b/config/params/mainnet_config.go @@ -111,7 +111,6 @@ var mainnetBeaconConfig = &BeaconChainConfig{ ShardCommitteePeriod: 256, MinEpochsToInactivityPenalty: 4, Eth1FollowDistance: 2048, - SafeSlotsToUpdateJustified: 8, // Fork choice algorithm constants. ProposerScoreBoost: 40, diff --git a/config/params/minimal_config.go b/config/params/minimal_config.go index facf82540bc7..f954e6059c0e 100644 --- a/config/params/minimal_config.go +++ b/config/params/minimal_config.go @@ -44,7 +44,6 @@ func MinimalSpecConfig() *BeaconChainConfig { minimalConfig.ShardCommitteePeriod = 64 minimalConfig.MinEpochsToInactivityPenalty = 4 minimalConfig.Eth1FollowDistance = 16 - minimalConfig.SafeSlotsToUpdateJustified = 2 minimalConfig.SecondsPerETH1Block = 14 // State vector lengths diff --git a/config/params/testnet_config_test.go b/config/params/testnet_config_test.go index 788f34457754..9f4285235cab 100644 --- a/config/params/testnet_config_test.go +++ b/config/params/testnet_config_test.go @@ -76,7 +76,7 @@ func compareConfigs(t *testing.T, expected, actual *params.BeaconChainConfig) { require.DeepEqual(t, expected.ShardCommitteePeriod, actual.ShardCommitteePeriod) require.DeepEqual(t, expected.MinEpochsToInactivityPenalty, actual.MinEpochsToInactivityPenalty) require.DeepEqual(t, expected.Eth1FollowDistance, actual.Eth1FollowDistance) - require.DeepEqual(t, expected.SafeSlotsToUpdateJustified, actual.SafeSlotsToUpdateJustified) + require.DeepEqual(t, expected.DeprecatedSafeSlotsToUpdateJustified, actual.DeprecatedSafeSlotsToUpdateJustified) require.DeepEqual(t, expected.SecondsPerETH1Block, actual.SecondsPerETH1Block) require.DeepEqual(t, expected.ProposerScoreBoost, actual.ProposerScoreBoost) require.DeepEqual(t, expected.IntervalsPerSlot, actual.IntervalsPerSlot) diff --git a/proto/eth/v1/beacon_chain.pb.go b/proto/eth/v1/beacon_chain.pb.go index 11676e816006..29f8ea7cb798 100755 --- a/proto/eth/v1/beacon_chain.pb.go +++ b/proto/eth/v1/beacon_chain.pb.go @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/golang/protobuf/protoc-gen-go/descriptor" + timestamp "github.com/golang/protobuf/ptypes/timestamp" github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" ) const ( @@ -2173,7 +2173,6 @@ type ForkChoiceDump struct { JustifiedCheckpoint *Checkpoint `protobuf:"bytes,1,opt,name=justified_checkpoint,json=justifiedCheckpoint,proto3" json:"justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,2,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` - BestJustifiedCheckpoint *Checkpoint `protobuf:"bytes,3,opt,name=best_justified_checkpoint,json=bestJustifiedCheckpoint,proto3" json:"best_justified_checkpoint,omitempty"` UnrealizedJustifiedCheckpoint *Checkpoint `protobuf:"bytes,4,opt,name=unrealized_justified_checkpoint,json=unrealizedJustifiedCheckpoint,proto3" json:"unrealized_justified_checkpoint,omitempty"` UnrealizedFinalizedCheckpoint *Checkpoint `protobuf:"bytes,5,opt,name=unrealized_finalized_checkpoint,json=unrealizedFinalizedCheckpoint,proto3" json:"unrealized_finalized_checkpoint,omitempty"` ProposerBoostRoot []byte `protobuf:"bytes,6,opt,name=proposer_boost_root,json=proposerBoostRoot,proto3" json:"proposer_boost_root,omitempty" ssz-size:"32"` @@ -2228,13 +2227,6 @@ func (x *ForkChoiceDump) GetFinalizedCheckpoint() *Checkpoint { return nil } -func (x *ForkChoiceDump) GetBestJustifiedCheckpoint() *Checkpoint { - if x != nil { - return x.BestJustifiedCheckpoint - } - return nil -} - func (x *ForkChoiceDump) GetUnrealizedJustifiedCheckpoint() *Checkpoint { if x != nil { return x.UnrealizedJustifiedCheckpoint @@ -2425,9 +2417,9 @@ type GenesisResponse_Genesis struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GenesisTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` - GenesisValidatorsRoot []byte `protobuf:"bytes,2,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - GenesisForkVersion []byte `protobuf:"bytes,3,opt,name=genesis_fork_version,json=genesisForkVersion,proto3" json:"genesis_fork_version,omitempty" ssz-size:"4"` + GenesisTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` + GenesisValidatorsRoot []byte `protobuf:"bytes,2,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` + GenesisForkVersion []byte `protobuf:"bytes,3,opt,name=genesis_fork_version,json=genesisForkVersion,proto3" json:"genesis_fork_version,omitempty" ssz-size:"4"` } func (x *GenesisResponse_Genesis) Reset() { @@ -2462,7 +2454,7 @@ func (*GenesisResponse_Genesis) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_chain_proto_rawDescGZIP(), []int{0, 0} } -func (x *GenesisResponse_Genesis) GetGenesisTime() *timestamppb.Timestamp { +func (x *GenesisResponse_Genesis) GetGenesisTime() *timestamp.Timestamp { if x != nil { return x.GenesisTime } @@ -2945,7 +2937,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x0c, 0x77, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xc6, 0x05, 0x0a, + 0x74, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xf3, 0x04, 0x0a, 0x0e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x44, 0x75, 0x6d, 0x70, 0x12, 0x4e, 0x0a, 0x14, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, @@ -2957,111 +2949,106 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x13, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, - 0x57, 0x0a, 0x19, 0x62, 0x65, 0x73, 0x74, 0x5f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, - 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, - 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, - 0x17, 0x62, 0x65, 0x73, 0x74, 0x4a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x63, 0x0a, 0x1f, 0x75, 0x6e, 0x72, 0x65, - 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x1d, - 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x4a, 0x75, 0x73, 0x74, 0x69, 0x66, - 0x69, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x63, 0x0a, - 0x1f, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6e, 0x61, - 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, - 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, - 0x69, 0x6e, 0x74, 0x52, 0x1d, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x46, - 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x13, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x62, - 0x6f, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x42, - 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x11, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, - 0x72, 0x42, 0x6f, 0x6f, 0x73, 0x74, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x47, 0x0a, 0x1c, 0x70, 0x72, - 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, - 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, - 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x19, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, - 0x75, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x42, 0x6f, 0x6f, 0x73, 0x74, 0x52, - 0x6f, 0x6f, 0x74, 0x12, 0x23, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x72, 0x6f, 0x6f, 0x74, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x08, - 0x68, 0x65, 0x61, 0x64, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x4b, 0x0a, 0x11, 0x66, 0x6f, 0x72, 0x6b, - 0x5f, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x09, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, - 0x74, 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, - 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x0f, 0x66, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, - 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x22, 0xad, 0x07, 0x0a, 0x0e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, - 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, - 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, - 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, - 0x6c, 0x6f, 0x74, 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, - 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, - 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x27, 0x0a, 0x0b, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, - 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x52, - 0x6f, 0x6f, 0x74, 0x12, 0x6f, 0x0a, 0x0f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, - 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, - 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, - 0x70, 0x6f, 0x63, 0x68, 0x12, 0x6f, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, - 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, - 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, - 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, - 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x84, 0x01, 0x0a, 0x1a, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, - 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, - 0x70, 0x6f, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, + 0x63, 0x0a, 0x1f, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x6a, 0x75, + 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, + 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, + 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x1d, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, + 0x64, 0x4a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x63, 0x0a, 0x1f, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, + 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, + 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, + 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x2e, + 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x1d, 0x75, 0x6e, 0x72, 0x65, + 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x13, 0x70, 0x72, 0x6f, + 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x11, + 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x42, 0x6f, 0x6f, 0x73, 0x74, 0x52, 0x6f, 0x6f, + 0x74, 0x12, 0x47, 0x0a, 0x1c, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x70, 0x72, + 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x6f, + 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, + 0x19, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, + 0x72, 0x42, 0x6f, 0x6f, 0x73, 0x74, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x23, 0x0a, 0x09, 0x68, 0x65, + 0x61, 0x64, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, + 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x08, 0x68, 0x65, 0x61, 0x64, 0x52, 0x6f, 0x6f, 0x74, 0x12, + 0x4b, 0x0a, 0x11, 0x66, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x6e, + 0x6f, 0x64, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x74, 0x68, + 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6f, 0x72, + 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x0f, 0x66, 0x6f, 0x72, + 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x4a, 0x04, 0x08, 0x03, + 0x10, 0x04, 0x22, 0xad, 0x07, 0x0a, 0x0e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, + 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, + 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, + 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x09, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x27, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, + 0x18, 0x02, 0x33, 0x32, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x6f, 0x6f, 0x74, + 0x12, 0x6f, 0x0a, 0x0f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, 0x70, + 0x6f, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, + 0x68, 0x52, 0x0e, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, + 0x68, 0x12, 0x6f, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x65, + 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, - 0x63, 0x68, 0x52, 0x18, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x4a, 0x75, - 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x84, 0x01, 0x0a, - 0x1a, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6e, 0x61, - 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, - 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, - 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x18, 0x75, 0x6e, 0x72, 0x65, 0x61, - 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, - 0x6f, 0x63, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x77, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x31, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x74, 0x69, 0x63, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, - 0x74, 0x69, 0x6d, 0x69, 0x73, 0x74, 0x69, 0x63, 0x12, 0x38, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, - 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x12, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, - 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, - 0x0c, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, - 0x12, 0x43, 0x0a, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, - 0x68, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, - 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x52, 0x08, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x69, 0x74, 0x79, 0x2a, 0x40, 0x0a, 0x16, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, - 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x12, - 0x09, 0x0a, 0x05, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, - 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x54, 0x49, 0x4d, - 0x49, 0x53, 0x54, 0x49, 0x43, 0x10, 0x02, 0x42, 0x7d, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x2e, 0x65, - 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x42, 0x10, - 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, + 0x63, 0x68, 0x52, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, 0x6f, + 0x63, 0x68, 0x12, 0x84, 0x01, 0x0a, 0x1a, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, + 0x64, 0x5f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, + 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, + 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, + 0x18, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x4a, 0x75, 0x73, 0x74, 0x69, + 0x66, 0x69, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x84, 0x01, 0x0a, 0x1a, 0x75, 0x6e, + 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, + 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, + 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, - 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, - 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, - 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, + 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x18, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, + 0x65, 0x64, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, + 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x31, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x74, 0x69, 0x63, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x13, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6d, + 0x69, 0x73, 0x74, 0x69, 0x63, 0x12, 0x38, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x12, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, + 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x43, 0x0a, + 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x27, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, + 0x31, 0x2e, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, + 0x56, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x52, 0x08, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x69, + 0x74, 0x79, 0x2a, 0x40, 0x0a, 0x16, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, + 0x4e, 0x6f, 0x64, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x12, 0x09, 0x0a, 0x05, + 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x56, 0x41, 0x4c, + 0x49, 0x44, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x54, 0x49, 0x4d, 0x49, 0x53, 0x54, + 0x49, 0x43, 0x10, 0x02, 0x42, 0x7d, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x2e, 0x65, 0x74, 0x68, 0x65, + 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x42, 0x10, 0x42, 0x65, 0x61, + 0x63, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, + 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, + 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, + 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, + 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, + 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -3123,19 +3110,19 @@ var file_proto_eth_v1_beacon_chain_proto_goTypes = []interface{}{ (*GenesisResponse_Genesis)(nil), // 41: ethereum.eth.v1.GenesisResponse.Genesis (*StateRootResponse_StateRoot)(nil), // 42: ethereum.eth.v1.StateRootResponse.StateRoot (*StateFinalityCheckpointResponse_StateFinalityCheckpoint)(nil), // 43: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint - nil, // 44: ethereum.eth.v1.SpecResponse.DataEntry - (*Fork)(nil), // 45: ethereum.eth.v1.Fork - (ValidatorStatus)(0), // 46: ethereum.eth.v1.ValidatorStatus - (*ValidatorContainer)(nil), // 47: ethereum.eth.v1.ValidatorContainer - (*Committee)(nil), // 48: ethereum.eth.v1.Committee - (*Attestation)(nil), // 49: ethereum.eth.v1.Attestation - (*BeaconBlockHeader)(nil), // 50: ethereum.eth.v1.BeaconBlockHeader - (*BeaconBlock)(nil), // 51: ethereum.eth.v1.BeaconBlock - (*AttesterSlashing)(nil), // 52: ethereum.eth.v1.AttesterSlashing - (*ProposerSlashing)(nil), // 53: ethereum.eth.v1.ProposerSlashing - (*SignedVoluntaryExit)(nil), // 54: ethereum.eth.v1.SignedVoluntaryExit - (*Checkpoint)(nil), // 55: ethereum.eth.v1.Checkpoint - (*timestamppb.Timestamp)(nil), // 56: google.protobuf.Timestamp + nil, // 44: ethereum.eth.v1.SpecResponse.DataEntry + (*Fork)(nil), // 45: ethereum.eth.v1.Fork + (ValidatorStatus)(0), // 46: ethereum.eth.v1.ValidatorStatus + (*ValidatorContainer)(nil), // 47: ethereum.eth.v1.ValidatorContainer + (*Committee)(nil), // 48: ethereum.eth.v1.Committee + (*Attestation)(nil), // 49: ethereum.eth.v1.Attestation + (*BeaconBlockHeader)(nil), // 50: ethereum.eth.v1.BeaconBlockHeader + (*BeaconBlock)(nil), // 51: ethereum.eth.v1.BeaconBlock + (*AttesterSlashing)(nil), // 52: ethereum.eth.v1.AttesterSlashing + (*ProposerSlashing)(nil), // 53: ethereum.eth.v1.ProposerSlashing + (*SignedVoluntaryExit)(nil), // 54: ethereum.eth.v1.SignedVoluntaryExit + (*Checkpoint)(nil), // 55: ethereum.eth.v1.Checkpoint + (*timestamp.Timestamp)(nil), // 56: google.protobuf.Timestamp } var file_proto_eth_v1_beacon_chain_proto_depIdxs = []int32{ 41, // 0: ethereum.eth.v1.GenesisResponse.data:type_name -> ethereum.eth.v1.GenesisResponse.Genesis @@ -3167,20 +3154,19 @@ var file_proto_eth_v1_beacon_chain_proto_depIdxs = []int32{ 55, // 26: ethereum.eth.v1.WeakSubjectivityData.ws_checkpoint:type_name -> ethereum.eth.v1.Checkpoint 55, // 27: ethereum.eth.v1.ForkChoiceDump.justified_checkpoint:type_name -> ethereum.eth.v1.Checkpoint 55, // 28: ethereum.eth.v1.ForkChoiceDump.finalized_checkpoint:type_name -> ethereum.eth.v1.Checkpoint - 55, // 29: ethereum.eth.v1.ForkChoiceDump.best_justified_checkpoint:type_name -> ethereum.eth.v1.Checkpoint - 55, // 30: ethereum.eth.v1.ForkChoiceDump.unrealized_justified_checkpoint:type_name -> ethereum.eth.v1.Checkpoint - 55, // 31: ethereum.eth.v1.ForkChoiceDump.unrealized_finalized_checkpoint:type_name -> ethereum.eth.v1.Checkpoint - 40, // 32: ethereum.eth.v1.ForkChoiceDump.fork_choice_nodes:type_name -> ethereum.eth.v1.ForkChoiceNode - 0, // 33: ethereum.eth.v1.ForkChoiceNode.validity:type_name -> ethereum.eth.v1.ForkChoiceNodeValidity - 56, // 34: ethereum.eth.v1.GenesisResponse.Genesis.genesis_time:type_name -> google.protobuf.Timestamp - 55, // 35: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint.previous_justified:type_name -> ethereum.eth.v1.Checkpoint - 55, // 36: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint.current_justified:type_name -> ethereum.eth.v1.Checkpoint - 55, // 37: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint.finalized:type_name -> ethereum.eth.v1.Checkpoint - 38, // [38:38] is the sub-list for method output_type - 38, // [38:38] is the sub-list for method input_type - 38, // [38:38] is the sub-list for extension type_name - 38, // [38:38] is the sub-list for extension extendee - 0, // [0:38] is the sub-list for field type_name + 55, // 29: ethereum.eth.v1.ForkChoiceDump.unrealized_justified_checkpoint:type_name -> ethereum.eth.v1.Checkpoint + 55, // 30: ethereum.eth.v1.ForkChoiceDump.unrealized_finalized_checkpoint:type_name -> ethereum.eth.v1.Checkpoint + 40, // 31: ethereum.eth.v1.ForkChoiceDump.fork_choice_nodes:type_name -> ethereum.eth.v1.ForkChoiceNode + 0, // 32: ethereum.eth.v1.ForkChoiceNode.validity:type_name -> ethereum.eth.v1.ForkChoiceNodeValidity + 56, // 33: ethereum.eth.v1.GenesisResponse.Genesis.genesis_time:type_name -> google.protobuf.Timestamp + 55, // 34: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint.previous_justified:type_name -> ethereum.eth.v1.Checkpoint + 55, // 35: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint.current_justified:type_name -> ethereum.eth.v1.Checkpoint + 55, // 36: ethereum.eth.v1.StateFinalityCheckpointResponse.StateFinalityCheckpoint.finalized:type_name -> ethereum.eth.v1.Checkpoint + 37, // [37:37] is the sub-list for method output_type + 37, // [37:37] is the sub-list for method input_type + 37, // [37:37] is the sub-list for extension type_name + 37, // [37:37] is the sub-list for extension extendee + 0, // [0:37] is the sub-list for field type_name } func init() { file_proto_eth_v1_beacon_chain_proto_init() } diff --git a/proto/eth/v1/beacon_chain.proto b/proto/eth/v1/beacon_chain.proto index 41a27e35eccd..ae768dc8c607 100644 --- a/proto/eth/v1/beacon_chain.proto +++ b/proto/eth/v1/beacon_chain.proto @@ -307,12 +307,11 @@ message WeakSubjectivityData { } message ForkChoiceDump { + reserved 3; // Latest justified checkpoint in forkchoice store. Checkpoint justified_checkpoint = 1; // Latest finalized checkpoint in forkchoice store. Checkpoint finalized_checkpoint = 2; - // Best justified checkpoint in forkchoice store. - Checkpoint best_justified_checkpoint = 3; // Unrealized justified checkpoint in forkchoice store. Checkpoint unrealized_justified_checkpoint = 4; // Unrealized finalized checkpoint in forkchoice store. diff --git a/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel b/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel index 33f58a3756e5..1c2f4d9d33f4 100644 --- a/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel +++ b/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel @@ -10,7 +10,6 @@ go_test( ], tags = ["spectest"], deps = [ - "//config/features:go_default_library", "//runtime/version:go_default_library", "//testing/spectest/shared/common/forkchoice:go_default_library", ], diff --git a/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go index 3608391d038e..186c7c2cf242 100644 --- a/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go +++ b/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go @@ -3,16 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/runtime/version" "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" ) func TestMainnet_Altair_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() forkchoice.Run(t, "mainnet", version.Altair) } diff --git a/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel b/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel index 33f58a3756e5..1c2f4d9d33f4 100644 --- a/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel +++ b/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel @@ -10,7 +10,6 @@ go_test( ], tags = ["spectest"], deps = [ - "//config/features:go_default_library", "//runtime/version:go_default_library", "//testing/spectest/shared/common/forkchoice:go_default_library", ], diff --git a/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go index 8d69a2756814..095c83972a59 100644 --- a/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go +++ b/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go @@ -3,16 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/runtime/version" "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" ) func TestMainnet_Bellatrix_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() forkchoice.Run(t, "mainnet", version.Bellatrix) } diff --git a/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel b/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel index 1027f241bcb0..c0e853a7c435 100644 --- a/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel +++ b/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel @@ -10,7 +10,6 @@ go_test( ], tags = ["spectest"], deps = [ - "//config/features:go_default_library", "//runtime/version:go_default_library", "//testing/spectest/shared/common/forkchoice:go_default_library", ], diff --git a/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go index 7f015d931b0b..535e633b9063 100644 --- a/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go +++ b/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go @@ -3,17 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/runtime/version" "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" ) func TestMainnet_Capella_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - // Experimental features are disabled by default for spec tests. - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() forkchoice.Run(t, "mainnet", version.Capella) } diff --git a/testing/spectest/mainnet/phase0/forkchoice/BUILD.bazel b/testing/spectest/mainnet/phase0/forkchoice/BUILD.bazel deleted file mode 100644 index 33f58a3756e5..000000000000 --- a/testing/spectest/mainnet/phase0/forkchoice/BUILD.bazel +++ /dev/null @@ -1,17 +0,0 @@ -load("@prysm//tools/go:def.bzl", "go_test") - -go_test( - name = "go_default_test", - size = "enormous", - timeout = "short", - srcs = ["forkchoice_test.go"], - data = glob(["*.yaml"]) + [ - "@consensus_spec_tests_mainnet//:test_data", - ], - tags = ["spectest"], - deps = [ - "//config/features:go_default_library", - "//runtime/version:go_default_library", - "//testing/spectest/shared/common/forkchoice:go_default_library", - ], -) diff --git a/testing/spectest/mainnet/phase0/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/phase0/forkchoice/forkchoice_test.go deleted file mode 100644 index f643e1fea69d..000000000000 --- a/testing/spectest/mainnet/phase0/forkchoice/forkchoice_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package forkchoice - -import ( - "testing" - - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" -) - -func TestMainnet_Phase0_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() - forkchoice.Run(t, "mainnet", version.Phase0) -} diff --git a/testing/spectest/minimal/altair/forkchoice/BUILD.bazel b/testing/spectest/minimal/altair/forkchoice/BUILD.bazel index cf84c6a81e0e..9bb5b8073fed 100644 --- a/testing/spectest/minimal/altair/forkchoice/BUILD.bazel +++ b/testing/spectest/minimal/altair/forkchoice/BUILD.bazel @@ -14,7 +14,6 @@ go_test( "spectest", ], deps = [ - "//config/features:go_default_library", "//runtime/version:go_default_library", "//testing/spectest/shared/common/forkchoice:go_default_library", ], diff --git a/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go b/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go index c42ab2afe78d..6d6bdebcdc0d 100644 --- a/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go +++ b/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go @@ -3,16 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/runtime/version" "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" ) func TestMinimal_Altair_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - DisablePullTips: true, - EnableDefensivePull: false, - }) - defer resetCfg() forkchoice.Run(t, "minimal", version.Altair) } diff --git a/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel b/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel index cf84c6a81e0e..9bb5b8073fed 100644 --- a/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel +++ b/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel @@ -14,7 +14,6 @@ go_test( "spectest", ], deps = [ - "//config/features:go_default_library", "//runtime/version:go_default_library", "//testing/spectest/shared/common/forkchoice:go_default_library", ], diff --git a/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go b/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go index a60b37aed633..5cc2d5c80fc4 100644 --- a/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go +++ b/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go @@ -3,16 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/runtime/version" "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" ) func TestMinimal_Bellatrix_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() forkchoice.Run(t, "minimal", version.Bellatrix) } diff --git a/testing/spectest/minimal/capella/forkchoice/BUILD.bazel b/testing/spectest/minimal/capella/forkchoice/BUILD.bazel index 8edc85a6ac18..80aa0da87d16 100644 --- a/testing/spectest/minimal/capella/forkchoice/BUILD.bazel +++ b/testing/spectest/minimal/capella/forkchoice/BUILD.bazel @@ -14,7 +14,6 @@ go_test( "spectest", ], deps = [ - "//config/features:go_default_library", "//runtime/version:go_default_library", "//testing/spectest/shared/common/forkchoice:go_default_library", ], diff --git a/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go b/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go index c95f6a366b73..9cca8428c8a0 100644 --- a/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go +++ b/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go @@ -3,16 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/runtime/version" "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" ) func TestMinimal_Capella_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() forkchoice.Run(t, "minimal", version.Capella) } diff --git a/testing/spectest/minimal/phase0/forkchoice/BUILD.bazel b/testing/spectest/minimal/phase0/forkchoice/BUILD.bazel deleted file mode 100644 index cf84c6a81e0e..000000000000 --- a/testing/spectest/minimal/phase0/forkchoice/BUILD.bazel +++ /dev/null @@ -1,21 +0,0 @@ -load("@prysm//tools/go:def.bzl", "go_test") - -go_test( - name = "go_default_test", - size = "enormous", - timeout = "short", - srcs = ["forkchoice_test.go"], - data = glob(["*.yaml"]) + [ - "@consensus_spec_tests_minimal//:test_data", - ], - eth_network = "minimal", - tags = [ - "minimal", - "spectest", - ], - deps = [ - "//config/features:go_default_library", - "//runtime/version:go_default_library", - "//testing/spectest/shared/common/forkchoice:go_default_library", - ], -) diff --git a/testing/spectest/minimal/phase0/forkchoice/forkchoice_test.go b/testing/spectest/minimal/phase0/forkchoice/forkchoice_test.go deleted file mode 100644 index fc32d0cb6ebd..000000000000 --- a/testing/spectest/minimal/phase0/forkchoice/forkchoice_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package forkchoice - -import ( - "testing" - - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" -) - -func TestMinimal_Phase0_Forkchoice(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - EnableDefensivePull: false, - DisablePullTips: true, - }) - defer resetCfg() - forkchoice.Run(t, "minimal", version.Phase0) -} diff --git a/testing/spectest/shared/common/forkchoice/builder.go b/testing/spectest/shared/common/forkchoice/builder.go index 845d5d046a95..997f94a89ab7 100644 --- a/testing/spectest/shared/common/forkchoice/builder.go +++ b/testing/spectest/shared/common/forkchoice/builder.go @@ -134,14 +134,6 @@ func (bb *Builder) Check(t testing.TB, c *Check) { got := bb.service.CurrentJustifiedCheckpt() require.DeepEqual(t, cp, got) } - if c.BestJustifiedCheckPoint != nil { - cp := ðpb.Checkpoint{ - Epoch: primitives.Epoch(c.BestJustifiedCheckPoint.Epoch), - Root: common.FromHex(c.BestJustifiedCheckPoint.Root), - } - got := bb.service.BestJustifiedCheckpt() - require.DeepEqual(t, cp, got) - } if c.FinalizedCheckPoint != nil { cp := ðpb.Checkpoint{ Epoch: primitives.Epoch(c.FinalizedCheckPoint.Epoch), From 5beb5e89125eefe7dd7aeaff0ad931617af37853 Mon Sep 17 00:00:00 2001 From: Potuz Date: Thu, 16 Mar 2023 22:44:24 -0300 Subject: [PATCH 02/10] Invert reorg of late blocks flag (#12146) * Invert reorg of late blocks flag * add flag to beacon node --- config/features/config.go | 7 +++---- config/features/flags.go | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/features/config.go b/config/features/config.go index 17b9874a0d95..975bbcd661f7 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -174,10 +174,9 @@ func ConfigureBeaconChain(ctx *cli.Context) error { cfg.DisableGRPCConnectionLogs = true } - cfg.DisableReorgLateBlocks = true - if ctx.Bool(enableReorgLateBlocks.Name) { - logEnabled(enableReorgLateBlocks) - cfg.DisableReorgLateBlocks = false + if ctx.Bool(disableReorgLateBlocks.Name) { + logEnabled(disableReorgLateBlocks) + cfg.DisableReorgLateBlocks = true } if ctx.Bool(disableBroadcastSlashingFlag.Name) { logDisabled(disableBroadcastSlashingFlag) diff --git a/config/features/flags.go b/config/features/flags.go index b9f2c6aed9dc..02785c35d05a 100644 --- a/config/features/flags.go +++ b/config/features/flags.go @@ -41,9 +41,9 @@ var ( Name: "disable-grpc-connection-logging", Usage: "Disables displaying logs for newly connected grpc clients", } - enableReorgLateBlocks = &cli.BoolFlag{ - Name: "enable-reorg-late-blocks", - Usage: "Enables reorgs of late blocks", + disableReorgLateBlocks = &cli.BoolFlag{ + Name: "disable-reorg-late-blocks", + Usage: "Disables reorgs of late blocks", } writeWalletPasswordOnWebOnboarding = &cli.BoolFlag{ Name: "write-wallet-password-on-web-onboarding", @@ -163,7 +163,7 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c enableHistoricalSpaceRepresentation, disableStakinContractCheck, disableVecHTR, - enableReorgLateBlocks, + disableReorgLateBlocks, disableForkChoiceDoublyLinkedTree, disableGossipBatchAggregation, SaveFullExecutionPayloads, From 04b0a84de19390e1b915eece811e0430ba7dc639 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 17 Mar 2023 18:08:56 +0800 Subject: [PATCH 03/10] Disable E2E Run For Slasher (#12150) * fix evaluator * fix tests --- testing/endtoend/evaluators/slashing.go | 2 +- testing/endtoend/minimal_slashing_e2e_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/endtoend/evaluators/slashing.go b/testing/endtoend/evaluators/slashing.go index e0e1bedb7536..aacda5f538c9 100644 --- a/testing/endtoend/evaluators/slashing.go +++ b/testing/endtoend/evaluators/slashing.go @@ -287,7 +287,7 @@ func generateSignedBeaconBlock( hashLen := 32 blk := ð.BeaconBlock{ - Slot: chainHead.HeadSlot + 1, + Slot: chainHead.HeadSlot - 1, ParentRoot: chainHead.HeadBlockRoot, StateRoot: bytesutil.PadTo([]byte(stateRoot), hashLen), ProposerIndex: proposerIndex, diff --git a/testing/endtoend/minimal_slashing_e2e_test.go b/testing/endtoend/minimal_slashing_e2e_test.go index dfa32769742c..ac84e3475c54 100644 --- a/testing/endtoend/minimal_slashing_e2e_test.go +++ b/testing/endtoend/minimal_slashing_e2e_test.go @@ -12,6 +12,7 @@ import ( ) func TestEndToEnd_Slasher_MinimalConfig(t *testing.T) { + t.Skip("E2E run appears broken, evaluators need to be rewritten most likely") params.SetupTestConfigCleanup(t) params.OverrideBeaconConfig(params.E2ETestConfig().Copy()) require.NoError(t, e2eParams.Init(t, e2eParams.StandardBeaconCount)) From 5243ca7d64343d9cf72f6ac7aa78e983f5cd2019 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 17 Mar 2023 18:26:58 +0800 Subject: [PATCH 04/10] Deprecate Reorg Flag Correctly (#12147) Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- config/features/deprecated_flags.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go index 251eb17318c0..9cc732791ad2 100644 --- a/config/features/deprecated_flags.go +++ b/config/features/deprecated_flags.go @@ -17,12 +17,18 @@ var ( Usage: deprecatedUsage, Hidden: true, } + deprecatedEnableReorgLateBlocks = &cli.BoolFlag{ + Name: "enable-reorg-late-blocks", + Usage: deprecatedUsage, + Hidden: true, + } ) // Deprecated flags for both the beacon node and validator client. var deprecatedFlags = []cli.Flag{ exampleDeprecatedFeatureFlag, deprecatedDisablePeerScorer, + deprecatedEnableReorgLateBlocks, } // deprecatedBeaconFlags contains flags that are still used by other components From a937d787114a7160fa371adda285a4fa27cbe9e0 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 17 Mar 2023 19:08:05 +0800 Subject: [PATCH 05/10] Remove Disable Flag For Doubly Linked Tree (#12141) * deprecate * remove this as the feature never worked * fix --- beacon-chain/blockchain/head_test.go | 11 ----------- config/features/config.go | 18 ++++++------------ config/features/flags.go | 5 ----- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/beacon-chain/blockchain/head_test.go b/beacon-chain/blockchain/head_test.go index 63c013190a7a..35288e743cee 100644 --- a/beacon-chain/blockchain/head_test.go +++ b/beacon-chain/blockchain/head_test.go @@ -13,7 +13,6 @@ import ( forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" @@ -386,11 +385,6 @@ func TestSaveOrphanedAtts_CanFilter(t *testing.T) { } func TestSaveOrphanedAtts_DoublyLinkedTrie(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - DisableForkchoiceDoublyLinkedTree: false, - }) - defer resetCfg() - ctx := context.Background() beaconDB := testDB.SetupDB(t) service := setupBeaconChain(t, beaconDB) @@ -456,11 +450,6 @@ func TestSaveOrphanedAtts_DoublyLinkedTrie(t *testing.T) { } func TestSaveOrphanedAtts_CanFilter_DoublyLinkedTrie(t *testing.T) { - resetCfg := features.InitWithReset(&features.Flags{ - DisableForkchoiceDoublyLinkedTree: false, - }) - defer resetCfg() - ctx := context.Background() beaconDB := testDB.SetupDB(t) service := setupBeaconChain(t, beaconDB) diff --git a/config/features/config.go b/config/features/config.go index 975bbcd661f7..42adc1a37c84 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -58,15 +58,13 @@ type Flags struct { // Bug fixes related flags. AttestTimely bool // AttestTimely fixes #8185. It is gated behind a flag to ensure beacon node's fix can safely roll out first. We'll invert this in v1.1.0. - EnableSlasher bool // Enable slasher in the beacon node runtime. - // EnableSlashingProtectionPruning for the validator client. - EnableSlashingProtectionPruning bool + EnableSlasher bool // Enable slasher in the beacon node runtime. + EnableSlashingProtectionPruning bool // EnableSlashingProtectionPruning for the validator client. - EnableVectorizedHTR bool // EnableVectorizedHTR specifies whether the beacon state will use the optimized sha256 routines. - DisableForkchoiceDoublyLinkedTree bool // DisableForkChoiceDoublyLinkedTree specifies whether fork choice store will use a doubly linked tree. - EnableBatchGossipAggregation bool // EnableBatchGossipAggregation specifies whether to further aggregate our gossip batches before verifying them. - SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database. - EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup. + EnableVectorizedHTR bool // EnableVectorizedHTR specifies whether the beacon state will use the optimized sha256 routines. + EnableBatchGossipAggregation bool // EnableBatchGossipAggregation specifies whether to further aggregate our gossip batches before verifying them. + SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database. + EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup. DisableStakinContractCheck bool // Disables check for deposit contract when proposing blocks @@ -214,10 +212,6 @@ func ConfigureBeaconChain(ctx *cli.Context) error { } } } - if ctx.Bool(disableForkChoiceDoublyLinkedTree.Name) { - logEnabled(disableForkChoiceDoublyLinkedTree) - cfg.DisableForkchoiceDoublyLinkedTree = true - } cfg.EnableBatchGossipAggregation = true if ctx.Bool(disableGossipBatchAggregation.Name) { logDisabled(disableGossipBatchAggregation) diff --git a/config/features/flags.go b/config/features/flags.go index 02785c35d05a..f4da4eb6f3f1 100644 --- a/config/features/flags.go +++ b/config/features/flags.go @@ -92,10 +92,6 @@ var ( Name: "disable-vectorized-htr", Usage: "Disables the new go sha256 library which utilizes optimized routines for merkle trees", } - disableForkChoiceDoublyLinkedTree = &cli.BoolFlag{ - Name: "disable-forkchoice-doubly-linked-tree", - Usage: "Disables the new forkchoice store structure that uses doubly linked trees", - } disableGossipBatchAggregation = &cli.BoolFlag{ Name: "disable-gossip-batch-aggregation", Usage: "Disables new methods to further aggregate our gossip batches before verifying them.", @@ -164,7 +160,6 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c disableStakinContractCheck, disableVecHTR, disableReorgLateBlocks, - disableForkChoiceDoublyLinkedTree, disableGossipBatchAggregation, SaveFullExecutionPayloads, enableStartupOptimistic, From e58b66f76d677835446ab94b157454837a67a3c5 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 17 Mar 2023 19:41:02 +0800 Subject: [PATCH 06/10] Fully Deprecate Vectorized HTR Flag (#12148) * cleanup * gaz * fix tests * remove unused hasher * gaz * fix last one * fix tests * fmt --- beacon-chain/core/blocks/withdrawals.go | 4 +- beacon-chain/core/blocks/withdrawals_test.go | 2 +- beacon-chain/node/config.go | 5 +- .../rpc/eth/beacon/blinded_blocks_test.go | 3 +- beacon-chain/rpc/eth/validator/BUILD.bazel | 1 - .../rpc/eth/validator/validator_test.go | 11 ++- .../v1alpha1/validator/proposer_bellatrix.go | 3 +- .../validator/proposer_bellatrix_test.go | 5 +- .../validator/proposer_capella_test.go | 3 +- beacon-chain/state/fieldtrie/BUILD.bazel | 1 - .../state/fieldtrie/field_trie_helpers.go | 10 +-- beacon-chain/state/state-native/hasher.go | 10 ++- beacon-chain/state/state-native/state_trie.go | 10 ++- beacon-chain/state/stateutil/BUILD.bazel | 2 - .../state/stateutil/block_header_root.go | 3 +- beacon-chain/state/stateutil/eth1_root.go | 15 ++-- .../state/stateutil/field_root_attestation.go | 15 ++-- .../state/stateutil/field_root_eth1.go | 5 +- .../state/stateutil/field_root_validator.go | 43 ++---------- .../state/stateutil/field_root_vector.go | 10 +-- .../stateutil/historical_summaries_root.go | 9 +-- .../state/stateutil/participation_bit_root.go | 4 +- .../stateutil/pending_attestation_root.go | 16 ++--- .../state/stateutil/sync_committee.root.go | 33 ++++----- beacon-chain/state/stateutil/trie_helpers.go | 68 +++++-------------- .../state/stateutil/trie_helpers_test.go | 39 ++--------- .../state/stateutil/validator_root.go | 14 ++-- config/features/BUILD.bazel | 1 - config/features/config.go | 25 ------- config/features/deprecated_flags.go | 6 ++ config/features/flags.go | 5 -- consensus-types/blocks/BUILD.bazel | 1 - consensus-types/blocks/execution.go | 3 +- encoding/ssz/BUILD.bazel | 2 - encoding/ssz/helpers.go | 18 ++--- encoding/ssz/helpers_test.go | 15 ++-- encoding/ssz/htrutils.go | 27 ++++---- encoding/ssz/htrutils_test.go | 10 +-- proto/migration/BUILD.bazel | 1 - proto/migration/v1alpha1_to_v2.go | 7 +- validator/node/node.go | 4 +- 41 files changed, 132 insertions(+), 337 deletions(-) diff --git a/beacon-chain/core/blocks/withdrawals.go b/beacon-chain/core/blocks/withdrawals.go index 3f7ddc5211da..d3e943f4bf4c 100644 --- a/beacon-chain/core/blocks/withdrawals.go +++ b/beacon-chain/core/blocks/withdrawals.go @@ -163,13 +163,13 @@ func ProcessWithdrawals(st state.BeaconState, executionData interfaces.Execution if err != nil { return nil, errors.Wrap(err, "could not get withdrawals") } - wdRoot, err = ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), wds, fieldparams.MaxWithdrawalsPerPayload) + wdRoot, err = ssz.WithdrawalSliceRoot(wds, fieldparams.MaxWithdrawalsPerPayload) if err != nil { return nil, errors.Wrap(err, "could not get withdrawals root") } } - expectedRoot, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), expectedWithdrawals, fieldparams.MaxWithdrawalsPerPayload) + expectedRoot, err := ssz.WithdrawalSliceRoot(expectedWithdrawals, fieldparams.MaxWithdrawalsPerPayload) if err != nil { return nil, errors.Wrap(err, "could not get expected withdrawals root") } diff --git a/beacon-chain/core/blocks/withdrawals_test.go b/beacon-chain/core/blocks/withdrawals_test.go index 5491c8022d3a..19533f4c7805 100644 --- a/beacon-chain/core/blocks/withdrawals_test.go +++ b/beacon-chain/core/blocks/withdrawals_test.go @@ -642,7 +642,7 @@ func TestProcessBlindWithdrawals(t *testing.T) { } st, err := prepareValidators(spb, test.Args) require.NoError(t, err) - wdRoot, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), test.Args.Withdrawals, fieldparams.MaxWithdrawalsPerPayload) + wdRoot, err := ssz.WithdrawalSliceRoot(test.Args.Withdrawals, fieldparams.MaxWithdrawalsPerPayload) require.NoError(t, err) p, err := consensusblocks.WrappedExecutionPayloadHeaderCapella(&enginev1.ExecutionPayloadHeaderCapella{WithdrawalsRoot: wdRoot[:]}, big.NewInt(0)) require.NoError(t, err) diff --git a/beacon-chain/node/config.go b/beacon-chain/node/config.go index 0bdb22184ead..afb021974082 100644 --- a/beacon-chain/node/config.go +++ b/beacon-chain/node/config.go @@ -7,7 +7,6 @@ import ( fastssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/v3/cmd" "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" tracing2 "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" @@ -193,7 +192,5 @@ func configureExecutionSetting(cliCtx *cli.Context) error { } func configureFastSSZHashingAlgorithm() { - if features.Get().EnableVectorizedHTR { - fastssz.EnableVectorizedHTR = true - } + fastssz.EnableVectorizedHTR = true } diff --git a/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go b/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go index 6399dce7bf30..df7016188dff 100644 --- a/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go +++ b/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go @@ -15,7 +15,6 @@ import ( "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" @@ -1141,7 +1140,7 @@ func TestSubmitBlindedBlock(t *testing.T) { Amount: 2, }, } - withdrawalsRoot, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), withdrawals, 16) + withdrawalsRoot, err := ssz.WithdrawalSliceRoot(withdrawals, 16) require.NoError(t, err) beaconDB := dbTest.SetupDB(t) diff --git a/beacon-chain/rpc/eth/validator/BUILD.bazel b/beacon-chain/rpc/eth/validator/BUILD.bazel index fc6626d1dee7..ae7df678b945 100644 --- a/beacon-chain/rpc/eth/validator/BUILD.bazel +++ b/beacon-chain/rpc/eth/validator/BUILD.bazel @@ -78,7 +78,6 @@ go_test( "//consensus-types/blocks:go_default_library", "//consensus-types/primitives:go_default_library", "//crypto/bls:go_default_library", - "//crypto/hash:go_default_library", "//encoding/bytesutil:go_default_library", "//encoding/ssz:go_default_library", "//proto/engine/v1:go_default_library", diff --git a/beacon-chain/rpc/eth/validator/validator_test.go b/beacon-chain/rpc/eth/validator/validator_test.go index 44b27a6a8c84..654f0aeb2d98 100644 --- a/beacon-chain/rpc/eth/validator/validator_test.go +++ b/beacon-chain/rpc/eth/validator/validator_test.go @@ -39,7 +39,6 @@ import ( "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" @@ -455,6 +454,7 @@ func TestGetSyncCommitteeDuties(t *testing.T) { currCommittee := ðpbalpha.SyncCommittee{} for i := 0; i < 5; i++ { currCommittee.Pubkeys = append(currCommittee.Pubkeys, vals[i].PublicKey) + currCommittee.AggregatePubkey = make([]byte, 48) } // add one public key twice - this is needed for one of the test cases currCommittee.Pubkeys = append(currCommittee.Pubkeys, vals[0].PublicKey) @@ -462,6 +462,8 @@ func TestGetSyncCommitteeDuties(t *testing.T) { nextCommittee := ðpbalpha.SyncCommittee{} for i := 5; i < 10; i++ { nextCommittee.Pubkeys = append(nextCommittee.Pubkeys, vals[i].PublicKey) + nextCommittee.AggregatePubkey = make([]byte, 48) + } require.NoError(t, st.SetNextSyncCommittee(nextCommittee)) db := dbutil.SetupDB(t) @@ -590,11 +592,14 @@ func TestGetSyncCommitteeDuties(t *testing.T) { currCommittee := ðpbalpha.SyncCommittee{} for i := 5; i < 10; i++ { currCommittee.Pubkeys = append(currCommittee.Pubkeys, vals[i].PublicKey) + currCommittee.AggregatePubkey = make([]byte, 48) } require.NoError(t, newSyncPeriodSt.SetCurrentSyncCommittee(currCommittee)) nextCommittee := ðpbalpha.SyncCommittee{} for i := 0; i < 5; i++ { nextCommittee.Pubkeys = append(nextCommittee.Pubkeys, vals[i].PublicKey) + nextCommittee.AggregatePubkey = make([]byte, 48) + } require.NoError(t, newSyncPeriodSt.SetNextSyncCommittee(nextCommittee)) @@ -1181,7 +1186,7 @@ func TestProduceBlockV2(t *testing.T) { Amount: 123, }, } - withdrawalsRoot, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), withdrawals, 2) + withdrawalsRoot, err := ssz.WithdrawalSliceRoot(withdrawals, 2) require.NoError(t, err) payloadHeader, err := blocks.WrappedExecutionPayloadHeaderCapella(&enginev1.ExecutionPayloadHeaderCapella{ @@ -2715,7 +2720,7 @@ func TestProduceBlindedBlock(t *testing.T) { require.NoError(t, err) wds, err := beaconState.ExpectedWithdrawals() require.NoError(t, err) - wr, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), wds, fieldparams.MaxWithdrawalsPerPayload) + wr, err := ssz.WithdrawalSliceRoot(wds, fieldparams.MaxWithdrawalsPerPayload) require.NoError(t, err) bid := ðpbalpha.BuilderBidCapella{ Header: &enginev1.ExecutionPayloadHeaderCapella{ diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go index f1931345f585..b0cd06b2590f 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go @@ -17,7 +17,6 @@ import ( consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" @@ -344,7 +343,7 @@ func matchingWithdrawalsRoot(local, builder interfaces.ExecutionData) (bool, err if err != nil { return false, errors.Wrap(err, "could not get builder withdrawals root") } - wr, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), wds, fieldparams.MaxWithdrawalsPerPayload) + wr, err := ssz.WithdrawalSliceRoot(wds, fieldparams.MaxWithdrawalsPerPayload) if err != nil { return false, errors.Wrap(err, "could not compute local withdrawals root") } diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go index 2622b099b299..45981ba400ec 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go @@ -22,7 +22,6 @@ import ( "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" @@ -136,7 +135,7 @@ func TestServer_setExecutionData(t *testing.T) { require.NoError(t, err) sk, err := bls.RandKey() require.NoError(t, err) - wr, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), withdrawals, fieldparams.MaxWithdrawalsPerPayload) + wr, err := ssz.WithdrawalSliceRoot(withdrawals, fieldparams.MaxWithdrawalsPerPayload) require.NoError(t, err) bid := ðpb.BuilderBidCapella{ Header: &v1.ExecutionPayloadHeaderCapella{ @@ -579,7 +578,7 @@ func Test_matchingWithdrawalsRoot(t *testing.T) { p, err := blocks.WrappedExecutionPayloadCapella(local, big.NewInt(0)) require.NoError(t, err) header := &v1.ExecutionPayloadHeaderCapella{} - wr, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), wds, fieldparams.MaxWithdrawalsPerPayload) + wr, err := ssz.WithdrawalSliceRoot(wds, fieldparams.MaxWithdrawalsPerPayload) require.NoError(t, err) header.WithdrawalsRoot = wr[:] h, err := blocks.WrappedExecutionPayloadHeaderCapella(header, big.NewInt(0)) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go index d61378c75225..7ef7db81d975 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go @@ -9,7 +9,6 @@ import ( fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" "github.com/prysmaticlabs/prysm/v3/testing/require" @@ -86,7 +85,7 @@ func TestServer_unblindBuilderCapellaBlock(t *testing.T) { b.Block.ProposerIndex = 2 txRoot, err := ssz.TransactionsRoot(make([][]byte, 0)) require.NoError(t, err) - wdRoot, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), []*v1.Withdrawal{}, fieldparams.MaxWithdrawalsPerPayload) + wdRoot, err := ssz.WithdrawalSliceRoot([]*v1.Withdrawal{}, fieldparams.MaxWithdrawalsPerPayload) require.NoError(t, err) b.Block.Body.ExecutionPayloadHeader = &v1.ExecutionPayloadHeaderCapella{ ParentHash: make([]byte, fieldparams.RootLength), diff --git a/beacon-chain/state/fieldtrie/BUILD.bazel b/beacon-chain/state/fieldtrie/BUILD.bazel index 68d5c7146181..842cedb48e4c 100644 --- a/beacon-chain/state/fieldtrie/BUILD.bazel +++ b/beacon-chain/state/fieldtrie/BUILD.bazel @@ -12,7 +12,6 @@ go_library( "//beacon-chain/state/state-native/custom-types:go_default_library", "//beacon-chain/state/state-native/types:go_default_library", "//beacon-chain/state/stateutil:go_default_library", - "//crypto/hash:go_default_library", "//encoding/bytesutil:go_default_library", "//math:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/beacon-chain/state/fieldtrie/field_trie_helpers.go b/beacon-chain/state/fieldtrie/field_trie_helpers.go index 63c00f06b5ab..d13cb537aec2 100644 --- a/beacon-chain/state/fieldtrie/field_trie_helpers.go +++ b/beacon-chain/state/fieldtrie/field_trie_helpers.go @@ -9,7 +9,6 @@ import ( customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" pmath "github.com/prysmaticlabs/prysm/v3/math" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -212,9 +211,8 @@ func handleValidatorSlice(val []*ethpb.Validator, indices []uint64, convertAll b length = len(val) } roots := make([][32]byte, 0, length) - hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.Validator) error { - newRoot, err := stateutil.ValidatorRootWithHasher(hasher, input) + newRoot, err := stateutil.ValidatorRootWithHasher(input) if err != nil { return err } @@ -251,9 +249,8 @@ func handleEth1DataSlice(val []*ethpb.Eth1Data, indices []uint64, convertAll boo length = len(val) } roots := make([][32]byte, 0, length) - hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.Eth1Data) error { - newRoot, err := stateutil.Eth1DataRootWithHasher(hasher, input) + newRoot, err := stateutil.Eth1DataRootWithHasher(input) if err != nil { return err } @@ -290,9 +287,8 @@ func handlePendingAttestationSlice(val []*ethpb.PendingAttestation, indices []ui length = len(val) } roots := make([][32]byte, 0, length) - hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.PendingAttestation) error { - newRoot, err := stateutil.PendingAttRootWithHasher(hasher, input) + newRoot, err := stateutil.PendingAttRootWithHasher(input) if err != nil { return err } diff --git a/beacon-chain/state/state-native/hasher.go b/beacon-chain/state/state-native/hasher.go index 7707adc2146a..5e155257b3b5 100644 --- a/beacon-chain/state/state-native/hasher.go +++ b/beacon-chain/state/state-native/hasher.go @@ -9,7 +9,6 @@ import ( "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" "github.com/prysmaticlabs/prysm/v3/runtime/version" @@ -24,7 +23,6 @@ func ComputeFieldRootsWithHasher(ctx context.Context, state *BeaconState) ([][]b if state == nil { return nil, errors.New("nil state") } - hasher := hash.CustomSHA256Hasher() var fieldRoots [][]byte switch state.version { case version.Phase0: @@ -98,7 +96,7 @@ func ComputeFieldRootsWithHasher(ctx context.Context, state *BeaconState) ([][]b fieldRoots[types.HistoricalRoots.RealPosition()] = historicalRootsRt[:] // Eth1Data data structure root. - eth1HashTreeRoot, err := stateutil.Eth1Root(hasher, state.eth1Data) + eth1HashTreeRoot, err := stateutil.Eth1Root(state.eth1Data) if err != nil { return nil, errors.Wrap(err, "could not compute eth1data merkleization") } @@ -186,21 +184,21 @@ func ComputeFieldRootsWithHasher(ctx context.Context, state *BeaconState) ([][]b fieldRoots[types.JustificationBits.RealPosition()] = justifiedBitsRoot[:] // PreviousJustifiedCheckpoint data structure root. - prevCheckRoot, err := ssz.CheckpointRoot(hasher, state.previousJustifiedCheckpoint) + prevCheckRoot, err := ssz.CheckpointRoot(state.previousJustifiedCheckpoint) if err != nil { return nil, errors.Wrap(err, "could not compute previous justified checkpoint merkleization") } fieldRoots[types.PreviousJustifiedCheckpoint.RealPosition()] = prevCheckRoot[:] // CurrentJustifiedCheckpoint data structure root. - currJustRoot, err := ssz.CheckpointRoot(hasher, state.currentJustifiedCheckpoint) + currJustRoot, err := ssz.CheckpointRoot(state.currentJustifiedCheckpoint) if err != nil { return nil, errors.Wrap(err, "could not compute current justified checkpoint merkleization") } fieldRoots[types.CurrentJustifiedCheckpoint.RealPosition()] = currJustRoot[:] // FinalizedCheckpoint data structure root. - finalRoot, err := ssz.CheckpointRoot(hasher, state.finalizedCheckpoint) + finalRoot, err := ssz.CheckpointRoot(state.finalizedCheckpoint) if err != nil { return nil, errors.Wrap(err, "could not compute finalized checkpoint merkleization") } diff --git a/beacon-chain/state/state-native/state_trie.go b/beacon-chain/state/state-native/state_trie.go index c65b80cf1d38..088eeac04f33 100644 --- a/beacon-chain/state/state-native/state_trie.go +++ b/beacon-chain/state/state-native/state_trie.go @@ -14,7 +14,6 @@ import ( fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -694,7 +693,6 @@ func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) defer span.End() span.AddAttributes(trace.StringAttribute("field", field.String(b.version))) - hasher := hash.CustomSHA256Hasher() switch field { case types.GenesisTime: return ssz.Uint64Root(b.genesisTime), nil @@ -735,7 +733,7 @@ func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) } return ssz.ByteArrayRootWithLimit(hRoots, fieldparams.HistoricalRootsLength) case types.Eth1Data: - return stateutil.Eth1Root(hasher, b.eth1Data) + return stateutil.Eth1Root(b.eth1Data) case types.Eth1DataVotes: if b.rebuildTrie[field] { err := b.resetFieldTrie( @@ -817,11 +815,11 @@ func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) case types.JustificationBits: return bytesutil.ToBytes32(b.justificationBits), nil case types.PreviousJustifiedCheckpoint: - return ssz.CheckpointRoot(hasher, b.previousJustifiedCheckpoint) + return ssz.CheckpointRoot(b.previousJustifiedCheckpoint) case types.CurrentJustifiedCheckpoint: - return ssz.CheckpointRoot(hasher, b.currentJustifiedCheckpoint) + return ssz.CheckpointRoot(b.currentJustifiedCheckpoint) case types.FinalizedCheckpoint: - return ssz.CheckpointRoot(hasher, b.finalizedCheckpoint) + return ssz.CheckpointRoot(b.finalizedCheckpoint) case types.InactivityScores: return stateutil.Uint64ListRootWithRegistryLimit(b.inactivityScores) case types.CurrentSyncCommittee: diff --git a/beacon-chain/state/stateutil/BUILD.bazel b/beacon-chain/state/stateutil/BUILD.bazel index 317840a451ea..e237821984fb 100644 --- a/beacon-chain/state/stateutil/BUILD.bazel +++ b/beacon-chain/state/stateutil/BUILD.bazel @@ -33,7 +33,6 @@ go_library( ], deps = [ "//beacon-chain/core/transition/stateutils:go_default_library", - "//config/features:go_default_library", "//config/fieldparams:go_default_library", "//config/params:go_default_library", "//consensus-types/primitives:go_default_library", @@ -63,7 +62,6 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/state:go_default_library", - "//config/features:go_default_library", "//config/fieldparams:go_default_library", "//config/params:go_default_library", "//consensus-types/primitives:go_default_library", diff --git a/beacon-chain/state/stateutil/block_header_root.go b/beacon-chain/state/stateutil/block_header_root.go index 9181eab8896b..708f387c016d 100644 --- a/beacon-chain/state/stateutil/block_header_root.go +++ b/beacon-chain/state/stateutil/block_header_root.go @@ -3,7 +3,6 @@ package stateutil import ( "encoding/binary" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -30,5 +29,5 @@ func BlockHeaderRoot(header *ethpb.BeaconBlockHeader) ([32]byte, error) { bodyRoot := bytesutil.ToBytes32(header.BodyRoot) fieldRoots[4] = bodyRoot } - return ssz.BitwiseMerkleize(hash.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return ssz.BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } diff --git a/beacon-chain/state/stateutil/eth1_root.go b/beacon-chain/state/stateutil/eth1_root.go index eed3013bfa7d..2bd16677db97 100644 --- a/beacon-chain/state/stateutil/eth1_root.go +++ b/beacon-chain/state/stateutil/eth1_root.go @@ -6,14 +6,13 @@ import ( "github.com/pkg/errors" params "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" ) // Eth1DataRootWithHasher returns the hash tree root of input `eth1Data`. -func Eth1DataRootWithHasher(hasher ssz.HashFn, eth1Data *ethpb.Eth1Data) ([32]byte, error) { +func Eth1DataRootWithHasher(eth1Data *ethpb.Eth1Data) ([32]byte, error) { if eth1Data == nil { return [32]byte{}, errors.New("nil eth1 data") } @@ -33,7 +32,7 @@ func Eth1DataRootWithHasher(hasher ssz.HashFn, eth1Data *ethpb.Eth1Data) ([32]by if len(eth1Data.BlockHash) > 0 { fieldRoots[2] = bytesutil.ToBytes32(eth1Data.BlockHash) } - root, err := ssz.BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + root, err := ssz.BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) if err != nil { return [32]byte{}, err } @@ -42,22 +41,16 @@ func Eth1DataRootWithHasher(hasher ssz.HashFn, eth1Data *ethpb.Eth1Data) ([32]by // Eth1DatasRoot returns the hash tree root of input `eth1Datas`. func Eth1DatasRoot(eth1Datas []*ethpb.Eth1Data) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() eth1VotesRoots := make([][32]byte, 0, len(eth1Datas)) for i := 0; i < len(eth1Datas); i++ { - eth1, err := Eth1DataRootWithHasher(hasher, eth1Datas[i]) + eth1, err := Eth1DataRootWithHasher(eth1Datas[i]) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute eth1data merkleization") } eth1VotesRoots = append(eth1VotesRoots, eth1) } - eth1VotesRootsRoot, err := ssz.BitwiseMerkleize( - hasher, - eth1VotesRoots, - uint64(len(eth1VotesRoots)), - params.BeaconConfig().Eth1DataVotesLength(), - ) + eth1VotesRootsRoot, err := ssz.BitwiseMerkleize(eth1VotesRoots, uint64(len(eth1VotesRoots)), params.BeaconConfig().Eth1DataVotesLength()) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute eth1data votes merkleization") } diff --git a/beacon-chain/state/stateutil/field_root_attestation.go b/beacon-chain/state/stateutil/field_root_attestation.go index 6f9704a03f38..f47ff88b15bf 100644 --- a/beacon-chain/state/stateutil/field_root_attestation.go +++ b/beacon-chain/state/stateutil/field_root_attestation.go @@ -7,7 +7,6 @@ import ( "github.com/pkg/errors" params "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" ) @@ -24,22 +23,16 @@ func EpochAttestationsRoot(atts []*ethpb.PendingAttestation) ([32]byte, error) { return [32]byte{}, fmt.Errorf("epoch attestation exceeds max length %d", max) } - hasher := hash.CustomSHA256Hasher() roots := make([][32]byte, len(atts)) for i := 0; i < len(atts); i++ { - pendingRoot, err := pendingAttestationRoot(hasher, atts[i]) + pendingRoot, err := pendingAttestationRoot(atts[i]) if err != nil { return [32]byte{}, errors.Wrap(err, "could not attestation merkleization") } roots[i] = pendingRoot } - attsRootsRoot, err := ssz.BitwiseMerkleize( - hasher, - roots, - uint64(len(roots)), - params.BeaconConfig().CurrentEpochAttestationsLength(), - ) + attsRootsRoot, err := ssz.BitwiseMerkleize(roots, uint64(len(roots)), params.BeaconConfig().CurrentEpochAttestationsLength()) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute epoch attestations merkleization") } @@ -54,9 +47,9 @@ func EpochAttestationsRoot(atts []*ethpb.PendingAttestation) ([32]byte, error) { return res, nil } -func pendingAttestationRoot(hasher ssz.HashFn, att *ethpb.PendingAttestation) ([32]byte, error) { +func pendingAttestationRoot(att *ethpb.PendingAttestation) ([32]byte, error) { if att == nil { return [32]byte{}, errors.New("nil pending attestation") } - return PendingAttRootWithHasher(hasher, att) + return PendingAttRootWithHasher(att) } diff --git a/beacon-chain/state/stateutil/field_root_eth1.go b/beacon-chain/state/stateutil/field_root_eth1.go index 453e596bbb9d..15d3da0d7d75 100644 --- a/beacon-chain/state/stateutil/field_root_eth1.go +++ b/beacon-chain/state/stateutil/field_root_eth1.go @@ -2,18 +2,17 @@ package stateutil import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" ) // Eth1Root computes the HashTreeRoot Merkleization of // a BeaconBlockHeader struct according to the eth2 // Simple Serialize specification. -func Eth1Root(hasher ssz.HashFn, eth1Data *ethpb.Eth1Data) ([32]byte, error) { +func Eth1Root(eth1Data *ethpb.Eth1Data) ([32]byte, error) { if eth1Data == nil { return [32]byte{}, errors.New("nil eth1 data") } - return Eth1DataRootWithHasher(hasher, eth1Data) + return Eth1DataRootWithHasher(eth1Data) } // Eth1DataVotesRoot computes the HashTreeRoot Merkleization of diff --git a/beacon-chain/state/stateutil/field_root_validator.go b/beacon-chain/state/stateutil/field_root_validator.go index 4a0c0d08e737..c41fa8bdce29 100644 --- a/beacon-chain/state/stateutil/field_root_validator.go +++ b/beacon-chain/state/stateutil/field_root_validator.go @@ -5,9 +5,7 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -32,23 +30,12 @@ func ValidatorRegistryRoot(vals []*ethpb.Validator) ([32]byte, error) { } func validatorRegistryRoot(validators []*ethpb.Validator) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() - - var err error - var roots [][32]byte - if features.Get().EnableVectorizedHTR { - roots, err = optimizedValidatorRoots(validators) - if err != nil { - return [32]byte{}, err - } - } else { - roots, err = validatorRoots(hasher, validators) - if err != nil { - return [32]byte{}, err - } + roots, err := optimizedValidatorRoots(validators) + if err != nil { + return [32]byte{}, err } - validatorsRootsRoot, err := ssz.BitwiseMerkleize(hasher, roots, uint64(len(roots)), fieldparams.ValidatorRegistryLimit) + validatorsRootsRoot, err := ssz.BitwiseMerkleize(roots, uint64(len(roots)), fieldparams.ValidatorRegistryLimit) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute validator registry merkleization") } @@ -64,27 +51,14 @@ func validatorRegistryRoot(validators []*ethpb.Validator) ([32]byte, error) { return res, nil } -func validatorRoots(hasher func([]byte) [32]byte, validators []*ethpb.Validator) ([][32]byte, error) { - roots := make([][32]byte, len(validators)) - for i := 0; i < len(validators); i++ { - val, err := validatorRoot(hasher, validators[i]) - if err != nil { - return [][32]byte{}, errors.Wrap(err, "could not compute validators merkleization") - } - roots[i] = val - } - return roots, nil -} - func optimizedValidatorRoots(validators []*ethpb.Validator) ([][32]byte, error) { // Exit early if no validators are provided. if len(validators) == 0 { return [][32]byte{}, nil } roots := make([][32]byte, 0, len(validators)*validatorFieldRoots) - hasher := hash.CustomSHA256Hasher() for i := 0; i < len(validators); i++ { - fRoots, err := ValidatorFieldRoots(hasher, validators[i]) + fRoots, err := ValidatorFieldRoots(validators[i]) if err != nil { return [][32]byte{}, errors.Wrap(err, "could not compute validators merkleization") } @@ -103,10 +77,3 @@ func optimizedValidatorRoots(validators []*ethpb.Validator) ([][32]byte, error) } return roots, nil } - -func validatorRoot(hasher ssz.HashFn, validator *ethpb.Validator) ([32]byte, error) { - if validator == nil { - return [32]byte{}, errors.New("nil validator") - } - return ValidatorRootWithHasher(hasher, validator) -} diff --git a/beacon-chain/state/stateutil/field_root_vector.go b/beacon-chain/state/stateutil/field_root_vector.go index 58e1cd18920b..538d6f0b857a 100644 --- a/beacon-chain/state/stateutil/field_root_vector.go +++ b/beacon-chain/state/stateutil/field_root_vector.go @@ -2,18 +2,15 @@ package stateutil import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ) func ArraysRoot(input [][]byte, length uint64) ([32]byte, error) { - hashFunc := hash.CustomSHA256Hasher() - leaves := make([][32]byte, length) for i, chunk := range input { copy(leaves[i][:], chunk) } - res, err := merkleize(leaves, length, hashFunc) + res, err := merkleize(leaves, length) if err != nil { return [32]byte{}, err } @@ -21,8 +18,7 @@ func ArraysRoot(input [][]byte, length uint64) ([32]byte, error) { return res, nil } -func merkleize(leaves [][32]byte, length uint64, - hasher func([]byte) [32]byte) ([32]byte, error) { +func merkleize(leaves [][32]byte, length uint64) ([32]byte, error) { if len(leaves) == 0 { return [32]byte{}, errors.New("zero leaves provided") } @@ -33,7 +29,7 @@ func merkleize(leaves [][32]byte, length uint64, layers := make([][][32]byte, ssz.Depth(length)+1) layers[0] = hashLayer var err error - _, hashLayer, err = MerkleizeTrieLeaves(layers, hashLayer, hasher) + _, hashLayer, err = MerkleizeTrieLeaves(layers, hashLayer) if err != nil { return [32]byte{}, err } diff --git a/beacon-chain/state/stateutil/historical_summaries_root.go b/beacon-chain/state/stateutil/historical_summaries_root.go index 2934d030f538..666b45d73467 100644 --- a/beacon-chain/state/stateutil/historical_summaries_root.go +++ b/beacon-chain/state/stateutil/historical_summaries_root.go @@ -7,7 +7,6 @@ import ( "github.com/pkg/errors" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" ) @@ -18,7 +17,6 @@ func HistoricalSummariesRoot(summaries []*ethpb.HistoricalSummary) ([32]byte, er return [32]byte{}, fmt.Errorf("historical summary exceeds max length %d", max) } - hasher := hash.CustomSHA256Hasher() roots := make([][32]byte, len(summaries)) for i := 0; i < len(summaries); i++ { r, err := summaries[i].HashTreeRoot() @@ -28,12 +26,7 @@ func HistoricalSummariesRoot(summaries []*ethpb.HistoricalSummary) ([32]byte, er roots[i] = r } - summariesRoot, err := ssz.BitwiseMerkleize( - hasher, - roots, - uint64(len(roots)), - fieldparams.HistoricalRootsLength, - ) + summariesRoot, err := ssz.BitwiseMerkleize(roots, uint64(len(roots)), fieldparams.HistoricalRootsLength) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute historical summaries merkleization") } diff --git a/beacon-chain/state/stateutil/participation_bit_root.go b/beacon-chain/state/stateutil/participation_bit_root.go index 2b38f41d0a3d..ccf15b357c93 100644 --- a/beacon-chain/state/stateutil/participation_bit_root.go +++ b/beacon-chain/state/stateutil/participation_bit_root.go @@ -5,14 +5,12 @@ import ( "github.com/pkg/errors" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ) // ParticipationBitsRoot computes the HashTreeRoot merkleization of // participation roots. func ParticipationBitsRoot(bits []byte) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() chunkedRoots, err := packParticipationBits(bits) if err != nil { return [32]byte{}, err @@ -20,7 +18,7 @@ func ParticipationBitsRoot(bits []byte) ([32]byte, error) { limit := (uint64(fieldparams.ValidatorRegistryLimit + 31)) / 32 - bytesRoot, err := ssz.BitwiseMerkleize(hasher, chunkedRoots, uint64(len(chunkedRoots)), limit) + bytesRoot, err := ssz.BitwiseMerkleize(chunkedRoots, uint64(len(chunkedRoots)), limit) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute merkleization") } diff --git a/beacon-chain/state/stateutil/pending_attestation_root.go b/beacon-chain/state/stateutil/pending_attestation_root.go index 48d7bf6aea0f..4a20c0b18335 100644 --- a/beacon-chain/state/stateutil/pending_attestation_root.go +++ b/beacon-chain/state/stateutil/pending_attestation_root.go @@ -12,16 +12,16 @@ import ( // PendingAttRootWithHasher describes a method from which the hash tree root // of a pending attestation is returned. -func PendingAttRootWithHasher(hasher ssz.HashFn, att *ethpb.PendingAttestation) ([32]byte, error) { +func PendingAttRootWithHasher(att *ethpb.PendingAttestation) ([32]byte, error) { var fieldRoots [][32]byte // Bitfield. - aggregationRoot, err := ssz.BitlistRoot(hasher, att.AggregationBits, params.BeaconConfig().MaxValidatorsPerCommittee) + aggregationRoot, err := ssz.BitlistRoot(att.AggregationBits, params.BeaconConfig().MaxValidatorsPerCommittee) if err != nil { return [32]byte{}, err } // Attestation data. - attDataRoot, err := attDataRootWithHasher(hasher, att.Data) + attDataRoot, err := attDataRootWithHasher(att.Data) if err != nil { return [32]byte{}, err } @@ -37,10 +37,10 @@ func PendingAttRootWithHasher(hasher ssz.HashFn, att *ethpb.PendingAttestation) fieldRoots = [][32]byte{aggregationRoot, attDataRoot, inclusionRoot, proposerRoot} - return ssz.BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return ssz.BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } -func attDataRootWithHasher(hasher ssz.HashFn, data *ethpb.AttestationData) ([32]byte, error) { +func attDataRootWithHasher(data *ethpb.AttestationData) ([32]byte, error) { fieldRoots := make([][32]byte, 5) if data != nil { @@ -58,18 +58,18 @@ func attDataRootWithHasher(hasher ssz.HashFn, data *ethpb.AttestationData) ([32] fieldRoots[2] = bytesutil.ToBytes32(data.BeaconBlockRoot) // Source - sourceRoot, err := ssz.CheckpointRoot(hasher, data.Source) + sourceRoot, err := ssz.CheckpointRoot(data.Source) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute source checkpoint merkleization") } fieldRoots[3] = sourceRoot // Target - fieldRoots[4], err = ssz.CheckpointRoot(hasher, data.Target) + fieldRoots[4], err = ssz.CheckpointRoot(data.Target) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute target checkpoint merkleization") } } - return ssz.BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return ssz.BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } diff --git a/beacon-chain/state/stateutil/sync_committee.root.go b/beacon-chain/state/stateutil/sync_committee.root.go index 037cf00840d4..9031f5e16da3 100644 --- a/beacon-chain/state/stateutil/sync_committee.root.go +++ b/beacon-chain/state/stateutil/sync_committee.root.go @@ -1,8 +1,7 @@ package stateutil import ( - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" + "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -12,7 +11,6 @@ import ( // a SyncCommitteeRoot struct according to the eth2 // Simple Serialize specification. func SyncCommitteeRoot(committee *ethpb.SyncCommittee) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() var fieldRoots [][32]byte if committee == nil { return [32]byte{}, nil @@ -21,42 +19,37 @@ func SyncCommitteeRoot(committee *ethpb.SyncCommittee) ([32]byte, error) { // Field 1: Vector[BLSPubkey, SYNC_COMMITTEE_SIZE] pubKeyRoots := make([][32]byte, 0) for _, pubkey := range committee.Pubkeys { - r, err := merkleizePubkey(hasher, pubkey) + r, err := merkleizePubkey(pubkey) if err != nil { return [32]byte{}, err } pubKeyRoots = append(pubKeyRoots, r) } - pubkeyRoot, err := ssz.BitwiseMerkleize(hasher, pubKeyRoots, uint64(len(pubKeyRoots)), uint64(len(pubKeyRoots))) + pubkeyRoot, err := ssz.BitwiseMerkleize(pubKeyRoots, uint64(len(pubKeyRoots)), uint64(len(pubKeyRoots))) if err != nil { return [32]byte{}, err } // Field 2: BLSPubkey - aggregateKeyRoot, err := merkleizePubkey(hasher, committee.AggregatePubkey) + aggregateKeyRoot, err := merkleizePubkey(committee.AggregatePubkey) if err != nil { return [32]byte{}, err } fieldRoots = [][32]byte{pubkeyRoot, aggregateKeyRoot} - return ssz.BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return ssz.BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } -func merkleizePubkey(hasher ssz.HashFn, pubkey []byte) ([32]byte, error) { +func merkleizePubkey(pubkey []byte) ([32]byte, error) { + if len(pubkey) == 0 { + return [32]byte{}, errors.New("zero length pubkey provided") + } chunks, err := ssz.PackByChunk([][]byte{pubkey}) if err != nil { return [32]byte{}, err } - var pubKeyRoot [32]byte - if features.Get().EnableVectorizedHTR { - outputChunk := make([][32]byte, 1) - htr.VectorizedSha256(chunks, outputChunk) - pubKeyRoot = outputChunk[0] - } else { - pubKeyRoot, err = ssz.BitwiseMerkleize(hasher, chunks, uint64(len(chunks)), uint64(len(chunks))) - if err != nil { - return [32]byte{}, err - } - } - return pubKeyRoot, nil + outputChunk := make([][32]byte, 1) + htr.VectorizedSha256(chunks, outputChunk) + + return outputChunk[0], nil } diff --git a/beacon-chain/state/stateutil/trie_helpers.go b/beacon-chain/state/stateutil/trie_helpers.go index db3f97511390..416624cb6fa7 100644 --- a/beacon-chain/state/stateutil/trie_helpers.go +++ b/beacon-chain/state/stateutil/trie_helpers.go @@ -5,7 +5,6 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/container/trie" "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" @@ -17,7 +16,6 @@ import ( // provided with the elements of a fixed sized trie and the corresponding depth of // it. func ReturnTrieLayer(elements [][32]byte, length uint64) ([][]*[32]byte, error) { - hasher := hash.CustomSHA256Hasher() leaves := elements if len(leaves) == 1 { @@ -27,7 +25,7 @@ func ReturnTrieLayer(elements [][32]byte, length uint64) ([][]*[32]byte, error) layers := make([][][32]byte, ssz.Depth(length)+1) layers[0] = hashLayer var err error - layers, _, err = MerkleizeTrieLeaves(layers, hashLayer, hasher) + layers, _, err = MerkleizeTrieLeaves(layers, hashLayer) if err != nil { return nil, err } @@ -46,7 +44,6 @@ func ReturnTrieLayer(elements [][32]byte, length uint64) ([][]*[32]byte, error) // provided with the elements of a variable sized trie and the corresponding depth of // it. func ReturnTrieLayerVariable(elements [][32]byte, length uint64) [][]*[32]byte { - hasher := hash.CustomSHA256Hasher() depth := ssz.Depth(length) layers := make([][]*[32]byte, depth+1) // Return zerohash at depth @@ -67,38 +64,18 @@ func ReturnTrieLayerVariable(elements [][32]byte, length uint64) [][]*[32]byte { for i := uint8(0); i < depth; i++ { layerLen := len(layers[i]) oddNodeLength := layerLen%2 == 1 - if features.Get().EnableVectorizedHTR { - if oddNodeLength { - zerohash := trie.ZeroHashes[i] - elements = append(elements, zerohash) - layerLen++ - } + if oddNodeLength { + zerohash := trie.ZeroHashes[i] + elements = append(elements, zerohash) + layerLen++ + } - layers[i+1] = make([]*[32]byte, layerLen/2) - newElems := make([][32]byte, layerLen/2) - htr.VectorizedSha256(elements, newElems) - elements = newElems - for j := range elements { - layers[i+1][j] = &elements[j] - } - } else { - if oddNodeLength { - zerohash := trie.ZeroHashes[i] - layers[i] = append(layers[i], &zerohash) - } - updatedValues := make([]*[32]byte, 0, len(layers[i])/2) - for j := 0; j < len(layers[i]); j += 2 { - buffer.Write(layers[i][j][:]) - buffer.Write(layers[i][j+1][:]) - concat := hasher(buffer.Bytes()) - updatedValues = append(updatedValues, &concat) - buffer.Reset() - } - // remove zerohash node from tree - if oddNodeLength { - layers[i] = layers[i][:len(layers[i])-1] - } - layers[i+1] = updatedValues + layers[i+1] = make([]*[32]byte, layerLen/2) + newElems := make([][32]byte, layerLen/2) + htr.VectorizedSha256(elements, newElems) + elements = newElems + for j := range elements { + layers[i+1][j] = &elements[j] } } return layers @@ -305,8 +282,7 @@ func Merkleize(leaves [][]byte) [][][]byte { } // MerkleizeTrieLeaves merkleize the trie leaves. -func MerkleizeTrieLeaves(layers [][][32]byte, hashLayer [][32]byte, - hasher func([]byte) [32]byte) ([][][32]byte, [][32]byte, error) { +func MerkleizeTrieLeaves(layers [][][32]byte, hashLayer [][32]byte) ([][][32]byte, [][32]byte, error) { // We keep track of the hash layers of a Merkle trie until we reach // the top layer of length 1, which contains the single root element. // [Root] -> Top layer has length 1. @@ -319,21 +295,9 @@ func MerkleizeTrieLeaves(layers [][][32]byte, hashLayer [][32]byte, if !math.IsPowerOf2(uint64(len(hashLayer))) { return nil, nil, errors.Errorf("hash layer is a non power of 2: %d", len(hashLayer)) } - if features.Get().EnableVectorizedHTR { - newLayer := make([][32]byte, len(hashLayer)/2) - htr.VectorizedSha256(hashLayer, newLayer) - hashLayer = newLayer - } else { - layer := make([][32]byte, len(hashLayer)/2) - for j := 0; j < len(hashLayer); j += 2 { - chunkBuffer.Write(hashLayer[j][:]) - chunkBuffer.Write(hashLayer[j+1][:]) - hashedChunk := hasher(chunkBuffer.Bytes()) - layer[j/2] = hashedChunk - chunkBuffer.Reset() - } - hashLayer = layer - } + newLayer := make([][32]byte, len(hashLayer)/2) + htr.VectorizedSha256(hashLayer, newLayer) + hashLayer = newLayer layers[i] = hashLayer i++ } diff --git a/beacon-chain/state/stateutil/trie_helpers_test.go b/beacon-chain/state/stateutil/trie_helpers_test.go index 7414b8327d56..50aac7348194 100644 --- a/beacon-chain/state/stateutil/trie_helpers_test.go +++ b/beacon-chain/state/stateutil/trie_helpers_test.go @@ -5,10 +5,8 @@ import ( "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/v3/testing/assert" @@ -26,11 +24,6 @@ func TestReturnTrieLayer_OK(t *testing.T) { newRoot := *layers[len(layers)-1][0] assert.Equal(t, root, newRoot) - flags := &features.Flags{} - flags.EnableVectorizedHTR = true - reset := features.InitWithReset(flags) - defer reset() - layers, err = stateutil.ReturnTrieLayer(roots, uint64(len(roots))) assert.NoError(t, err) lastRoot := *layers[len(layers)-1][0] @@ -53,11 +46,6 @@ func BenchmarkReturnTrieLayer_NormalAlgorithm(b *testing.B) { } func BenchmarkReturnTrieLayer_VectorizedAlgorithm(b *testing.B) { - flags := &features.Flags{} - flags.EnableVectorizedHTR = true - reset := features.InitWithReset(flags) - defer reset() - newState, _ := util.DeterministicGenesisState(b, 32) root, err := stateutil.RootsArrayHashTreeRoot(newState.BlockRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot)) require.NoError(b, err) @@ -76,11 +64,10 @@ func TestReturnTrieLayerVariable_OK(t *testing.T) { newState, _ := util.DeterministicGenesisState(t, 32) root, err := stateutil.ValidatorRegistryRoot(newState.Validators()) require.NoError(t, err) - hasher := hash.CustomSHA256Hasher() validators := newState.Validators() roots := make([][32]byte, 0, len(validators)) for _, val := range validators { - rt, err := stateutil.ValidatorRootWithHasher(hasher, val) + rt, err := stateutil.ValidatorRootWithHasher(val) require.NoError(t, err) roots = append(roots, rt) } @@ -90,11 +77,6 @@ func TestReturnTrieLayerVariable_OK(t *testing.T) { require.NoError(t, err) assert.Equal(t, root, newRoot) - flags := &features.Flags{} - flags.EnableVectorizedHTR = true - reset := features.InitWithReset(flags) - defer reset() - layers = stateutil.ReturnTrieLayerVariable(roots, params.BeaconConfig().ValidatorRegistryLimit) lastRoot := *layers[len(layers)-1][0] lastRoot, err = stateutil.AddInMixin(lastRoot, uint64(len(validators))) @@ -107,11 +89,10 @@ func BenchmarkReturnTrieLayerVariable_NormalAlgorithm(b *testing.B) { newState, _ := util.DeterministicGenesisState(b, 16000) root, err := stateutil.ValidatorRegistryRoot(newState.Validators()) require.NoError(b, err) - hasher := hash.CustomSHA256Hasher() validators := newState.Validators() roots := make([][32]byte, 0, len(validators)) for _, val := range validators { - rt, err := stateutil.ValidatorRootWithHasher(hasher, val) + rt, err := stateutil.ValidatorRootWithHasher(val) require.NoError(b, err) roots = append(roots, rt) } @@ -126,19 +107,14 @@ func BenchmarkReturnTrieLayerVariable_NormalAlgorithm(b *testing.B) { } func BenchmarkReturnTrieLayerVariable_VectorizedAlgorithm(b *testing.B) { - flags := &features.Flags{} - flags.EnableVectorizedHTR = true - reset := features.InitWithReset(flags) - defer reset() newState, _ := util.DeterministicGenesisState(b, 16000) root, err := stateutil.ValidatorRegistryRoot(newState.Validators()) require.NoError(b, err) - hasher := hash.CustomSHA256Hasher() validators := newState.Validators() roots := make([][32]byte, 0, len(validators)) for _, val := range validators { - rt, err := stateutil.ValidatorRootWithHasher(hasher, val) + rt, err := stateutil.ValidatorRootWithHasher(val) require.NoError(b, err) roots = append(roots, rt) } @@ -174,10 +150,9 @@ func TestRecomputeFromLayer_FixedSizedArray(t *testing.T) { func TestRecomputeFromLayer_VariableSizedArray(t *testing.T) { newState, _ := util.DeterministicGenesisState(t, 32) validators := newState.Validators() - hasher := hash.CustomSHA256Hasher() roots := make([][32]byte, 0, len(validators)) for _, val := range validators { - rt, err := stateutil.ValidatorRootWithHasher(hasher, val) + rt, err := stateutil.ValidatorRootWithHasher(val) require.NoError(t, err) roots = append(roots, rt) } @@ -202,7 +177,7 @@ func TestRecomputeFromLayer_VariableSizedArray(t *testing.T) { require.NoError(t, err) roots = make([][32]byte, 0, len(changedVals)) for _, val := range changedVals { - rt, err := stateutil.ValidatorRootWithHasher(hasher, val) + rt, err := stateutil.ValidatorRootWithHasher(val) require.NoError(t, err) roots = append(roots, rt) } @@ -216,9 +191,7 @@ func TestRecomputeFromLayer_VariableSizedArray(t *testing.T) { func TestMerkleizeTrieLeaves_BadHashLayer(t *testing.T) { hashLayer := make([][32]byte, 12) layers := make([][][32]byte, 20) - _, _, err := stateutil.MerkleizeTrieLeaves(layers, hashLayer, func(bytes []byte) [32]byte { - return [32]byte{} - }) + _, _, err := stateutil.MerkleizeTrieLeaves(layers, hashLayer) assert.ErrorContains(t, "hash layer is a non power of 2", err) } diff --git a/beacon-chain/state/stateutil/validator_root.go b/beacon-chain/state/stateutil/validator_root.go index 439f39b6a8f1..e11050562015 100644 --- a/beacon-chain/state/stateutil/validator_root.go +++ b/beacon-chain/state/stateutil/validator_root.go @@ -5,7 +5,6 @@ import ( "github.com/pkg/errors" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -13,17 +12,17 @@ import ( // ValidatorRootWithHasher describes a method from which the hash tree root // of a validator is returned. -func ValidatorRootWithHasher(hasher ssz.HashFn, validator *ethpb.Validator) ([32]byte, error) { - fieldRoots, err := ValidatorFieldRoots(hasher, validator) +func ValidatorRootWithHasher(validator *ethpb.Validator) ([32]byte, error) { + fieldRoots, err := ValidatorFieldRoots(validator) if err != nil { return [32]byte{}, err } - return ssz.BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return ssz.BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } // ValidatorFieldRoots describes a method from which the hash tree root // of a validator is returned. -func ValidatorFieldRoots(hasher ssz.HashFn, validator *ethpb.Validator) ([][32]byte, error) { +func ValidatorFieldRoots(validator *ethpb.Validator) ([][32]byte, error) { var fieldRoots [][32]byte if validator != nil { pubkey := bytesutil.ToBytes48(validator.PublicKey) @@ -50,7 +49,7 @@ func ValidatorFieldRoots(hasher ssz.HashFn, validator *ethpb.Validator) ([][32]b binary.LittleEndian.PutUint64(withdrawalBuf[:8], uint64(validator.WithdrawableEpoch)) // Public key. - pubKeyRoot, err := merkleizePubkey(hasher, pubkey[:]) + pubKeyRoot, err := merkleizePubkey(pubkey[:]) if err != nil { return [][32]byte{}, err } @@ -63,12 +62,11 @@ func ValidatorFieldRoots(hasher ssz.HashFn, validator *ethpb.Validator) ([][32]b // Uint64ListRootWithRegistryLimit computes the HashTreeRoot Merkleization of // a list of uint64 and mixed with registry limit. func Uint64ListRootWithRegistryLimit(balances []uint64) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() balancesChunks, err := PackUint64IntoChunks(balances) if err != nil { return [32]byte{}, errors.Wrap(err, "could not pack balances into chunks") } - balancesRootsRoot, err := ssz.BitwiseMerkleize(hasher, balancesChunks, uint64(len(balancesChunks)), ValidatorLimitForBalancesChunks()) + balancesRootsRoot, err := ssz.BitwiseMerkleize(balancesChunks, uint64(len(balancesChunks)), ValidatorLimitForBalancesChunks()) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute balances merkleization") } diff --git a/config/features/BUILD.bazel b/config/features/BUILD.bazel index 7e5624de90c8..4273542f4277 100644 --- a/config/features/BUILD.bazel +++ b/config/features/BUILD.bazel @@ -13,7 +13,6 @@ go_library( deps = [ "//cmd:go_default_library", "//config/params:go_default_library", - "@com_github_prysmaticlabs_gohashtree//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", ], diff --git a/config/features/config.go b/config/features/config.go index 42adc1a37c84..952c760f8ba1 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -20,13 +20,9 @@ The process for implementing new features using this package is as follows: package features import ( - "os" - "os/signal" "sync" - "syscall" "time" - "github.com/prysmaticlabs/gohashtree" "github.com/prysmaticlabs/prysm/v3/cmd" "github.com/prysmaticlabs/prysm/v3/config/params" "github.com/sirupsen/logrus" @@ -61,7 +57,6 @@ type Flags struct { EnableSlasher bool // Enable slasher in the beacon node runtime. EnableSlashingProtectionPruning bool // EnableSlashingProtectionPruning for the validator client. - EnableVectorizedHTR bool // EnableVectorizedHTR specifies whether the beacon state will use the optimized sha256 routines. EnableBatchGossipAggregation bool // EnableBatchGossipAggregation specifies whether to further aggregate our gossip batches before verifying them. SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database. EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup. @@ -192,26 +187,6 @@ func ConfigureBeaconChain(ctx *cli.Context) error { logEnabled(disableStakinContractCheck) cfg.DisableStakinContractCheck = true } - if ctx.Bool(disableVecHTR.Name) { - logEnabled(disableVecHTR) - } else { - sigc := make(chan os.Signal, 1) - signal.Notify(sigc, syscall.SIGILL) - defer signal.Stop(sigc) - buffer := make([][32]byte, 2) - err := gohashtree.Hash(buffer, buffer) - if err != nil { - log.Error("could not test if gohashtree is supported") - } else { - t := time.NewTimer(time.Millisecond * 100) - select { - case <-sigc: - log.Error("gohashtree is not supported in this CPU") - case <-t.C: - cfg.EnableVectorizedHTR = true - } - } - } cfg.EnableBatchGossipAggregation = true if ctx.Bool(disableGossipBatchAggregation.Name) { logDisabled(disableGossipBatchAggregation) diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go index 9cc732791ad2..c64960d19b7b 100644 --- a/config/features/deprecated_flags.go +++ b/config/features/deprecated_flags.go @@ -17,6 +17,11 @@ var ( Usage: deprecatedUsage, Hidden: true, } + deprecatedDisableVecHTR = &cli.BoolFlag{ + Name: "disable-vectorized-htr", + Usage: deprecatedUsage, + Hidden: true, + } deprecatedEnableReorgLateBlocks = &cli.BoolFlag{ Name: "enable-reorg-late-blocks", Usage: deprecatedUsage, @@ -28,6 +33,7 @@ var ( var deprecatedFlags = []cli.Flag{ exampleDeprecatedFeatureFlag, deprecatedDisablePeerScorer, + deprecatedDisableVecHTR, deprecatedEnableReorgLateBlocks, } diff --git a/config/features/flags.go b/config/features/flags.go index f4da4eb6f3f1..f4bd0b49c1aa 100644 --- a/config/features/flags.go +++ b/config/features/flags.go @@ -88,10 +88,6 @@ var ( " (Warning): Once enabled, this feature migrates your database in to a new schema and " + "there is no going back. At worst, your entire database might get corrupted.", } - disableVecHTR = &cli.BoolFlag{ - Name: "disable-vectorized-htr", - Usage: "Disables the new go sha256 library which utilizes optimized routines for merkle trees", - } disableGossipBatchAggregation = &cli.BoolFlag{ Name: "disable-gossip-batch-aggregation", Usage: "Disables new methods to further aggregate our gossip batches before verifying them.", @@ -158,7 +154,6 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c enableSlasherFlag, enableHistoricalSpaceRepresentation, disableStakinContractCheck, - disableVecHTR, disableReorgLateBlocks, disableGossipBatchAggregation, SaveFullExecutionPayloads, diff --git a/consensus-types/blocks/BUILD.bazel b/consensus-types/blocks/BUILD.bazel index 15d3e9e1ffae..be78583c0eb2 100644 --- a/consensus-types/blocks/BUILD.bazel +++ b/consensus-types/blocks/BUILD.bazel @@ -16,7 +16,6 @@ go_library( "//config/fieldparams:go_default_library", "//consensus-types/interfaces:go_default_library", "//consensus-types/primitives:go_default_library", - "//crypto/hash:go_default_library", "//encoding/bytesutil:go_default_library", "//encoding/ssz:go_default_library", "//proto/engine/v1:go_default_library", diff --git a/consensus-types/blocks/execution.go b/consensus-types/blocks/execution.go index a4c49b4323f4..dcd2683f6f80 100644 --- a/consensus-types/blocks/execution.go +++ b/consensus-types/blocks/execution.go @@ -8,7 +8,6 @@ import ( fastssz "github.com/prysmaticlabs/fastssz" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" @@ -703,7 +702,7 @@ func PayloadToHeaderCapella(payload interfaces.ExecutionData) (*enginev1.Executi if err != nil { return nil, err } - withdrawalsRoot, err := ssz.WithdrawalSliceRoot(hash.CustomSHA256Hasher(), withdrawals, fieldparams.MaxWithdrawalsPerPayload) + withdrawalsRoot, err := ssz.WithdrawalSliceRoot(withdrawals, fieldparams.MaxWithdrawalsPerPayload) if err != nil { return nil, err } diff --git a/encoding/ssz/BUILD.bazel b/encoding/ssz/BUILD.bazel index 5463e11ec55b..62e9e8701b40 100644 --- a/encoding/ssz/BUILD.bazel +++ b/encoding/ssz/BUILD.bazel @@ -11,10 +11,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/v3/encoding/ssz", visibility = ["//visibility:public"], deps = [ - "//config/features:go_default_library", "//config/fieldparams:go_default_library", "//container/trie:go_default_library", - "//crypto/hash:go_default_library", "//crypto/hash/htr:go_default_library", "//encoding/bytesutil:go_default_library", "//proto/engine/v1:go_default_library", diff --git a/encoding/ssz/helpers.go b/encoding/ssz/helpers.go index d623bff58526..5ee9da6fd5f6 100644 --- a/encoding/ssz/helpers.go +++ b/encoding/ssz/helpers.go @@ -8,18 +8,17 @@ import ( "github.com/minio/sha256-simd" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" ) const bytesPerChunk = 32 // BitlistRoot returns the mix in length of a bitwise Merkleized bitfield. -func BitlistRoot(hasher HashFn, bfield bitfield.Bitfield, maxCapacity uint64) ([32]byte, error) { +func BitlistRoot(bfield bitfield.Bitfield, maxCapacity uint64) ([32]byte, error) { limit := (maxCapacity + 255) / 256 if bfield == nil || bfield.Len() == 0 { length := make([]byte, 32) - root, err := BitwiseMerkleize(hasher, [][32]byte{}, 0, limit) + root, err := BitwiseMerkleize([][32]byte{}, 0, limit) if err != nil { return [32]byte{}, err } @@ -35,7 +34,7 @@ func BitlistRoot(hasher HashFn, bfield bitfield.Bitfield, maxCapacity uint64) ([ } output := make([]byte, 32) copy(output, buf.Bytes()) - root, err := BitwiseMerkleize(hasher, chunks, uint64(len(chunks)), limit) + root, err := BitwiseMerkleize(chunks, uint64(len(chunks)), limit) if err != nil { return [32]byte{}, err } @@ -47,18 +46,11 @@ func BitlistRoot(hasher HashFn, bfield bitfield.Bitfield, maxCapacity uint64) ([ // and return the root. // Note that merkleize on a single chunk is simply that chunk, i.e. the identity // when the number of chunks is one. -func BitwiseMerkleize(hasher HashFn, chunks [][32]byte, count, limit uint64) ([32]byte, error) { +func BitwiseMerkleize(chunks [][32]byte, count, limit uint64) ([32]byte, error) { if count > limit { return [32]byte{}, errors.New("merkleizing list that is too large, over limit") } - if features.Get().EnableVectorizedHTR { - return MerkleizeVector(chunks, limit), nil - } - hashFn := NewHasherFunc(hasher) - leafIndexer := func(i uint64) []byte { - return chunks[i][:] - } - return Merkleize(hashFn, count, limit, leafIndexer), nil + return MerkleizeVector(chunks, limit), nil } // PackByChunk a given byte array's final chunk with zeroes if needed. diff --git a/encoding/ssz/helpers_test.go b/encoding/ssz/helpers_test.go index e64aac203c45..9a8dad2e0666 100644 --- a/encoding/ssz/helpers_test.go +++ b/encoding/ssz/helpers_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" "github.com/prysmaticlabs/prysm/v3/testing/assert" "github.com/prysmaticlabs/prysm/v3/testing/require" @@ -13,18 +12,16 @@ import ( const merkleizingListLimitError = "merkleizing list that is too large, over limit" func TestBitlistRoot(t *testing.T) { - hasher := hash.CustomSHA256Hasher() capacity := uint64(10) bfield := bitfield.NewBitlist(capacity) expected := [32]byte{176, 76, 194, 203, 142, 166, 117, 79, 148, 194, 231, 64, 60, 245, 142, 32, 201, 2, 58, 152, 53, 12, 132, 40, 41, 102, 224, 189, 103, 41, 211, 202} - result, err := ssz.BitlistRoot(hasher, bfield, capacity) + result, err := ssz.BitlistRoot(bfield, capacity) require.NoError(t, err) assert.Equal(t, expected, result) } func TestBitwiseMerkleizeOverLimit(t *testing.T) { - hasher := hash.CustomSHA256Hasher() chunks := [][32]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, {11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, @@ -32,12 +29,11 @@ func TestBitwiseMerkleizeOverLimit(t *testing.T) { count := uint64(2) limit := uint64(1) - _, err := ssz.BitwiseMerkleize(hasher, chunks, count, limit) + _, err := ssz.BitwiseMerkleize(chunks, count, limit) assert.ErrorContains(t, merkleizingListLimitError, err) } func TestBitwiseMerkleizeArrays(t *testing.T) { - hasher := hash.CustomSHA256Hasher() chunks := [][32]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}, {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 62, 62, 63, 64}, @@ -46,7 +42,7 @@ func TestBitwiseMerkleizeArrays(t *testing.T) { limit := uint64(2) expected := [32]byte{138, 81, 210, 194, 151, 231, 249, 241, 64, 118, 209, 58, 145, 109, 225, 89, 118, 110, 159, 220, 193, 183, 203, 124, 166, 24, 65, 26, 160, 215, 233, 219} - result, err := ssz.BitwiseMerkleize(hasher, chunks, count, limit) + result, err := ssz.BitwiseMerkleize(chunks, count, limit) require.NoError(t, err) assert.Equal(t, expected, result) @@ -58,13 +54,12 @@ func TestBitwiseMerkleizeArrays(t *testing.T) { limit = uint64(2) expected = [32]byte{194, 32, 213, 52, 220, 127, 18, 240, 43, 151, 19, 79, 188, 175, 142, 177, 208, 46, 96, 20, 18, 231, 208, 29, 120, 102, 122, 17, 46, 31, 155, 30} - result, err = ssz.BitwiseMerkleize(hasher, chunks, count, limit) + result, err = ssz.BitwiseMerkleize(chunks, count, limit) require.NoError(t, err) assert.Equal(t, expected, result) } func TestBitwiseMerkleizeArraysOverLimit(t *testing.T) { - hasher := hash.CustomSHA256Hasher() chunks := [][32]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}, {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 62, 62, 63, 64}, @@ -72,7 +67,7 @@ func TestBitwiseMerkleizeArraysOverLimit(t *testing.T) { count := uint64(2) limit := uint64(1) - _, err := ssz.BitwiseMerkleize(hasher, chunks, count, limit) + _, err := ssz.BitwiseMerkleize(chunks, count, limit) assert.ErrorContains(t, merkleizingListLimitError, err) } diff --git a/encoding/ssz/htrutils.go b/encoding/ssz/htrutils.go index f63e78fd545b..a16b17466eae 100644 --- a/encoding/ssz/htrutils.go +++ b/encoding/ssz/htrutils.go @@ -6,7 +6,6 @@ import ( "github.com/pkg/errors" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -34,13 +33,13 @@ func ForkRoot(fork *ethpb.Fork) ([32]byte, error) { binary.LittleEndian.PutUint64(forkEpochBuf, uint64(fork.Epoch)) fieldRoots[2] = bytesutil.ToBytes32(forkEpochBuf) } - return BitwiseMerkleize(hash.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } // CheckpointRoot computes the HashTreeRoot Merkleization of // a InitWithReset struct value according to the Ethereum // Simple Serialize specification. -func CheckpointRoot(hasher HashFn, checkpoint *ethpb.Checkpoint) ([32]byte, error) { +func CheckpointRoot(checkpoint *ethpb.Checkpoint) ([32]byte, error) { fieldRoots := make([][32]byte, 2) if checkpoint != nil { epochBuf := make([]byte, 8) @@ -48,7 +47,7 @@ func CheckpointRoot(hasher HashFn, checkpoint *ethpb.Checkpoint) ([32]byte, erro fieldRoots[0] = bytesutil.ToBytes32(epochBuf) fieldRoots[1] = bytesutil.ToBytes32(checkpoint.Root) } - return BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } // ByteArrayRootWithLimit computes the HashTreeRoot Merkleization of @@ -59,7 +58,7 @@ func ByteArrayRootWithLimit(roots [][]byte, limit uint64) ([32]byte, error) { for i, r := range roots { copy(newRoots[i][:], r) } - result, err := BitwiseMerkleize(hash.CustomSHA256Hasher(), newRoots, uint64(len(newRoots)), limit) + result, err := BitwiseMerkleize(newRoots, uint64(len(newRoots)), limit) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute byte array merkleization") } @@ -88,14 +87,13 @@ func SlashingsRoot(slashings []uint64) ([32]byte, error) { if err != nil { return [32]byte{}, errors.Wrap(err, "could not pack slashings into chunks") } - return BitwiseMerkleize(hash.CustomSHA256Hasher(), slashingChunks, uint64(len(slashingChunks)), uint64(len(slashingChunks))) + return BitwiseMerkleize(slashingChunks, uint64(len(slashingChunks)), uint64(len(slashingChunks))) } // TransactionsRoot computes the HTR for the Transactions' property of the ExecutionPayload // The code was largely copy/pasted from the code generated to compute the HTR of the entire // ExecutionPayload. func TransactionsRoot(txs [][]byte) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() txRoots := make([][32]byte, 0) for i := 0; i < len(txs); i++ { rt, err := transactionRoot(txs[i]) @@ -105,7 +103,7 @@ func TransactionsRoot(txs [][]byte) ([32]byte, error) { txRoots = append(txRoots, rt) } - bytesRoot, err := BitwiseMerkleize(hasher, txRoots, uint64(len(txRoots)), fieldparams.MaxTxsPerPayloadLength) + bytesRoot, err := BitwiseMerkleize(txRoots, uint64(len(txRoots)), fieldparams.MaxTxsPerPayloadLength) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute merkleization") } @@ -120,17 +118,17 @@ func TransactionsRoot(txs [][]byte) ([32]byte, error) { // WithdrawalSliceRoot computes the HTR of a slice of withdrawals. // The limit parameter is used as input to the bitwise merkleization algorithm. -func WithdrawalSliceRoot(hasher HashFn, withdrawals []*enginev1.Withdrawal, limit uint64) ([32]byte, error) { +func WithdrawalSliceRoot(withdrawals []*enginev1.Withdrawal, limit uint64) ([32]byte, error) { roots := make([][32]byte, len(withdrawals)) for i := 0; i < len(withdrawals); i++ { - r, err := withdrawalRoot(hasher, withdrawals[i]) + r, err := withdrawalRoot(withdrawals[i]) if err != nil { return [32]byte{}, err } roots[i] = r } - bytesRoot, err := BitwiseMerkleize(hasher, roots, uint64(len(roots)), limit) + bytesRoot, err := BitwiseMerkleize(roots, uint64(len(roots)), limit) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute merkleization") } @@ -144,14 +142,13 @@ func WithdrawalSliceRoot(hasher HashFn, withdrawals []*enginev1.Withdrawal, limi } func transactionRoot(tx []byte) ([32]byte, error) { - hasher := hash.CustomSHA256Hasher() chunkedRoots, err := PackByChunk([][]byte{tx}) if err != nil { return [32]byte{}, err } maxLength := (fieldparams.MaxBytesPerTxLength + 31) / 32 - bytesRoot, err := BitwiseMerkleize(hasher, chunkedRoots, uint64(len(chunkedRoots)), uint64(maxLength)) + bytesRoot, err := BitwiseMerkleize(chunkedRoots, uint64(len(chunkedRoots)), uint64(maxLength)) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute merkleization") } @@ -164,7 +161,7 @@ func transactionRoot(tx []byte) ([32]byte, error) { return MixInLength(bytesRoot, bytesRootBufRoot), nil } -func withdrawalRoot(hasher HashFn, w *enginev1.Withdrawal) ([32]byte, error) { +func withdrawalRoot(w *enginev1.Withdrawal) ([32]byte, error) { fieldRoots := make([][32]byte, 4) if w != nil { binary.LittleEndian.PutUint64(fieldRoots[0][:], w.Index) @@ -174,5 +171,5 @@ func withdrawalRoot(hasher HashFn, w *enginev1.Withdrawal) ([32]byte, error) { fieldRoots[2] = bytesutil.ToBytes32(w.Address) binary.LittleEndian.PutUint64(fieldRoots[3][:], w.Amount) } - return BitwiseMerkleize(hasher, fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return BitwiseMerkleize(fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } diff --git a/encoding/ssz/htrutils_test.go b/encoding/ssz/htrutils_test.go index fcc9dffeed85..b86eb81c0e12 100644 --- a/encoding/ssz/htrutils_test.go +++ b/encoding/ssz/htrutils_test.go @@ -5,7 +5,6 @@ import ( "testing" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" @@ -35,14 +34,13 @@ func TestForkRoot(t *testing.T) { } func TestCheckPointRoot(t *testing.T) { - testHasher := hash.CustomSHA256Hasher() testCheckpoint := ethpb.Checkpoint{ Epoch: 1234567890, Root: []byte{222}, } expected := [32]byte{228, 65, 39, 109, 183, 249, 167, 232, 125, 239, 25, 155, 207, 4, 84, 174, 176, 229, 175, 224, 62, 33, 215, 254, 170, 220, 132, 65, 246, 128, 68, 194} - result, err := ssz.CheckpointRoot(testHasher, &testCheckpoint) + result, err := ssz.CheckpointRoot(&testCheckpoint) require.NoError(t, err) assert.Equal(t, expected, result) } @@ -191,8 +189,7 @@ func TestWithdrawalRoot(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - hasher := hash.CustomSHA256Hasher() - got, err := ssz.WithdrawalRoot(hasher, tt.input) + got, err := ssz.WithdrawalRoot(tt.input) require.NoError(t, err) require.DeepSSZEqual(t, tt.want, got) }) @@ -224,8 +221,7 @@ func TestWithrawalSliceRoot(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - hasher := hash.CustomSHA256Hasher() - got, err := ssz.WithdrawalSliceRoot(hasher, tt.input, 16) + got, err := ssz.WithdrawalSliceRoot(tt.input, 16) require.NoError(t, err) require.DeepSSZEqual(t, tt.want, got) }) diff --git a/proto/migration/BUILD.bazel b/proto/migration/BUILD.bazel index 57e79a10b259..623d586da308 100644 --- a/proto/migration/BUILD.bazel +++ b/proto/migration/BUILD.bazel @@ -13,7 +13,6 @@ go_library( "//beacon-chain/state:go_default_library", "//config/fieldparams:go_default_library", "//consensus-types/interfaces:go_default_library", - "//crypto/hash:go_default_library", "//encoding/bytesutil:go_default_library", "//encoding/ssz:go_default_library", "//proto/engine/v1:go_default_library", diff --git a/proto/migration/v1alpha1_to_v2.go b/proto/migration/v1alpha1_to_v2.go index f4ea52de896a..3409a5cb90bd 100644 --- a/proto/migration/v1alpha1_to_v2.go +++ b/proto/migration/v1alpha1_to_v2.go @@ -4,7 +4,6 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" "github.com/prysmaticlabs/prysm/v3/encoding/ssz" enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" @@ -446,11 +445,7 @@ func V1Alpha1BeaconBlockCapellaToV2Blinded(v1alpha1Block *ethpbalpha.BeaconBlock return nil, errors.Wrapf(err, "could not calculate transactions root") } - withdrawalsRoot, err := ssz.WithdrawalSliceRoot( - hash.CustomSHA256Hasher(), - v1alpha1Block.Body.ExecutionPayload.Withdrawals, - fieldparams.MaxWithdrawalsPerPayload, - ) + withdrawalsRoot, err := ssz.WithdrawalSliceRoot(v1alpha1Block.Body.ExecutionPayload.Withdrawals, fieldparams.MaxWithdrawalsPerPayload) if err != nil { return nil, errors.Wrapf(err, "could not calculate transactions root") } diff --git a/validator/node/node.go b/validator/node/node.go index 986ae7c610bb..32c96e85129e 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -886,7 +886,5 @@ func unmarshalFromFile(ctx context.Context, from string, to interface{}) error { } func configureFastSSZHashingAlgorithm() { - if features.Get().EnableVectorizedHTR { - fastssz.EnableVectorizedHTR = true - } + fastssz.EnableVectorizedHTR = true } From 3072b173292ada77b94128d9c064d2ef94d26d7b Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 17 Mar 2023 20:09:28 +0800 Subject: [PATCH 07/10] Fully Deprecate Batch Aggregation Flag (#12151) * fix evaluator * fmt * config --- beacon-chain/sync/batch_verifier.go | 5 +---- config/features/config.go | 10 ++-------- config/features/deprecated_flags.go | 6 ++++++ config/features/flags.go | 5 ----- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/beacon-chain/sync/batch_verifier.go b/beacon-chain/sync/batch_verifier.go index b9bf013a9db5..412152e66285 100644 --- a/beacon-chain/sync/batch_verifier.go +++ b/beacon-chain/sync/batch_verifier.go @@ -6,7 +6,6 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" "github.com/prysmaticlabs/prysm/v3/crypto/bls" "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" "go.opencensus.io/trace" @@ -90,9 +89,7 @@ func verifyBatch(verifierBatch []*signatureVerifier) { } var verificationErr error - if features.Get().EnableBatchGossipAggregation { - aggSet, verificationErr = performBatchAggregation(aggSet) - } + aggSet, verificationErr = performBatchAggregation(aggSet) if verificationErr == nil { verified, err := aggSet.Verify() switch { diff --git a/config/features/config.go b/config/features/config.go index 952c760f8ba1..6a07f4f6ad78 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -57,9 +57,8 @@ type Flags struct { EnableSlasher bool // Enable slasher in the beacon node runtime. EnableSlashingProtectionPruning bool // EnableSlashingProtectionPruning for the validator client. - EnableBatchGossipAggregation bool // EnableBatchGossipAggregation specifies whether to further aggregate our gossip batches before verifying them. - SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database. - EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup. + SaveFullExecutionPayloads bool // Save full beacon blocks with execution payloads in the database. + EnableStartOptimistic bool // EnableStartOptimistic treats every block as optimistic at startup. DisableStakinContractCheck bool // Disables check for deposit contract when proposing blocks @@ -187,11 +186,6 @@ func ConfigureBeaconChain(ctx *cli.Context) error { logEnabled(disableStakinContractCheck) cfg.DisableStakinContractCheck = true } - cfg.EnableBatchGossipAggregation = true - if ctx.Bool(disableGossipBatchAggregation.Name) { - logDisabled(disableGossipBatchAggregation) - cfg.EnableBatchGossipAggregation = false - } if ctx.Bool(SaveFullExecutionPayloads.Name) { logEnabled(SaveFullExecutionPayloads) cfg.SaveFullExecutionPayloads = true diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go index c64960d19b7b..af8bdff47c94 100644 --- a/config/features/deprecated_flags.go +++ b/config/features/deprecated_flags.go @@ -27,6 +27,11 @@ var ( Usage: deprecatedUsage, Hidden: true, } + deprecatedDisableGossipBatchAggregation = &cli.BoolFlag{ + Name: "disable-gossip-batch-aggregation", + Usage: deprecatedUsage, + Hidden: true, + } ) // Deprecated flags for both the beacon node and validator client. @@ -35,6 +40,7 @@ var deprecatedFlags = []cli.Flag{ deprecatedDisablePeerScorer, deprecatedDisableVecHTR, deprecatedEnableReorgLateBlocks, + deprecatedDisableGossipBatchAggregation, } // deprecatedBeaconFlags contains flags that are still used by other components diff --git a/config/features/flags.go b/config/features/flags.go index f4bd0b49c1aa..f544b9abd140 100644 --- a/config/features/flags.go +++ b/config/features/flags.go @@ -88,10 +88,6 @@ var ( " (Warning): Once enabled, this feature migrates your database in to a new schema and " + "there is no going back. At worst, your entire database might get corrupted.", } - disableGossipBatchAggregation = &cli.BoolFlag{ - Name: "disable-gossip-batch-aggregation", - Usage: "Disables new methods to further aggregate our gossip batches before verifying them.", - } enableStartupOptimistic = &cli.BoolFlag{ Name: "startup-optimistic", Usage: "Treats every block as optimistically synced at launch. Use with caution", @@ -155,7 +151,6 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c enableHistoricalSpaceRepresentation, disableStakinContractCheck, disableReorgLateBlocks, - disableGossipBatchAggregation, SaveFullExecutionPayloads, enableStartupOptimistic, enableFullSSZDataLogging, From 7d82a0510fdbdbfbec00a77f55c6614f23107c05 Mon Sep 17 00:00:00 2001 From: terencechain Date: Fri, 17 Mar 2023 09:00:07 -0700 Subject: [PATCH 08/10] Fix typos from bls pool metric PR (#12155) --- beacon-chain/operations/blstoexec/pool.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beacon-chain/operations/blstoexec/pool.go b/beacon-chain/operations/blstoexec/pool.go index 68dfb6404961..9703512061ab 100644 --- a/beacon-chain/operations/blstoexec/pool.go +++ b/beacon-chain/operations/blstoexec/pool.go @@ -23,7 +23,7 @@ const blsChangesPoolThreshold = 2000 var ( blsToExecMessageInPoolTotal = promauto.NewGauge(prometheus.GaugeOpts{ Name: "bls_to_exec_message_pool_total", - Help: "The number of saved bls to exec message in the operation cool.", + Help: "The number of saved bls to exec messages in the operation pool.", }) ) From d17996f8b02155c57c9e36c199816677283db758 Mon Sep 17 00:00:00 2001 From: terencechain Date: Fri, 17 Mar 2023 11:52:56 -0700 Subject: [PATCH 09/10] =?UTF-8?q?Update=20to=20`V4`=20=F0=9F=9A=80=20=20(#?= =?UTF-8?q?12134)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update V3 from V4 * Fix build v3 -> v4 * Update ssz * Update beacon_chain.pb.go * Fix formatter import * Update update-mockgen.sh comment to v4 * Fix conflicts. Pass build and tests * Fix test --- .deepsource.toml | 2 +- BUILD.bazel | 2 +- api/client/beacon/BUILD.bazel | 2 +- api/client/beacon/checkpoint.go | 16 +- api/client/beacon/checkpoint_test.go | 26 +- api/client/beacon/client.go | 12 +- api/client/beacon/client_test.go | 2 +- api/client/builder/BUILD.bazel | 2 +- api/client/builder/bid.go | 10 +- api/client/builder/client.go | 16 +- api/client/builder/client_test.go | 16 +- api/client/builder/testing/BUILD.bazel | 2 +- api/client/builder/testing/mock.go | 10 +- api/client/builder/types.go | 8 +- api/client/builder/types_test.go | 8 +- api/gateway/BUILD.bazel | 2 +- api/gateway/apimiddleware/BUILD.bazel | 2 +- api/gateway/apimiddleware/param_handling.go | 2 +- .../apimiddleware/param_handling_test.go | 4 +- api/gateway/apimiddleware/process_request.go | 2 +- .../apimiddleware/process_request_test.go | 6 +- api/gateway/gateway.go | 4 +- api/gateway/gateway_test.go | 8 +- api/gateway/options.go | 2 +- api/grpc/BUILD.bazel | 2 +- api/grpc/grpcutils_test.go | 4 +- api/pagination/BUILD.bazel | 2 +- api/pagination/pagination.go | 2 +- api/pagination/pagination_test.go | 6 +- async/BUILD.bazel | 2 +- async/abool/BUILD.bazel | 2 +- async/benchmark_test.go | 4 +- async/debounce_test.go | 8 +- async/event/BUILD.bazel | 2 +- async/event/example_feed_test.go | 2 +- async/event/example_scope_test.go | 2 +- async/event/example_subscription_test.go | 2 +- async/event/feed_test.go | 2 +- async/event/subscription.go | 2 +- async/event/subscription_test.go | 2 +- async/every_test.go | 2 +- async/scatter_test.go | 6 +- beacon-chain/blockchain/BUILD.bazel | 2 +- beacon-chain/blockchain/chain_info.go | 22 +- .../blockchain/chain_info_norace_test.go | 16 +- beacon-chain/blockchain/chain_info_test.go | 32 +- beacon-chain/blockchain/error_test.go | 2 +- beacon-chain/blockchain/execution_engine.go | 32 +- .../blockchain/execution_engine_test.go | 42 +- .../blockchain/forkchoice_update_execution.go | 14 +- .../forkchoice_update_execution_test.go | 22 +- beacon-chain/blockchain/head.go | 30 +- .../blockchain/head_sync_committee_info.go | 22 +- .../head_sync_committee_info_test.go | 14 +- beacon-chain/blockchain/head_test.go | 32 +- .../blockchain/init_sync_process_block.go | 4 +- .../init_sync_process_block_test.go | 8 +- beacon-chain/blockchain/init_test.go | 2 +- beacon-chain/blockchain/log.go | 18 +- beacon-chain/blockchain/log_test.go | 10 +- beacon-chain/blockchain/metrics.go | 18 +- beacon-chain/blockchain/metrics_test.go | 6 +- beacon-chain/blockchain/mock_test.go | 6 +- beacon-chain/blockchain/options.go | 30 +- beacon-chain/blockchain/pow_block.go | 14 +- beacon-chain/blockchain/pow_block_test.go | 22 +- .../blockchain/process_attestation.go | 10 +- .../blockchain/process_attestation_helpers.go | 18 +- .../blockchain/process_attestation_test.go | 26 +- beacon-chain/blockchain/process_block.go | 44 +- .../blockchain/process_block_helpers.go | 20 +- beacon-chain/blockchain/process_block_test.go | 58 +-- .../blockchain/receive_attestation.go | 20 +- .../blockchain/receive_attestation_test.go | 32 +- beacon-chain/blockchain/receive_block.go | 20 +- beacon-chain/blockchain/receive_block_test.go | 32 +- beacon-chain/blockchain/service.go | 54 +-- .../blockchain/service_norace_test.go | 8 +- beacon-chain/blockchain/service_test.go | 58 +-- beacon-chain/blockchain/testing/BUILD.bazel | 2 +- beacon-chain/blockchain/testing/mock.go | 36 +- .../blockchain/weak_subjectivity_checks.go | 12 +- .../weak_subjectivity_checks_test.go | 20 +- beacon-chain/builder/BUILD.bazel | 2 +- beacon-chain/builder/option.go | 8 +- beacon-chain/builder/service.go | 14 +- beacon-chain/builder/service_test.go | 14 +- beacon-chain/builder/testing/BUILD.bazel | 2 +- beacon-chain/builder/testing/mock.go | 16 +- beacon-chain/cache/BUILD.bazel | 2 +- beacon-chain/cache/active_balance.go | 8 +- beacon-chain/cache/active_balance_disabled.go | 2 +- beacon-chain/cache/active_balance_test.go | 10 +- beacon-chain/cache/attestation_data.go | 2 +- beacon-chain/cache/attestation_data_test.go | 6 +- beacon-chain/cache/checkpoint_state.go | 8 +- beacon-chain/cache/checkpoint_state_test.go | 16 +- beacon-chain/cache/committee.go | 10 +- beacon-chain/cache/committee_disabled.go | 2 +- beacon-chain/cache/committee_fuzz_test.go | 4 +- beacon-chain/cache/committee_test.go | 10 +- beacon-chain/cache/committees.go | 2 +- beacon-chain/cache/common.go | 2 +- beacon-chain/cache/depositcache/BUILD.bazel | 2 +- .../cache/depositcache/deposits_cache.go | 10 +- .../cache/depositcache/deposits_cache_test.go | 12 +- .../cache/depositcache/pending_deposits.go | 4 +- .../depositcache/pending_deposits_test.go | 6 +- .../cache/depositsnapshot/BUILD.bazel | 2 +- .../cache/depositsnapshot/deposit_tree.go | 6 +- .../depositsnapshot/deposit_tree_snapshot.go | 2 +- .../deposit_tree_snapshot_test.go | 2 +- .../cache/depositsnapshot/merkle_tree.go | 6 +- .../cache/depositsnapshot/merkle_tree_test.go | 4 +- .../cache/depositsnapshot/spec_test.go | 6 +- beacon-chain/cache/payload_id.go | 4 +- beacon-chain/cache/payload_id_test.go | 4 +- beacon-chain/cache/proposer_indices.go | 2 +- .../cache/proposer_indices_disabled.go | 2 +- beacon-chain/cache/proposer_indices_test.go | 8 +- beacon-chain/cache/proposer_indices_type.go | 2 +- beacon-chain/cache/skip_slot_cache.go | 4 +- beacon-chain/cache/skip_slot_cache_test.go | 12 +- beacon-chain/cache/subnet_ids.go | 8 +- beacon-chain/cache/subnet_ids_test.go | 8 +- beacon-chain/cache/sync_committee.go | 6 +- beacon-chain/cache/sync_committee_disabled.go | 4 +- .../cache/sync_committee_head_state.go | 8 +- .../cache/sync_committee_head_state_test.go | 12 +- beacon-chain/cache/sync_committee_test.go | 10 +- beacon-chain/cache/sync_subnet_ids.go | 10 +- beacon-chain/cache/sync_subnet_ids_test.go | 8 +- beacon-chain/core/altair/BUILD.bazel | 2 +- beacon-chain/core/altair/attestation.go | 20 +- beacon-chain/core/altair/attestation_test.go | 32 +- beacon-chain/core/altair/block.go | 18 +- beacon-chain/core/altair/block_test.go | 30 +- beacon-chain/core/altair/deposit.go | 8 +- beacon-chain/core/altair/deposit_fuzz_test.go | 8 +- beacon-chain/core/altair/deposit_test.go | 20 +- beacon-chain/core/altair/epoch_precompute.go | 12 +- .../core/altair/epoch_precompute_test.go | 16 +- beacon-chain/core/altair/epoch_spec.go | 8 +- beacon-chain/core/altair/epoch_spec_test.go | 24 +- beacon-chain/core/altair/reward.go | 10 +- beacon-chain/core/altair/reward_test.go | 14 +- beacon-chain/core/altair/sync_committee.go | 24 +- .../core/altair/sync_committee_test.go | 22 +- beacon-chain/core/altair/transition.go | 6 +- beacon-chain/core/altair/transition_test.go | 8 +- beacon-chain/core/altair/upgrade.go | 14 +- beacon-chain/core/altair/upgrade_test.go | 18 +- beacon-chain/core/blocks/BUILD.bazel | 2 +- beacon-chain/core/blocks/attestation.go | 22 +- .../blocks/attestation_regression_test.go | 14 +- beacon-chain/core/blocks/attestation_test.go | 32 +- beacon-chain/core/blocks/attester_slashing.go | 20 +- .../core/blocks/attester_slashing_test.go | 24 +- .../core/blocks/block_operations_fuzz_test.go | 16 +- .../core/blocks/block_regression_test.go | 20 +- beacon-chain/core/blocks/deposit.go | 20 +- beacon-chain/core/blocks/deposit_test.go | 26 +- beacon-chain/core/blocks/eth1_data.go | 6 +- beacon-chain/core/blocks/eth1_data_test.go | 20 +- beacon-chain/core/blocks/exit.go | 16 +- beacon-chain/core/blocks/exit_test.go | 24 +- beacon-chain/core/blocks/genesis.go | 16 +- beacon-chain/core/blocks/genesis_test.go | 6 +- beacon-chain/core/blocks/header.go | 14 +- beacon-chain/core/blocks/header_test.go | 26 +- beacon-chain/core/blocks/payload.go | 16 +- beacon-chain/core/blocks/payload_test.go | 26 +- beacon-chain/core/blocks/proposer_slashing.go | 18 +- .../proposer_slashing_regression_test.go | 8 +- .../core/blocks/proposer_slashing_test.go | 30 +- beacon-chain/core/blocks/randao.go | 12 +- beacon-chain/core/blocks/randao_test.go | 22 +- beacon-chain/core/blocks/signature.go | 22 +- beacon-chain/core/blocks/signature_test.go | 20 +- beacon-chain/core/blocks/withdrawals.go | 28 +- beacon-chain/core/blocks/withdrawals_test.go | 36 +- beacon-chain/core/capella/BUILD.bazel | 2 +- beacon-chain/core/capella/upgrade.go | 12 +- beacon-chain/core/capella/upgrade_test.go | 16 +- beacon-chain/core/epoch/BUILD.bazel | 2 +- beacon-chain/core/epoch/epoch_processing.go | 24 +- .../core/epoch/epoch_processing_fuzz_test.go | 6 +- .../core/epoch/epoch_processing_test.go | 28 +- .../core/epoch/precompute/BUILD.bazel | 2 +- .../core/epoch/precompute/attestation.go | 18 +- .../core/epoch/precompute/attestation_test.go | 18 +- .../precompute/justification_finalization.go | 12 +- .../justification_finalization_test.go | 18 +- beacon-chain/core/epoch/precompute/new.go | 8 +- .../core/epoch/precompute/new_test.go | 12 +- .../core/epoch/precompute/reward_penalty.go | 12 +- .../epoch/precompute/reward_penalty_test.go | 26 +- .../core/epoch/precompute/slashing.go | 14 +- .../core/epoch/precompute/slashing_test.go | 12 +- beacon-chain/core/epoch/precompute/type.go | 2 +- beacon-chain/core/execution/BUILD.bazel | 2 +- beacon-chain/core/execution/upgrade.go | 12 +- beacon-chain/core/execution/upgrade_test.go | 14 +- beacon-chain/core/feed/BUILD.bazel | 2 +- beacon-chain/core/feed/block/BUILD.bazel | 2 +- beacon-chain/core/feed/block/events.go | 2 +- beacon-chain/core/feed/block/notifier.go | 2 +- beacon-chain/core/feed/operation/BUILD.bazel | 2 +- beacon-chain/core/feed/operation/events.go | 2 +- beacon-chain/core/feed/operation/notifier.go | 2 +- beacon-chain/core/feed/state/BUILD.bazel | 2 +- beacon-chain/core/feed/state/events.go | 4 +- beacon-chain/core/feed/state/notifier.go | 2 +- beacon-chain/core/helpers/BUILD.bazel | 2 +- beacon-chain/core/helpers/attestation.go | 14 +- beacon-chain/core/helpers/attestation_test.go | 24 +- beacon-chain/core/helpers/beacon_committee.go | 22 +- .../core/helpers/beacon_committee_test.go | 22 +- beacon-chain/core/helpers/block.go | 8 +- beacon-chain/core/helpers/block_test.go | 14 +- beacon-chain/core/helpers/genesis.go | 8 +- beacon-chain/core/helpers/randao.go | 12 +- beacon-chain/core/helpers/randao_test.go | 14 +- .../core/helpers/rewards_penalties.go | 12 +- .../core/helpers/rewards_penalties_test.go | 14 +- beacon-chain/core/helpers/shuffle.go | 10 +- beacon-chain/core/helpers/shuffle_test.go | 10 +- beacon-chain/core/helpers/sync_committee.go | 16 +- .../core/helpers/sync_committee_test.go | 16 +- beacon-chain/core/helpers/validators.go | 18 +- beacon-chain/core/helpers/validators_test.go | 22 +- .../core/helpers/weak_subjectivity.go | 18 +- .../core/helpers/weak_subjectivity_test.go | 18 +- beacon-chain/core/signing/BUILD.bazel | 2 +- beacon-chain/core/signing/domain.go | 6 +- beacon-chain/core/signing/domain_test.go | 10 +- beacon-chain/core/signing/signature.go | 4 +- beacon-chain/core/signing/signature_test.go | 12 +- beacon-chain/core/signing/signing_root.go | 12 +- .../core/signing/signing_root_test.go | 24 +- beacon-chain/core/time/BUILD.bazel | 2 +- beacon-chain/core/time/slot_epoch.go | 10 +- beacon-chain/core/time/slot_epoch_test.go | 20 +- beacon-chain/core/transition/BUILD.bazel | 2 +- .../altair_transition_no_verify_sig_test.go | 30 +- ...bellatrix_transition_no_verify_sig_test.go | 34 +- .../core/transition/benchmarks_test.go | 20 +- .../core/transition/interop/BUILD.bazel | 2 +- .../transition/interop/write_block_to_disk.go | 6 +- .../transition/interop/write_state_to_disk.go | 6 +- .../core/transition/skip_slot_cache.go | 8 +- .../core/transition/skip_slot_cache_test.go | 18 +- .../core/transition/state-bellatrix.go | 22 +- beacon-chain/core/transition/state.go | 16 +- .../core/transition/state_fuzz_test.go | 6 +- beacon-chain/core/transition/state_test.go | 18 +- .../core/transition/stateutils/BUILD.bazel | 2 +- .../stateutils/validator_index_map.go | 8 +- .../stateutils/validator_index_map_test.go | 16 +- .../transition/trailing_slot_state_cache.go | 2 +- .../trailing_slot_state_cache_test.go | 8 +- beacon-chain/core/transition/transition.go | 32 +- .../core/transition/transition_fuzz_test.go | 12 +- .../transition/transition_no_verify_sig.go | 20 +- .../transition_no_verify_sig_test.go | 20 +- .../core/transition/transition_test.go | 38 +- beacon-chain/core/validators/BUILD.bazel | 2 +- beacon-chain/core/validators/validator.go | 16 +- .../core/validators/validator_test.go | 18 +- beacon-chain/db/BUILD.bazel | 2 +- beacon-chain/db/alias.go | 2 +- beacon-chain/db/db.go | 2 +- beacon-chain/db/db_test.go | 2 +- beacon-chain/db/errors.go | 2 +- beacon-chain/db/filters/BUILD.bazel | 2 +- beacon-chain/db/filters/filter.go | 2 +- beacon-chain/db/filters/filter_test.go | 4 +- beacon-chain/db/iface/BUILD.bazel | 2 +- beacon-chain/db/iface/interface.go | 14 +- beacon-chain/db/kv/BUILD.bazel | 2 +- beacon-chain/db/kv/archived_point.go | 4 +- beacon-chain/db/kv/archived_point_test.go | 8 +- beacon-chain/db/kv/backup.go | 6 +- beacon-chain/db/kv/backup_test.go | 8 +- beacon-chain/db/kv/blocks.go | 20 +- beacon-chain/db/kv/blocks_test.go | 20 +- beacon-chain/db/kv/checkpoint.go | 6 +- beacon-chain/db/kv/checkpoint_test.go | 14 +- beacon-chain/db/kv/deposit_contract_test.go | 4 +- beacon-chain/db/kv/encoding.go | 2 +- beacon-chain/db/kv/encoding_test.go | 4 +- beacon-chain/db/kv/execution_chain.go | 4 +- beacon-chain/db/kv/execution_chain_test.go | 2 +- beacon-chain/db/kv/finalized_block_roots.go | 12 +- .../db/kv/finalized_block_roots_test.go | 20 +- beacon-chain/db/kv/genesis.go | 10 +- beacon-chain/db/kv/genesis_test.go | 12 +- beacon-chain/db/kv/init_test.go | 2 +- beacon-chain/db/kv/kv.go | 10 +- beacon-chain/db/kv/kv_test.go | 10 +- .../db/kv/migration_archived_index.go | 6 +- .../db/kv/migration_archived_index_test.go | 6 +- .../db/kv/migration_block_slot_index.go | 2 +- .../db/kv/migration_block_slot_index_test.go | 4 +- .../db/kv/migration_state_validators.go | 8 +- .../db/kv/migration_state_validators_test.go | 16 +- beacon-chain/db/kv/state.go | 24 +- beacon-chain/db/kv/state_summary.go | 4 +- beacon-chain/db/kv/state_summary_cache.go | 2 +- beacon-chain/db/kv/state_summary_test.go | 10 +- beacon-chain/db/kv/state_test.go | 22 +- beacon-chain/db/kv/utils.go | 2 +- beacon-chain/db/kv/utils_test.go | 6 +- beacon-chain/db/kv/validated_checkpoint.go | 4 +- .../db/kv/validated_checkpoint_test.go | 12 +- beacon-chain/db/kv/wss.go | 10 +- beacon-chain/db/kv/wss_test.go | 10 +- beacon-chain/db/restore.go | 8 +- beacon-chain/db/restore_test.go | 14 +- beacon-chain/db/slasherkv/BUILD.bazel | 2 +- beacon-chain/db/slasherkv/kv.go | 6 +- beacon-chain/db/slasherkv/kv_test.go | 2 +- beacon-chain/db/slasherkv/pruning.go | 4 +- beacon-chain/db/slasherkv/pruning_test.go | 10 +- beacon-chain/db/slasherkv/slasher.go | 8 +- beacon-chain/db/slasherkv/slasher_test.go | 14 +- beacon-chain/db/testing/BUILD.bazel | 2 +- beacon-chain/db/testing/setup_db.go | 8 +- .../deterministic-genesis/BUILD.bazel | 2 +- beacon-chain/deterministic-genesis/service.go | 20 +- beacon-chain/execution/BUILD.bazel | 2 +- beacon-chain/execution/block_cache.go | 4 +- beacon-chain/execution/block_cache_test.go | 8 +- beacon-chain/execution/block_reader.go | 6 +- beacon-chain/execution/block_reader_test.go | 14 +- .../execution/check_transition_config.go | 14 +- .../execution/check_transition_config_test.go | 20 +- beacon-chain/execution/deposit.go | 6 +- beacon-chain/execution/deposit_test.go | 28 +- beacon-chain/execution/engine_client.go | 24 +- .../execution/engine_client_fuzz_test.go | 6 +- beacon-chain/execution/engine_client_test.go | 26 +- beacon-chain/execution/init_test.go | 2 +- beacon-chain/execution/log_processing.go | 24 +- beacon-chain/execution/log_processing_test.go | 24 +- beacon-chain/execution/options.go | 12 +- beacon-chain/execution/prometheus.go | 2 +- beacon-chain/execution/prometheus_test.go | 2 +- beacon-chain/execution/provider.go | 4 +- beacon-chain/execution/provider_test.go | 4 +- beacon-chain/execution/rpc_connection.go | 10 +- beacon-chain/execution/service.go | 36 +- beacon-chain/execution/service_test.go | 34 +- beacon-chain/execution/testing/BUILD.bazel | 2 +- beacon-chain/execution/testing/genesis.go | 4 +- .../execution/testing/mock_engine_client.go | 16 +- .../execution/testing/mock_execution_chain.go | 12 +- .../execution/testing/mock_faulty_powchain.go | 10 +- beacon-chain/execution/types/BUILD.bazel | 2 +- beacon-chain/execution/types/eth1_types.go | 2 +- .../execution/types/eth1_types_test.go | 2 +- beacon-chain/forkchoice/BUILD.bazel | 2 +- .../forkchoice/doubly-linked-tree/BUILD.bazel | 2 +- .../doubly-linked-tree/ffg_update_test.go | 10 +- .../doubly-linked-tree/forkchoice.go | 24 +- .../doubly-linked-tree/forkchoice_test.go | 26 +- .../doubly-linked-tree/no_vote_test.go | 6 +- .../forkchoice/doubly-linked-tree/node.go | 8 +- .../doubly-linked-tree/node_test.go | 10 +- .../forkchoice/doubly-linked-tree/on_tick.go | 4 +- .../doubly-linked-tree/on_tick_test.go | 8 +- .../doubly-linked-tree/optimistic_sync.go | 2 +- .../optimistic_sync_test.go | 6 +- .../doubly-linked-tree/proposer_boost.go | 4 +- .../doubly-linked-tree/proposer_boost_test.go | 8 +- .../doubly-linked-tree/reorg_late_blocks.go | 6 +- .../reorg_late_blocks_test.go | 4 +- .../forkchoice/doubly-linked-tree/store.go | 8 +- .../doubly-linked-tree/store_test.go | 10 +- .../forkchoice/doubly-linked-tree/types.go | 8 +- .../unrealized_justification.go | 16 +- .../unrealized_justification_test.go | 8 +- .../doubly-linked-tree/vote_test.go | 6 +- beacon-chain/forkchoice/interfaces.go | 10 +- beacon-chain/forkchoice/types/BUILD.bazel | 2 +- beacon-chain/forkchoice/types/types.go | 8 +- beacon-chain/gateway/BUILD.bazel | 2 +- beacon-chain/gateway/helpers.go | 8 +- beacon-chain/gateway/helpers_test.go | 6 +- beacon-chain/monitor/BUILD.bazel | 2 +- beacon-chain/monitor/process_attestation.go | 22 +- .../monitor/process_attestation_test.go | 10 +- beacon-chain/monitor/process_block.go | 14 +- beacon-chain/monitor/process_block_test.go | 16 +- beacon-chain/monitor/process_exit.go | 4 +- beacon-chain/monitor/process_exit_test.go | 8 +- .../monitor/process_sync_committee.go | 6 +- .../monitor/process_sync_committee_test.go | 8 +- beacon-chain/monitor/service.go | 20 +- beacon-chain/monitor/service_test.go | 26 +- beacon-chain/node/BUILD.bazel | 3 +- beacon-chain/node/config.go | 15 +- beacon-chain/node/config_test.go | 12 +- beacon-chain/node/node.go | 89 ++-- beacon-chain/node/node_test.go | 30 +- beacon-chain/node/options.go | 6 +- beacon-chain/node/registration/BUILD.bazel | 2 +- beacon-chain/node/registration/p2p.go | 4 +- beacon-chain/node/registration/p2p_test.go | 8 +- .../operations/attestations/BUILD.bazel | 2 +- .../operations/attestations/kv/BUILD.bazel | 2 +- .../operations/attestations/kv/aggregated.go | 8 +- .../attestations/kv/aggregated_test.go | 12 +- .../attestations/kv/benchmark_test.go | 6 +- .../operations/attestations/kv/block.go | 2 +- .../operations/attestations/kv/block_test.go | 8 +- .../operations/attestations/kv/forkchoice.go | 2 +- .../attestations/kv/forkchoice_test.go | 8 +- beacon-chain/operations/attestations/kv/kv.go | 6 +- .../operations/attestations/kv/seen_bits.go | 2 +- .../attestations/kv/seen_bits_test.go | 6 +- .../attestations/kv/unaggregated.go | 6 +- .../attestations/kv/unaggregated_test.go | 10 +- .../operations/attestations/mock/BUILD.bazel | 2 +- .../operations/attestations/mock/mock.go | 4 +- beacon-chain/operations/attestations/pool.go | 6 +- .../operations/attestations/pool_test.go | 2 +- .../attestations/prepare_forkchoice.go | 8 +- .../attestations/prepare_forkchoice_test.go | 12 +- .../operations/attestations/prune_expired.go | 6 +- .../attestations/prune_expired_test.go | 16 +- .../operations/attestations/service.go | 4 +- .../operations/attestations/service_test.go | 4 +- beacon-chain/operations/blstoexec/BUILD.bazel | 2 +- .../operations/blstoexec/mock/BUILD.bazel | 2 +- .../operations/blstoexec/mock/mock.go | 6 +- beacon-chain/operations/blstoexec/pool.go | 12 +- .../operations/blstoexec/pool_test.go | 24 +- beacon-chain/operations/slashings/BUILD.bazel | 2 +- .../operations/slashings/mock/BUILD.bazel | 2 +- .../operations/slashings/mock/mock.go | 4 +- beacon-chain/operations/slashings/service.go | 16 +- .../slashings/service_attester_test.go | 16 +- .../slashings/service_proposer_test.go | 14 +- .../operations/slashings/service_test.go | 4 +- beacon-chain/operations/slashings/types.go | 6 +- .../operations/synccommittee/BUILD.bazel | 2 +- .../operations/synccommittee/contribution.go | 6 +- .../synccommittee/contribution_test.go | 4 +- beacon-chain/operations/synccommittee/kv.go | 2 +- .../operations/synccommittee/message.go | 6 +- .../operations/synccommittee/message_test.go | 4 +- beacon-chain/operations/synccommittee/pool.go | 4 +- .../operations/voluntaryexits/BUILD.bazel | 2 +- .../voluntaryexits/mock/BUILD.bazel | 2 +- .../operations/voluntaryexits/mock/mock.go | 6 +- .../operations/voluntaryexits/pool.go | 14 +- .../operations/voluntaryexits/pool_test.go | 22 +- beacon-chain/p2p/BUILD.bazel | 2 +- beacon-chain/p2p/addr_factory_test.go | 4 +- beacon-chain/p2p/broadcaster.go | 12 +- beacon-chain/p2p/broadcaster_test.go | 22 +- beacon-chain/p2p/config.go | 4 +- beacon-chain/p2p/connection_gater_test.go | 16 +- beacon-chain/p2p/dial_relay_node_test.go | 4 +- beacon-chain/p2p/discovery.go | 10 +- beacon-chain/p2p/discovery_test.go | 34 +- beacon-chain/p2p/encoder/BUILD.bazel | 2 +- beacon-chain/p2p/encoder/snappy_test.go | 2 +- beacon-chain/p2p/encoder/ssz.go | 4 +- beacon-chain/p2p/encoder/ssz_test.go | 12 +- beacon-chain/p2p/encoder/varint_test.go | 4 +- beacon-chain/p2p/fork.go | 10 +- beacon-chain/p2p/fork_test.go | 20 +- beacon-chain/p2p/fork_watcher.go | 6 +- beacon-chain/p2p/gossip_scoring_params.go | 6 +- .../p2p/gossip_scoring_params_test.go | 12 +- beacon-chain/p2p/gossip_topic_mappings.go | 6 +- .../p2p/gossip_topic_mappings_test.go | 10 +- beacon-chain/p2p/handshake.go | 6 +- beacon-chain/p2p/interfaces.go | 8 +- beacon-chain/p2p/message_id.go | 14 +- beacon-chain/p2p/message_id_test.go | 14 +- beacon-chain/p2p/options.go | 4 +- beacon-chain/p2p/options_test.go | 12 +- beacon-chain/p2p/parameter_test.go | 4 +- beacon-chain/p2p/peers/BUILD.bazel | 2 +- beacon-chain/p2p/peers/peerdata/BUILD.bazel | 2 +- beacon-chain/p2p/peers/peerdata/store.go | 4 +- beacon-chain/p2p/peers/peerdata/store_test.go | 6 +- beacon-chain/p2p/peers/peers_test.go | 2 +- beacon-chain/p2p/peers/scorers/BUILD.bazel | 2 +- .../p2p/peers/scorers/bad_responses.go | 2 +- .../p2p/peers/scorers/bad_responses_test.go | 10 +- .../p2p/peers/scorers/block_providers.go | 8 +- .../p2p/peers/scorers/block_providers_test.go | 12 +- .../p2p/peers/scorers/gossip_scorer.go | 4 +- .../p2p/peers/scorers/gossip_scorer_test.go | 8 +- beacon-chain/p2p/peers/scorers/peer_status.go | 10 +- .../p2p/peers/scorers/peer_status_test.go | 16 +- .../p2p/peers/scorers/scorers_test.go | 4 +- beacon-chain/p2p/peers/scorers/service.go | 2 +- .../p2p/peers/scorers/service_test.go | 8 +- beacon-chain/p2p/peers/status.go | 20 +- beacon-chain/p2p/peers/status_test.go | 20 +- beacon-chain/p2p/pubsub.go | 8 +- beacon-chain/p2p/pubsub_filter.go | 6 +- beacon-chain/p2p/pubsub_filter_test.go | 20 +- beacon-chain/p2p/pubsub_fuzz_test.go | 4 +- beacon-chain/p2p/pubsub_test.go | 10 +- beacon-chain/p2p/rpc_topic_mappings.go | 8 +- beacon-chain/p2p/rpc_topic_mappings_test.go | 14 +- beacon-chain/p2p/sender.go | 2 +- beacon-chain/p2p/sender_test.go | 12 +- beacon-chain/p2p/service.go | 26 +- beacon-chain/p2p/service_test.go | 26 +- beacon-chain/p2p/subnets.go | 10 +- beacon-chain/p2p/subnets_test.go | 22 +- beacon-chain/p2p/testing/BUILD.bazel | 2 +- beacon-chain/p2p/testing/fuzz_p2p.go | 8 +- beacon-chain/p2p/testing/mock_broadcaster.go | 2 +- .../p2p/testing/mock_metadataprovider.go | 2 +- .../p2p/testing/mock_peersprovider.go | 6 +- beacon-chain/p2p/testing/p2p.go | 10 +- beacon-chain/p2p/types/BUILD.bazel | 2 +- beacon-chain/p2p/types/object_mapping.go | 14 +- beacon-chain/p2p/types/object_mapping_test.go | 6 +- beacon-chain/p2p/types/rpc_goodbye_codes.go | 2 +- beacon-chain/p2p/types/types.go | 2 +- beacon-chain/p2p/types/types_test.go | 8 +- beacon-chain/p2p/utils.go | 10 +- beacon-chain/p2p/utils_test.go | 6 +- beacon-chain/rpc/BUILD.bazel | 2 +- beacon-chain/rpc/apimiddleware/BUILD.bazel | 2 +- .../rpc/apimiddleware/custom_handlers.go | 8 +- .../rpc/apimiddleware/custom_handlers_test.go | 10 +- .../rpc/apimiddleware/custom_hooks.go | 10 +- .../rpc/apimiddleware/custom_hooks_test.go | 12 +- .../rpc/apimiddleware/endpoint_factory.go | 2 +- beacon-chain/rpc/apimiddleware/structs.go | 6 +- .../apimiddleware/structs_marshalling_test.go | 4 +- beacon-chain/rpc/eth/beacon/BUILD.bazel | 2 +- beacon-chain/rpc/eth/beacon/blinded_blocks.go | 18 +- .../rpc/eth/beacon/blinded_blocks_test.go | 38 +- beacon-chain/rpc/eth/beacon/blocks.go | 34 +- beacon-chain/rpc/eth/beacon/blocks_test.go | 38 +- beacon-chain/rpc/eth/beacon/config.go | 6 +- beacon-chain/rpc/eth/beacon/config_test.go | 12 +- beacon-chain/rpc/eth/beacon/init_test.go | 2 +- beacon-chain/rpc/eth/beacon/pool.go | 30 +- beacon-chain/rpc/eth/beacon/pool_test.go | 54 +-- beacon-chain/rpc/eth/beacon/server.go | 28 +- beacon-chain/rpc/eth/beacon/server_test.go | 2 +- beacon-chain/rpc/eth/beacon/state.go | 18 +- beacon-chain/rpc/eth/beacon/state_test.go | 24 +- beacon-chain/rpc/eth/beacon/sync_committee.go | 20 +- .../rpc/eth/beacon/sync_committee_test.go | 32 +- beacon-chain/rpc/eth/beacon/validator.go | 20 +- beacon-chain/rpc/eth/beacon/validator_test.go | 32 +- beacon-chain/rpc/eth/debug/BUILD.bazel | 2 +- beacon-chain/rpc/eth/debug/debug.go | 10 +- beacon-chain/rpc/eth/debug/debug_test.go | 24 +- beacon-chain/rpc/eth/debug/server.go | 6 +- beacon-chain/rpc/eth/events/BUILD.bazel | 2 +- beacon-chain/rpc/eth/events/events.go | 24 +- beacon-chain/rpc/eth/events/events_test.go | 40 +- beacon-chain/rpc/eth/events/server.go | 8 +- beacon-chain/rpc/eth/helpers/BUILD.bazel | 2 +- .../rpc/eth/helpers/error_handling.go | 4 +- beacon-chain/rpc/eth/helpers/sync.go | 10 +- beacon-chain/rpc/eth/helpers/sync_test.go | 14 +- .../rpc/eth/helpers/validator_status.go | 8 +- .../rpc/eth/helpers/validator_status_test.go | 14 +- beacon-chain/rpc/eth/node/BUILD.bazel | 2 +- beacon-chain/rpc/eth/node/node.go | 16 +- beacon-chain/rpc/eth/node/node_test.go | 30 +- beacon-chain/rpc/eth/node/server.go | 10 +- beacon-chain/rpc/eth/node/server_test.go | 2 +- beacon-chain/rpc/eth/validator/BUILD.bazel | 2 +- beacon-chain/rpc/eth/validator/server.go | 16 +- beacon-chain/rpc/eth/validator/validator.go | 32 +- .../rpc/eth/validator/validator_test.go | 80 ++-- .../rpc/prysm/v1alpha1/beacon/BUILD.bazel | 2 +- .../rpc/prysm/v1alpha1/beacon/assignments.go | 14 +- .../prysm/v1alpha1/beacon/assignments_test.go | 28 +- .../rpc/prysm/v1alpha1/beacon/attestations.go | 26 +- .../v1alpha1/beacon/attestations_test.go | 50 +-- .../rpc/prysm/v1alpha1/beacon/beacon_test.go | 4 +- .../rpc/prysm/v1alpha1/beacon/blocks.go | 30 +- .../rpc/prysm/v1alpha1/beacon/blocks_test.go | 38 +- .../rpc/prysm/v1alpha1/beacon/committees.go | 14 +- .../prysm/v1alpha1/beacon/committees_test.go | 34 +- .../rpc/prysm/v1alpha1/beacon/config.go | 4 +- .../rpc/prysm/v1alpha1/beacon/config_test.go | 6 +- .../rpc/prysm/v1alpha1/beacon/init_test.go | 2 +- .../rpc/prysm/v1alpha1/beacon/server.go | 26 +- .../rpc/prysm/v1alpha1/beacon/slashings.go | 8 +- .../prysm/v1alpha1/beacon/slashings_test.go | 18 +- .../rpc/prysm/v1alpha1/beacon/validators.go | 30 +- .../v1alpha1/beacon/validators_stream.go | 30 +- .../v1alpha1/beacon/validators_stream_test.go | 12 +- .../prysm/v1alpha1/beacon/validators_test.go | 56 +-- .../rpc/prysm/v1alpha1/debug/BUILD.bazel | 2 +- .../rpc/prysm/v1alpha1/debug/block.go | 16 +- .../rpc/prysm/v1alpha1/debug/block_test.go | 22 +- beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go | 4 +- .../rpc/prysm/v1alpha1/debug/p2p_test.go | 8 +- .../rpc/prysm/v1alpha1/debug/server.go | 10 +- .../rpc/prysm/v1alpha1/debug/state.go | 4 +- .../rpc/prysm/v1alpha1/debug/state_test.go | 20 +- .../rpc/prysm/v1alpha1/node/BUILD.bazel | 2 +- .../rpc/prysm/v1alpha1/node/server.go | 16 +- .../rpc/prysm/v1alpha1/node/server_test.go | 24 +- .../rpc/prysm/v1alpha1/slasher/BUILD.bazel | 2 +- .../prysm/v1alpha1/slasher/attestations.go | 4 +- .../v1alpha1/slasher/attestations_test.go | 8 +- .../rpc/prysm/v1alpha1/slasher/blocks.go | 2 +- .../rpc/prysm/v1alpha1/slasher/server.go | 2 +- .../rpc/prysm/v1alpha1/slasher/server_test.go | 6 +- .../rpc/prysm/v1alpha1/validator/BUILD.bazel | 2 +- .../prysm/v1alpha1/validator/aggregator.go | 12 +- .../v1alpha1/validator/aggregator_test.go | 36 +- .../prysm/v1alpha1/validator/assignments.go | 30 +- .../v1alpha1/validator/assignments_test.go | 42 +- .../rpc/prysm/v1alpha1/validator/attester.go | 24 +- .../validator/attester_mainnet_test.go | 20 +- .../prysm/v1alpha1/validator/attester_test.go | 36 +- .../rpc/prysm/v1alpha1/validator/blocks.go | 14 +- .../prysm/v1alpha1/validator/blocks_test.go | 26 +- .../rpc/prysm/v1alpha1/validator/exit.go | 10 +- .../rpc/prysm/v1alpha1/validator/exit_test.go | 32 +- .../rpc/prysm/v1alpha1/validator/proposer.go | 28 +- .../v1alpha1/validator/proposer_altair.go | 16 +- .../validator/proposer_altair_test.go | 10 +- .../validator/proposer_attestations.go | 20 +- .../validator/proposer_attestations_test.go | 10 +- .../v1alpha1/validator/proposer_bellatrix.go | 28 +- .../validator/proposer_bellatrix_test.go | 42 +- .../v1alpha1/validator/proposer_builder.go | 6 +- .../validator/proposer_builder_test.go | 24 +- .../v1alpha1/validator/proposer_capella.go | 12 +- .../validator/proposer_capella_test.go | 16 +- .../v1alpha1/validator/proposer_deposits.go | 8 +- .../validator/proposer_empty_block.go | 12 +- .../validator/proposer_empty_block_test.go | 12 +- .../v1alpha1/validator/proposer_eth1data.go | 20 +- .../validator/proposer_execution_payload.go | 30 +- .../proposer_execution_payload_test.go | 26 +- .../v1alpha1/validator/proposer_exits.go | 6 +- .../v1alpha1/validator/proposer_exits_test.go | 12 +- .../v1alpha1/validator/proposer_slashings.go | 8 +- .../validator/proposer_slashings_test.go | 12 +- .../validator/proposer_sync_aggregate.go | 2 +- .../validator/proposer_sync_aggregate_test.go | 6 +- .../prysm/v1alpha1/validator/proposer_test.go | 80 ++-- .../validator/proposer_utils_bench_test.go | 8 +- .../rpc/prysm/v1alpha1/validator/server.go | 46 +- .../v1alpha1/validator/server_mainnet_test.go | 28 +- .../prysm/v1alpha1/validator/server_test.go | 30 +- .../rpc/prysm/v1alpha1/validator/status.go | 26 +- .../v1alpha1/validator/status_mainnet_test.go | 24 +- .../prysm/v1alpha1/validator/status_test.go | 36 +- .../v1alpha1/validator/sync_committee.go | 14 +- .../v1alpha1/validator/sync_committee_test.go | 28 +- .../v1alpha1/validator/validator_test.go | 2 +- beacon-chain/rpc/service.go | 68 +-- beacon-chain/rpc/service_test.go | 10 +- beacon-chain/rpc/statefetcher/BUILD.bazel | 2 +- beacon-chain/rpc/statefetcher/fetcher.go | 18 +- beacon-chain/rpc/statefetcher/fetcher_test.go | 26 +- beacon-chain/rpc/testutil/BUILD.bazel | 2 +- .../rpc/testutil/mock_genesis_timefetcher.go | 4 +- .../rpc/testutil/mock_state_fetcher.go | 4 +- beacon-chain/server/BUILD.bazel | 2 +- beacon-chain/server/main.go | 10 +- beacon-chain/slasher/BUILD.bazel | 2 +- beacon-chain/slasher/chunks.go | 8 +- beacon-chain/slasher/chunks_test.go | 12 +- beacon-chain/slasher/detect_attestations.go | 6 +- .../slasher/detect_attestations_test.go | 28 +- beacon-chain/slasher/detect_blocks.go | 6 +- beacon-chain/slasher/detect_blocks_test.go | 28 +- beacon-chain/slasher/helpers.go | 12 +- beacon-chain/slasher/helpers_test.go | 12 +- beacon-chain/slasher/mock/BUILD.bazel | 2 +- .../slasher/mock/mock_slashing_checker.go | 6 +- beacon-chain/slasher/params.go | 2 +- beacon-chain/slasher/params_test.go | 4 +- beacon-chain/slasher/process_slashings.go | 8 +- .../slasher/process_slashings_test.go | 24 +- beacon-chain/slasher/queue.go | 2 +- beacon-chain/slasher/queue_test.go | 6 +- beacon-chain/slasher/receive.go | 8 +- beacon-chain/slasher/receive_test.go | 22 +- beacon-chain/slasher/rpc.go | 8 +- beacon-chain/slasher/rpc_test.go | 14 +- beacon-chain/slasher/service.go | 24 +- beacon-chain/slasher/service_test.go | 22 +- beacon-chain/slasher/types/BUILD.bazel | 2 +- beacon-chain/slasher/types/types.go | 4 +- beacon-chain/state/BUILD.bazel | 2 +- beacon-chain/state/fieldtrie/BUILD.bazel | 3 +- beacon-chain/state/fieldtrie/field_trie.go | 6 +- .../state/fieldtrie/field_trie_helpers.go | 18 +- .../state/fieldtrie/field_trie_test.go | 18 +- beacon-chain/state/fieldtrie/helpers_test.go | 16 +- beacon-chain/state/genesis/BUILD.bazel | 2 +- beacon-chain/state/genesis/genesis.go | 8 +- beacon-chain/state/genesis/genesis_test.go | 4 +- beacon-chain/state/interfaces.go | 10 +- beacon-chain/state/state-native/BUILD.bazel | 2 +- .../state-native/beacon_state_mainnet.go | 14 +- .../state-native/beacon_state_minimal.go | 14 +- .../state-native/custom-types/BUILD.bazel | 2 +- .../state-native/custom-types/block_roots.go | 2 +- .../custom-types/block_roots_test.go | 4 +- .../custom-types/historical_roots_test.go | 2 +- .../state-native/custom-types/randao_mixes.go | 2 +- .../custom-types/randao_mixes_test.go | 4 +- .../state-native/custom-types/state_roots.go | 2 +- .../custom-types/state_roots_test.go | 4 +- .../state/state-native/getters_attestation.go | 4 +- .../state-native/getters_attestation_test.go | 4 +- .../state/state-native/getters_block.go | 2 +- .../state/state-native/getters_block_test.go | 6 +- .../state/state-native/getters_checkpoint.go | 4 +- .../state-native/getters_checkpoint_test.go | 6 +- .../state/state-native/getters_eth1.go | 2 +- .../state/state-native/getters_misc.go | 6 +- .../state-native/getters_participation.go | 6 +- .../getters_participation_test.go | 6 +- .../state-native/getters_payload_header.go | 10 +- .../state/state-native/getters_state.go | 4 +- .../state-native/getters_sync_committee.go | 6 +- .../state/state-native/getters_test.go | 6 +- .../state/state-native/getters_validator.go | 12 +- .../state-native/getters_validator_test.go | 12 +- .../state/state-native/getters_withdrawal.go | 16 +- .../state-native/getters_withdrawal_test.go | 14 +- beacon-chain/state/state-native/hasher.go | 18 +- .../state/state-native/hasher_test.go | 18 +- beacon-chain/state/state-native/proofs.go | 8 +- .../state/state-native/proofs_test.go | 8 +- .../state/state-native/readonly_validator.go | 10 +- .../state-native/readonly_validator_test.go | 14 +- .../state/state-native/references_test.go | 12 +- .../state/state-native/setters_attestation.go | 10 +- .../state-native/setters_attestation_test.go | 12 +- .../state/state-native/setters_block.go | 10 +- .../state/state-native/setters_checkpoint.go | 4 +- .../state/state-native/setters_eth1.go | 6 +- .../state/state-native/setters_misc.go | 16 +- .../state-native/setters_participation.go | 6 +- .../state-native/setters_payload_header.go | 12 +- .../state/state-native/setters_randao.go | 10 +- .../state/state-native/setters_state.go | 8 +- .../state-native/setters_sync_committee.go | 6 +- .../state/state-native/setters_validator.go | 12 +- .../state/state-native/setters_withdrawal.go | 6 +- .../state-native/setters_withdrawal_test.go | 8 +- .../state/state-native/spec_parameters.go | 4 +- .../state/state-native/state_fuzz_test.go | 16 +- beacon-chain/state/state-native/state_test.go | 18 +- beacon-chain/state/state-native/state_trie.go | 28 +- .../state/state-native/state_trie_test.go | 16 +- beacon-chain/state/state-native/types.go | 6 +- .../state/state-native/types/BUILD.bazel | 2 +- beacon-chain/state/state-native/types_test.go | 16 +- beacon-chain/state/stategen/BUILD.bazel | 2 +- beacon-chain/state/stategen/cacher.go | 2 +- .../stategen/epoch_boundary_state_cache.go | 4 +- .../epoch_boundary_state_cache_test.go | 8 +- beacon-chain/state/stategen/getter.go | 16 +- beacon-chain/state/stategen/getter_test.go | 20 +- beacon-chain/state/stategen/history.go | 12 +- beacon-chain/state/stategen/history_test.go | 10 +- .../state/stategen/hot_state_cache.go | 4 +- .../state/stategen/hot_state_cache_test.go | 10 +- beacon-chain/state/stategen/init_test.go | 2 +- beacon-chain/state/stategen/migrate.go | 4 +- beacon-chain/state/stategen/migrate_test.go | 18 +- beacon-chain/state/stategen/mock/BUILD.bazel | 2 +- beacon-chain/state/stategen/mock/mock.go | 4 +- beacon-chain/state/stategen/mock/replayer.go | 6 +- beacon-chain/state/stategen/mock_test.go | 22 +- beacon-chain/state/stategen/replay.go | 24 +- beacon-chain/state/stategen/replay_test.go | 26 +- beacon-chain/state/stategen/replayer.go | 6 +- beacon-chain/state/stategen/replayer_test.go | 10 +- beacon-chain/state/stategen/service.go | 14 +- beacon-chain/state/stategen/service_test.go | 14 +- beacon-chain/state/stategen/setter.go | 10 +- beacon-chain/state/stategen/setter_test.go | 12 +- beacon-chain/state/stateutil/BUILD.bazel | 2 +- .../state/stateutil/benchmark_test.go | 6 +- .../state/stateutil/block_header_root.go | 6 +- beacon-chain/state/stateutil/eth1_root.go | 20 +- .../state/stateutil/field_root_attestation.go | 18 +- .../state/stateutil/field_root_eth1.go | 7 +- .../state/stateutil/field_root_test.go | 2 +- .../state/stateutil/field_root_validator.go | 8 +- .../stateutil/field_root_validator_test.go | 6 +- .../state/stateutil/field_root_vector.go | 2 +- .../stateutil/historical_summaries_root.go | 12 +- .../state/stateutil/participation_bit_root.go | 4 +- .../stateutil/pending_attestation_root.go | 8 +- .../state/stateutil/state_root_test.go | 12 +- .../state/stateutil/sync_committee.root.go | 6 +- beacon-chain/state/stateutil/trie_helpers.go | 10 +- .../state/stateutil/trie_helpers_test.go | 18 +- .../stateutil/unrealized_justification.go | 8 +- .../unrealized_justification_test.go | 6 +- .../state/stateutil/validator_map_handler.go | 8 +- .../state/stateutil/validator_root.go | 8 +- .../state/stateutil/validator_root_test.go | 2 +- beacon-chain/state/testing/BUILD.bazel | 2 +- beacon-chain/state/testing/getters.go | 12 +- beacon-chain/state/testing/getters_block.go | 10 +- .../state/testing/getters_checkpoint.go | 10 +- .../state/testing/getters_validator.go | 6 +- beacon-chain/sync/BUILD.bazel | 2 +- beacon-chain/sync/backfill/BUILD.bazel | 2 +- beacon-chain/sync/backfill/status.go | 8 +- beacon-chain/sync/backfill/status_test.go | 14 +- beacon-chain/sync/batch_verifier.go | 4 +- beacon-chain/sync/batch_verifier_test.go | 8 +- beacon-chain/sync/broadcast_bls_changes.go | 12 +- .../sync/broadcast_bls_changes_test.go | 32 +- beacon-chain/sync/checkpoint/BUILD.bazel | 2 +- beacon-chain/sync/checkpoint/api.go | 6 +- beacon-chain/sync/checkpoint/file.go | 6 +- beacon-chain/sync/context.go | 6 +- beacon-chain/sync/context_test.go | 8 +- beacon-chain/sync/deadlines.go | 2 +- beacon-chain/sync/decode_pubsub.go | 4 +- beacon-chain/sync/decode_pubsub_test.go | 20 +- beacon-chain/sync/error.go | 8 +- beacon-chain/sync/error_test.go | 8 +- beacon-chain/sync/fork_watcher.go | 10 +- beacon-chain/sync/fork_watcher_test.go | 18 +- beacon-chain/sync/fuzz_exports.go | 2 +- beacon-chain/sync/genesis/BUILD.bazel | 2 +- beacon-chain/sync/genesis/api.go | 4 +- beacon-chain/sync/genesis/file.go | 4 +- beacon-chain/sync/initial-sync/BUILD.bazel | 2 +- .../sync/initial-sync/blocks_fetcher.go | 24 +- .../sync/initial-sync/blocks_fetcher_peers.go | 12 +- .../initial-sync/blocks_fetcher_peers_test.go | 14 +- .../sync/initial-sync/blocks_fetcher_test.go | 34 +- .../sync/initial-sync/blocks_fetcher_utils.go | 14 +- .../initial-sync/blocks_fetcher_utils_test.go | 30 +- .../sync/initial-sync/blocks_queue.go | 12 +- .../sync/initial-sync/blocks_queue_test.go | 36 +- .../sync/initial-sync/blocks_queue_utils.go | 2 +- beacon-chain/sync/initial-sync/fsm.go | 8 +- .../sync/initial-sync/fsm_benchmark_test.go | 2 +- beacon-chain/sync/initial-sync/fsm_test.go | 6 +- .../sync/initial-sync/initial_sync_test.go | 40 +- beacon-chain/sync/initial-sync/round_robin.go | 8 +- .../sync/initial-sync/round_robin_test.go | 24 +- beacon-chain/sync/initial-sync/service.go | 24 +- .../sync/initial-sync/service_test.go | 30 +- .../sync/initial-sync/testing/BUILD.bazel | 2 +- beacon-chain/sync/metrics.go | 12 +- beacon-chain/sync/options.go | 26 +- .../sync/pending_attestations_queue.go | 18 +- .../sync/pending_attestations_queue_test.go | 40 +- beacon-chain/sync/pending_blocks_queue.go | 24 +- .../sync/pending_blocks_queue_test.go | 36 +- beacon-chain/sync/rate_limiter.go | 8 +- beacon-chain/sync/rate_limiter_test.go | 12 +- beacon-chain/sync/rpc.go | 12 +- .../sync/rpc_beacon_blocks_by_range.go | 18 +- .../sync/rpc_beacon_blocks_by_range_test.go | 44 +- .../sync/rpc_beacon_blocks_by_root.go | 10 +- .../sync/rpc_beacon_blocks_by_root_test.go | 36 +- beacon-chain/sync/rpc_chunked_response.go | 20 +- .../sync/rpc_chunked_response_test.go | 16 +- beacon-chain/sync/rpc_goodbye.go | 10 +- beacon-chain/sync/rpc_goodbye_test.go | 20 +- beacon-chain/sync/rpc_metadata.go | 24 +- beacon-chain/sync/rpc_metadata_test.go | 30 +- beacon-chain/sync/rpc_ping.go | 10 +- beacon-chain/sync/rpc_ping_test.go | 24 +- beacon-chain/sync/rpc_send_request.go | 16 +- beacon-chain/sync/rpc_send_request_test.go | 24 +- beacon-chain/sync/rpc_status.go | 22 +- beacon-chain/sync/rpc_status_test.go | 44 +- beacon-chain/sync/rpc_test.go | 16 +- beacon-chain/sync/service.go | 46 +- beacon-chain/sync/service_test.go | 28 +- beacon-chain/sync/subscriber.go | 26 +- .../sync/subscriber_beacon_aggregate_proof.go | 4 +- .../subscriber_beacon_aggregate_proof_test.go | 16 +- .../sync/subscriber_beacon_attestation.go | 12 +- beacon-chain/sync/subscriber_beacon_blocks.go | 6 +- .../sync/subscriber_beacon_blocks_test.go | 22 +- .../subscriber_bls_to_execution_change.go | 6 +- beacon-chain/sync/subscriber_handlers.go | 2 +- .../sync/subscriber_sync_committee_message.go | 2 +- .../subscriber_sync_contribution_proof.go | 2 +- beacon-chain/sync/subscriber_test.go | 44 +- .../sync/subscription_topic_handler.go | 2 +- .../sync/subscription_topic_handler_test.go | 8 +- beacon-chain/sync/sync_fuzz_test.go | 30 +- beacon-chain/sync/sync_test.go | 2 +- beacon-chain/sync/utils.go | 2 +- beacon-chain/sync/utils_test.go | 12 +- beacon-chain/sync/validate_aggregate_proof.go | 32 +- .../sync/validate_aggregate_proof_test.go | 38 +- .../sync/validate_attester_slashing.go | 8 +- .../sync/validate_attester_slashing_test.go | 26 +- .../sync/validate_beacon_attestation.go | 28 +- .../sync/validate_beacon_attestation_test.go | 26 +- beacon-chain/sync/validate_beacon_blocks.go | 32 +- .../sync/validate_beacon_blocks_test.go | 46 +- .../sync/validate_bls_to_execution_change.go | 6 +- .../validate_bls_to_execution_change_test.go | 30 +- .../sync/validate_proposer_slashing.go | 8 +- .../sync/validate_proposer_slashing_test.go | 30 +- .../sync/validate_sync_committee_message.go | 20 +- .../validate_sync_committee_message_test.go | 34 +- .../sync/validate_sync_contribution_proof.go | 22 +- .../validate_sync_contribution_proof_test.go | 52 +-- beacon-chain/sync/validate_voluntary_exit.go | 12 +- .../sync/validate_voluntary_exit_test.go | 32 +- build/bazel/BUILD.bazel | 2 +- build/bazel/bazel_test.go | 2 +- build/bazel/data_path.go | 2 +- cache/lru/BUILD.bazel | 2 +- cmd/BUILD.bazel | 2 +- cmd/beacon-chain/BUILD.bazel | 2 +- cmd/beacon-chain/blockchain/BUILD.bazel | 2 +- cmd/beacon-chain/blockchain/options.go | 8 +- cmd/beacon-chain/db/BUILD.bazel | 2 +- cmd/beacon-chain/db/db.go | 6 +- cmd/beacon-chain/execution/BUILD.bazel | 2 +- cmd/beacon-chain/execution/options.go | 6 +- cmd/beacon-chain/execution/options_test.go | 10 +- cmd/beacon-chain/flags/BUILD.bazel | 2 +- cmd/beacon-chain/flags/api_module_test.go | 2 +- cmd/beacon-chain/flags/base.go | 4 +- cmd/beacon-chain/flags/config.go | 2 +- cmd/beacon-chain/jwt/BUILD.bazel | 2 +- cmd/beacon-chain/jwt/jwt.go | 6 +- cmd/beacon-chain/jwt/jwt_test.go | 6 +- cmd/beacon-chain/main.go | 40 +- cmd/beacon-chain/sync/checkpoint/BUILD.bazel | 2 +- cmd/beacon-chain/sync/checkpoint/options.go | 4 +- cmd/beacon-chain/sync/genesis/BUILD.bazel | 2 +- cmd/beacon-chain/sync/genesis/options.go | 4 +- cmd/beacon-chain/usage.go | 12 +- cmd/beacon-chain/usage_test.go | 2 +- cmd/client-stats/BUILD.bazel | 2 +- cmd/client-stats/flags/BUILD.bazel | 2 +- cmd/client-stats/main.go | 14 +- cmd/client-stats/usage.go | 4 +- cmd/config.go | 4 +- cmd/config_test.go | 6 +- cmd/defaults.go | 2 +- cmd/flags.go | 2 +- cmd/flags/BUILD.bazel | 2 +- cmd/flags_test.go | 2 +- cmd/helpers.go | 2 +- cmd/helpers_test.go | 6 +- cmd/mock/BUILD.bazel | 2 +- cmd/prysmctl/BUILD.bazel | 2 +- cmd/prysmctl/checkpointsync/BUILD.bazel | 2 +- cmd/prysmctl/checkpointsync/download.go | 2 +- cmd/prysmctl/db/BUILD.bazel | 2 +- cmd/prysmctl/db/buckets.go | 2 +- cmd/prysmctl/db/query.go | 2 +- cmd/prysmctl/deprecated/BUILD.bazel | 2 +- .../deprecated/checkpoint/BUILD.bazel | 2 +- cmd/prysmctl/deprecated/cmd.go | 2 +- cmd/prysmctl/main.go | 14 +- cmd/prysmctl/p2p/BUILD.bazel | 2 +- cmd/prysmctl/p2p/client.go | 24 +- cmd/prysmctl/p2p/handler.go | 4 +- cmd/prysmctl/p2p/handshake.go | 10 +- cmd/prysmctl/p2p/mock_chain.go | 8 +- cmd/prysmctl/p2p/peers.go | 2 +- cmd/prysmctl/p2p/request_blocks.go | 18 +- cmd/prysmctl/testnet/BUILD.bazel | 2 +- cmd/prysmctl/testnet/generate_genesis.go | 24 +- cmd/prysmctl/testnet/generate_genesis_test.go | 8 +- cmd/prysmctl/validator/BUILD.bazel | 2 +- cmd/prysmctl/validator/cmd.go | 10 +- cmd/prysmctl/validator/withdraw.go | 8 +- cmd/prysmctl/validator/withdraw_test.go | 8 +- cmd/prysmctl/weaksubjectivity/BUILD.bazel | 2 +- cmd/prysmctl/weaksubjectivity/checkpoint.go | 2 +- cmd/validator/BUILD.bazel | 2 +- cmd/validator/accounts/BUILD.bazel | 2 +- cmd/validator/accounts/accounts.go | 8 +- cmd/validator/accounts/backup.go | 12 +- cmd/validator/accounts/backup_test.go | 18 +- cmd/validator/accounts/delete.go | 10 +- cmd/validator/accounts/delete_test.go | 20 +- cmd/validator/accounts/exit.go | 20 +- cmd/validator/accounts/exit_test.go | 12 +- cmd/validator/accounts/import.go | 18 +- cmd/validator/accounts/import_test.go | 16 +- cmd/validator/accounts/list.go | 8 +- cmd/validator/accounts/wallet_utils.go | 10 +- cmd/validator/accounts/wallet_utils_test.go | 12 +- cmd/validator/db/BUILD.bazel | 2 +- cmd/validator/db/db.go | 6 +- cmd/validator/flags/BUILD.bazel | 2 +- cmd/validator/flags/flags.go | 4 +- cmd/validator/flags/flags_test.go | 4 +- cmd/validator/main.go | 34 +- cmd/validator/slashing-protection/BUILD.bazel | 2 +- cmd/validator/slashing-protection/export.go | 12 +- cmd/validator/slashing-protection/import.go | 12 +- .../slashing-protection/import_export_test.go | 18 +- .../slashing-protection.go | 8 +- cmd/validator/usage.go | 8 +- cmd/validator/usage_test.go | 2 +- cmd/validator/wallet/BUILD.bazel | 2 +- cmd/validator/wallet/create.go | 12 +- cmd/validator/wallet/create_test.go | 18 +- cmd/validator/wallet/recover.go | 10 +- cmd/validator/wallet/recover_test.go | 14 +- cmd/validator/wallet/wallet.go | 8 +- cmd/validator/web/BUILD.bazel | 2 +- cmd/validator/web/web.go | 10 +- config/features/BUILD.bazel | 2 +- config/features/config.go | 4 +- config/features/config_test.go | 4 +- config/features/deprecated_flags_test.go | 2 +- config/fieldparams/BUILD.bazel | 2 +- config/fieldparams/common_test.go | 6 +- config/fieldparams/mainnet_test.go | 6 +- config/fieldparams/minimal_test.go | 6 +- config/params/BUILD.bazel | 2 +- config/params/config.go | 6 +- config/params/config_test.go | 2 +- config/params/configset.go | 2 +- config/params/configset_test.go | 4 +- config/params/loader.go | 4 +- config/params/loader_test.go | 8 +- config/params/mainnet_config.go | 4 +- config/params/minimal_config.go | 2 +- config/params/network_config.go | 2 +- config/params/testnet_config_test.go | 8 +- config/params/testnet_prater_config_test.go | 4 +- config/validator/service/BUILD.bazel | 2 +- config/validator/service/proposer-settings.go | 2 +- consensus-types/blocks/BUILD.bazel | 2 +- consensus-types/blocks/execution.go | 10 +- consensus-types/blocks/execution_test.go | 12 +- consensus-types/blocks/factory.go | 8 +- consensus-types/blocks/factory_test.go | 14 +- consensus-types/blocks/getters.go | 14 +- consensus-types/blocks/getters_test.go | 20 +- consensus-types/blocks/proto.go | 8 +- consensus-types/blocks/proto_test.go | 10 +- consensus-types/blocks/setters.go | 8 +- consensus-types/blocks/testing/BUILD.bazel | 2 +- consensus-types/blocks/testing/factory.go | 6 +- consensus-types/blocks/testing/mutator.go | 10 +- consensus-types/blocks/types.go | 10 +- consensus-types/interfaces/BUILD.bazel | 2 +- consensus-types/interfaces/beacon_block.go | 10 +- consensus-types/interfaces/utils.go | 2 +- consensus-types/interfaces/utils_test.go | 14 +- consensus-types/mock/BUILD.bazel | 2 +- consensus-types/mock/block.go | 10 +- consensus-types/payload-attribute/BUILD.bazel | 2 +- consensus-types/payload-attribute/getters.go | 6 +- .../payload-attribute/getters_test.go | 6 +- .../payload-attribute/interface.go | 2 +- consensus-types/payload-attribute/types.go | 6 +- consensus-types/primitives/BUILD.bazel | 2 +- consensus-types/primitives/epoch.go | 2 +- consensus-types/primitives/epoch_test.go | 6 +- consensus-types/primitives/slot.go | 2 +- consensus-types/primitives/slot_test.go | 4 +- consensus-types/primitives/sszbytes_test.go | 2 +- consensus-types/primitives/sszuint64_test.go | 2 +- consensus-types/wrapper/BUILD.bazel | 2 +- consensus-types/wrapper/metadata.go | 6 +- container/doubly-linked-list/BUILD.bazel | 2 +- container/doubly-linked-list/list_test.go | 4 +- container/leaky-bucket/BUILD.bazel | 2 +- container/queue/BUILD.bazel | 2 +- container/queue/priority_queue_test.go | 2 +- container/slice/BUILD.bazel | 2 +- container/slice/slice.go | 2 +- container/slice/slice_test.go | 6 +- container/thread-safe/BUILD.bazel | 2 +- container/thread-safe/map_test.go | 2 +- container/trie/BUILD.bazel | 2 +- container/trie/sparse_merkle.go | 8 +- container/trie/sparse_merkle_test.go | 18 +- .../trie/sparse_merkle_trie_fuzz_test.go | 10 +- contracts/deposit/BUILD.bazel | 2 +- contracts/deposit/contract_test.go | 10 +- contracts/deposit/deposit.go | 10 +- contracts/deposit/deposit_test.go | 16 +- contracts/deposit/deposit_tree_test.go | 12 +- contracts/deposit/mock/BUILD.bazel | 2 +- contracts/deposit/mock/mock.go | 2 +- crypto/bls/BUILD.bazel | 2 +- crypto/bls/bls.go | 6 +- crypto/bls/bls_test.go | 4 +- crypto/bls/blst/BUILD.bazel | 2 +- crypto/bls/blst/bls_benchmark_test.go | 6 +- crypto/bls/blst/public_key.go | 8 +- crypto/bls/blst/public_key_test.go | 8 +- crypto/bls/blst/secret_key.go | 6 +- crypto/bls/blst/secret_key_test.go | 10 +- crypto/bls/blst/signature.go | 6 +- crypto/bls/blst/signature_test.go | 6 +- crypto/bls/blst/stub.go | 2 +- crypto/bls/common/BUILD.bazel | 2 +- crypto/bls/common/constants.go | 2 +- crypto/bls/common/mock/BUILD.bazel | 2 +- crypto/bls/common/mock/interface_mock.go | 2 +- crypto/bls/herumi/BUILD.bazel | 2 +- crypto/bls/interface.go | 2 +- crypto/bls/signature_batch_test.go | 6 +- crypto/ecdsa/BUILD.bazel | 2 +- crypto/ecdsa/utils_test.go | 4 +- crypto/hash/BUILD.bazel | 2 +- crypto/hash/hash.go | 2 +- crypto/hash/hash_test.go | 14 +- crypto/hash/htr/BUILD.bazel | 2 +- crypto/keystore/BUILD.bazel | 2 +- crypto/keystore/key.go | 4 +- crypto/keystore/key_test.go | 6 +- crypto/keystore/keystore.go | 2 +- crypto/keystore/keystore_test.go | 8 +- crypto/keystore/utils.go | 4 +- crypto/rand/BUILD.bazel | 2 +- crypto/rand/rand.go | 4 +- deps.bzl | 22 +- encoding/bytesutil/BUILD.bazel | 2 +- encoding/bytesutil/bits_test.go | 6 +- encoding/bytesutil/bytes_test.go | 4 +- encoding/bytesutil/eth_types.go | 4 +- encoding/bytesutil/eth_types_test.go | 8 +- encoding/bytesutil/hex_test.go | 4 +- encoding/bytesutil/integers_test.go | 4 +- encoding/ssz/BUILD.bazel | 2 +- encoding/ssz/detect/BUILD.bazel | 2 +- encoding/ssz/detect/configfork.go | 24 +- encoding/ssz/detect/configfork_test.go | 22 +- encoding/ssz/detect/fieldspec.go | 2 +- encoding/ssz/detect/fieldspec_test.go | 2 +- encoding/ssz/equality/BUILD.bazel | 2 +- encoding/ssz/equality/deep_equal.go | 2 +- encoding/ssz/equality/deep_equal_test.go | 6 +- encoding/ssz/hashers_test.go | 6 +- encoding/ssz/helpers.go | 2 +- encoding/ssz/helpers_test.go | 6 +- encoding/ssz/htrutils.go | 8 +- encoding/ssz/htrutils_fuzz_test.go | 6 +- encoding/ssz/htrutils_test.go | 14 +- encoding/ssz/merkleize.go | 4 +- encoding/ssz/merkleize_test.go | 6 +- go.mod | 6 +- go.sum | 4 +- hack/update-go-pbs.sh | 2 +- hack/update-mockgen.sh | 20 +- io/file/BUILD.bazel | 2 +- io/file/fileutil.go | 2 +- io/file/fileutil_test.go | 8 +- io/logs/BUILD.bazel | 2 +- io/logs/logutil.go | 2 +- io/logs/logutil_test.go | 2 +- io/logs/stream.go | 6 +- io/logs/stream_test.go | 2 +- io/prompt/BUILD.bazel | 2 +- io/prompt/prompt.go | 2 +- io/prompt/validate_test.go | 4 +- math/BUILD.bazel | 2 +- math/math_helper_test.go | 4 +- monitoring/backup/BUILD.bazel | 2 +- monitoring/clientstats/BUILD.bazel | 2 +- monitoring/clientstats/scrapers.go | 2 +- monitoring/clientstats/scrapers_test.go | 2 +- monitoring/journald/BUILD.bazel | 2 +- monitoring/progress/BUILD.bazel | 2 +- monitoring/prometheus/BUILD.bazel | 2 +- .../prometheus/logrus_collector_test.go | 6 +- monitoring/prometheus/service.go | 2 +- monitoring/prometheus/service_test.go | 6 +- monitoring/tracing/BUILD.bazel | 2 +- monitoring/tracing/tracer.go | 2 +- network/BUILD.bazel | 2 +- network/auth_test.go | 4 +- network/authorization/BUILD.bazel | 2 +- network/endpoint.go | 2 +- network/endpoint_test.go | 6 +- network/external_ip_test.go | 6 +- network/forks/BUILD.bazel | 2 +- network/forks/fork.go | 12 +- network/forks/fork_test.go | 10 +- network/forks/ordered.go | 6 +- network/forks/ordered_test.go | 6 +- proto/engine/v1/BUILD.bazel | 4 +- proto/engine/v1/execution_engine.pb.go | 19 +- proto/engine/v1/execution_engine.proto | 4 +- proto/engine/v1/generated.ssz.go | 6 +- proto/engine/v1/json_marshal_unmarshal.go | 8 +- .../engine/v1/json_marshal_unmarshal_test.go | 12 +- proto/eth/ext/BUILD.bazel | 6 +- proto/eth/ext/options.pb.go | 5 +- proto/eth/ext/options.proto | 2 +- proto/eth/service/BUILD.bazel | 6 +- proto/eth/service/beacon_chain_service.pb.go | 9 +- .../eth/service/beacon_chain_service.pb.gw.go | 13 +- proto/eth/service/beacon_chain_service.proto | 2 +- proto/eth/service/beacon_debug_service.pb.go | 9 +- .../eth/service/beacon_debug_service.pb.gw.go | 13 +- proto/eth/service/beacon_debug_service.proto | 2 +- proto/eth/service/events_service.pb.go | 7 +- proto/eth/service/events_service.pb.gw.go | 11 +- proto/eth/service/events_service.proto | 2 +- proto/eth/service/key_management.pb.go | 7 +- proto/eth/service/key_management.pb.gw.go | 9 +- proto/eth/service/key_management.proto | 2 +- proto/eth/service/node_service.pb.go | 7 +- proto/eth/service/node_service.pb.gw.go | 11 +- proto/eth/service/node_service.proto | 2 +- proto/eth/service/validator_service.pb.go | 9 +- proto/eth/service/validator_service.pb.gw.go | 45 +- proto/eth/service/validator_service.proto | 2 +- proto/eth/v1/BUILD.bazel | 6 +- proto/eth/v1/attestation.pb.go | 43 +- proto/eth/v1/attestation.proto | 10 +- proto/eth/v1/beacon_block.pb.go | 59 ++- proto/eth/v1/beacon_block.proto | 14 +- proto/eth/v1/beacon_chain.pb.go | 107 +++-- proto/eth/v1/beacon_chain.proto | 26 +- proto/eth/v1/beacon_state.pb.go | 75 ++-- proto/eth/v1/beacon_state.proto | 18 +- proto/eth/v1/events.pb.go | 85 ++-- proto/eth/v1/events.proto | 20 +- proto/eth/v1/generated.ssz.go | 32 +- proto/eth/v1/node.pb.go | 27 +- proto/eth/v1/node.proto | 6 +- proto/eth/v1/validator.pb.go | 187 ++++---- proto/eth/v1/validator.proto | 46 +- proto/eth/v2/BUILD.bazel | 6 +- proto/eth/v2/beacon_block.pb.go | 95 ++-- proto/eth/v2/beacon_block.proto | 22 +- proto/eth/v2/beacon_chain.pb.go | 7 +- proto/eth/v2/beacon_chain.proto | 2 +- proto/eth/v2/beacon_state.pb.go | 63 ++- proto/eth/v2/beacon_state.proto | 14 +- proto/eth/v2/generated.ssz.go | 30 +- proto/eth/v2/ssz.pb.go | 7 +- proto/eth/v2/ssz.proto | 2 +- proto/eth/v2/sync_committee.pb.go | 51 ++- proto/eth/v2/sync_committee.proto | 12 +- proto/eth/v2/validator.pb.go | 99 ++-- proto/eth/v2/validator.proto | 24 +- proto/eth/v2/version.pb.go | 7 +- proto/eth/v2/version.proto | 2 +- proto/eth/v2/withdrawals.pb.go | 19 +- proto/eth/v2/withdrawals.proto | 4 +- proto/migration/BUILD.bazel | 2 +- proto/migration/enums.go | 4 +- proto/migration/enums_test.go | 4 +- proto/migration/v1alpha1_to_v1.go | 10 +- proto/migration/v1alpha1_to_v1_test.go | 18 +- proto/migration/v1alpha1_to_v2.go | 16 +- proto/migration/v1alpha1_to_v2_test.go | 18 +- proto/prysm/v1alpha1/BUILD.bazel | 6 +- proto/prysm/v1alpha1/attestation.pb.go | 43 +- proto/prysm/v1alpha1/attestation.proto | 10 +- proto/prysm/v1alpha1/attestation/BUILD.bazel | 2 +- .../attestation/aggregation/BUILD.bazel | 2 +- .../aggregation/attestations/BUILD.bazel | 2 +- .../aggregation/attestations/attestations.go | 6 +- .../attestations/attestations_test.go | 14 +- .../aggregation/attestations/maxcover.go | 6 +- .../aggregation/attestations/maxcover_test.go | 8 +- .../aggregation/maxcover_bench_test.go | 4 +- .../attestation/aggregation/maxcover_test.go | 4 +- .../aggregation/sync_contribution/BUILD.bazel | 2 +- .../sync_contribution/contribution.go | 4 +- .../aggregation/sync_contribution/naive.go | 6 +- .../sync_contribution/naive_test.go | 12 +- .../aggregation/testing/BUILD.bazel | 2 +- .../aggregation/testing/bitlistutils.go | 8 +- .../v1alpha1/attestation/attestation_utils.go | 10 +- .../attestation/attestation_utils_test.go | 14 +- proto/prysm/v1alpha1/beacon_block.pb.go | 141 +++--- proto/prysm/v1alpha1/beacon_block.proto | 34 +- proto/prysm/v1alpha1/beacon_chain.pb.go | 422 +++++++++--------- proto/prysm/v1alpha1/beacon_chain.pb.gw.go | 9 +- proto/prysm/v1alpha1/beacon_chain.proto | 106 ++--- proto/prysm/v1alpha1/beacon_state.pb.go | 93 ++-- proto/prysm/v1alpha1/beacon_state.proto | 22 +- proto/prysm/v1alpha1/blobs.pb.go | 21 +- proto/prysm/v1alpha1/blobs.proto | 4 +- proto/prysm/v1alpha1/cloners.go | 4 +- proto/prysm/v1alpha1/cloners_test.go | 6 +- proto/prysm/v1alpha1/debug.pb.go | 35 +- proto/prysm/v1alpha1/debug.pb.gw.go | 9 +- proto/prysm/v1alpha1/debug.proto | 8 +- .../finalized_block_root_container.pb.go | 7 +- .../finalized_block_root_container.proto | 2 +- proto/prysm/v1alpha1/generated.ssz.go | 90 ++-- proto/prysm/v1alpha1/health.pb.go | 7 +- proto/prysm/v1alpha1/health.pb.gw.go | 9 +- proto/prysm/v1alpha1/health.proto | 2 +- proto/prysm/v1alpha1/metadata/BUILD.bazel | 2 +- .../v1alpha1/metadata/metadata_interfaces.go | 2 +- proto/prysm/v1alpha1/node.pb.go | 9 +- proto/prysm/v1alpha1/node.pb.gw.go | 9 +- proto/prysm/v1alpha1/node.proto | 2 +- proto/prysm/v1alpha1/p2p_messages.pb.go | 43 +- proto/prysm/v1alpha1/p2p_messages.proto | 10 +- proto/prysm/v1alpha1/powchain.pb.go | 7 +- proto/prysm/v1alpha1/powchain.proto | 2 +- proto/prysm/v1alpha1/slasher.pb.go | 27 +- proto/prysm/v1alpha1/slasher.pb.gw.go | 9 +- proto/prysm/v1alpha1/slasher.proto | 6 +- proto/prysm/v1alpha1/slashings/BUILD.bazel | 2 +- .../prysm/v1alpha1/slashings/double_votes.go | 2 +- .../v1alpha1/slashings/double_votes_test.go | 2 +- .../v1alpha1/slashings/surround_votes.go | 2 +- .../v1alpha1/slashings/surround_votes_test.go | 4 +- proto/prysm/v1alpha1/swagger.proto | 2 +- proto/prysm/v1alpha1/sync_committee.pb.go | 43 +- proto/prysm/v1alpha1/sync_committee.proto | 10 +- .../v1alpha1/validator-client/BUILD.bazel | 6 +- .../validator-client/keymanager.pb.go | 37 +- .../validator-client/keymanager.pb.gw.go | 9 +- .../validator-client/keymanager.proto | 8 +- .../v1alpha1/validator-client/web_api.pb.go | 9 +- .../validator-client/web_api.pb.gw.go | 11 +- .../v1alpha1/validator-client/web_api.proto | 2 +- proto/prysm/v1alpha1/validator.pb.go | 251 ++++++----- proto/prysm/v1alpha1/validator.pb.gw.go | 9 +- proto/prysm/v1alpha1/validator.proto | 62 +-- proto/prysm/v1alpha1/withdrawals.pb.go | 19 +- proto/prysm/v1alpha1/withdrawals.proto | 4 +- proto/testing/BUILD.bazel | 4 +- proto/testing/tags_test.go | 8 +- proto/testing/test.pb.go | 5 +- runtime/BUILD.bazel | 2 +- runtime/debug/BUILD.bazel | 2 +- runtime/fdlimits/BUILD.bazel | 2 +- runtime/fdlimits/fdlimits_test.go | 4 +- runtime/interop/BUILD.bazel | 2 +- runtime/interop/generate_genesis_state.go | 22 +- .../generate_genesis_state_bellatrix.go | 14 +- .../generate_genesis_state_bellatrix_test.go | 12 +- .../interop/generate_genesis_state_test.go | 14 +- runtime/interop/generate_keys.go | 8 +- runtime/interop/generate_keys_test.go | 6 +- runtime/interop/premined_genesis_state.go | 10 +- .../logrus-prefixed-formatter/BUILD.bazel | 2 +- .../formatter_test.go | 12 +- runtime/maxprocs/BUILD.bazel | 2 +- runtime/messagehandler/BUILD.bazel | 2 +- runtime/messagehandler/messagehandler_test.go | 4 +- runtime/prereqs/BUILD.bazel | 2 +- runtime/prereqs/prereq_test.go | 2 +- runtime/service_registry_test.go | 4 +- runtime/tos/BUILD.bazel | 2 +- runtime/tos/tos.go | 6 +- runtime/tos/tos_test.go | 4 +- runtime/version/BUILD.bazel | 2 +- testing/assert/BUILD.bazel | 2 +- testing/assert/assertions.go | 2 +- testing/assertions/BUILD.bazel | 2 +- testing/assertions/assertions.go | 2 +- testing/assertions/assertions_test.go | 10 +- testing/benchmark/BUILD.bazel | 2 +- testing/benchmark/pregen.go | 8 +- testing/benchmark/pregen_test.go | 2 +- testing/bls/BUILD.bazel | 2 +- testing/bls/aggregate_test.go | 8 +- testing/bls/aggregate_verify_test.go | 10 +- testing/bls/batch_verify_test.go | 10 +- testing/bls/deserialization_G1_test.go | 8 +- testing/bls/deserialization_G2_test.go | 6 +- testing/bls/fast_aggregate_verify_test.go | 10 +- testing/bls/hash_to_G2_test.go | 4 +- testing/bls/sign_test.go | 8 +- testing/bls/utils/BUILD.bazel | 2 +- testing/bls/utils/utils.go | 4 +- testing/bls/verify_test.go | 8 +- testing/endtoend/component_handler_test.go | 10 +- testing/endtoend/components/BUILD.bazel | 2 +- testing/endtoend/components/beacon_node.go | 22 +- testing/endtoend/components/boot_node.go | 6 +- testing/endtoend/components/eth1/BUILD.bazel | 2 +- testing/endtoend/components/eth1/depositor.go | 14 +- .../components/eth1/depositor_test.go | 4 +- testing/endtoend/components/eth1/helpers.go | 4 +- testing/endtoend/components/eth1/miner.go | 14 +- testing/endtoend/components/eth1/node.go | 12 +- testing/endtoend/components/eth1/node_set.go | 6 +- testing/endtoend/components/eth1/proxy.go | 10 +- .../endtoend/components/eth1/transactions.go | 6 +- .../endtoend/components/lighthouse_beacon.go | 10 +- .../components/lighthouse_validator.go | 16 +- testing/endtoend/components/tracing_sink.go | 6 +- testing/endtoend/components/validator.go | 22 +- .../endtoend/components/web3remotesigner.go | 12 +- .../components/web3remotesigner_test.go | 8 +- testing/endtoend/endtoend_setup_test.go | 12 +- testing/endtoend/endtoend_test.go | 36 +- testing/endtoend/evaluators/BUILD.bazel | 2 +- .../evaluators/api_gateway_v1alpha1.go | 8 +- testing/endtoend/evaluators/api_middleware.go | 16 +- .../beaconapi_evaluators/BUILD.bazel | 2 +- .../beaconapi_evaluators/beacon_api.go | 16 +- .../beaconapi_evaluators/beacon_api_verify.go | 4 +- .../evaluators/beaconapi_evaluators/util.go | 2 +- testing/endtoend/evaluators/data.go | 6 +- .../endtoend/evaluators/execution_engine.go | 16 +- testing/endtoend/evaluators/fee_recipient.go | 16 +- testing/endtoend/evaluators/finality.go | 8 +- testing/endtoend/evaluators/fork.go | 16 +- testing/endtoend/evaluators/metrics.go | 14 +- testing/endtoend/evaluators/node.go | 10 +- testing/endtoend/evaluators/operations.go | 32 +- testing/endtoend/evaluators/peers.go | 6 +- testing/endtoend/evaluators/slashing.go | 26 +- testing/endtoend/evaluators/validator.go | 28 +- testing/endtoend/helpers/BUILD.bazel | 2 +- testing/endtoend/helpers/epochTimer.go | 2 +- testing/endtoend/helpers/helpers.go | 10 +- testing/endtoend/mainnet_e2e_test.go | 6 +- testing/endtoend/mainnet_scenario_e2e_test.go | 6 +- testing/endtoend/minimal_e2e_test.go | 4 +- testing/endtoend/minimal_scenario_e2e_test.go | 4 +- testing/endtoend/minimal_slashing_e2e_test.go | 10 +- testing/endtoend/params/BUILD.bazel | 2 +- testing/endtoend/params/params.go | 2 +- testing/endtoend/params/params_test.go | 4 +- testing/endtoend/policies/BUILD.bazel | 2 +- testing/endtoend/policies/policies.go | 2 +- .../endtoend/slasher_simulator_e2e_test.go | 22 +- testing/endtoend/types/BUILD.bazel | 2 +- testing/endtoend/types/fork.go | 4 +- testing/endtoend/types/types.go | 6 +- .../middleware/engine-api-proxy/BUILD.bazel | 2 +- testing/middleware/engine-api-proxy/proxy.go | 2 +- .../middleware/engine-api-proxy/proxy_test.go | 6 +- testing/mock/BUILD.bazel | 2 +- .../beacon_altair_validator_client_mock.go | 2 +- .../beacon_altair_validator_server_mock.go | 2 +- testing/mock/beacon_chain_service_mock.go | 4 +- testing/mock/beacon_service_mock.go | 4 +- testing/mock/beacon_validator_client_mock.go | 4 +- testing/mock/beacon_validator_server_mock.go | 4 +- testing/mock/event_service_mock.go | 6 +- testing/mock/keymanager_mock.go | 4 +- testing/mock/node_service_mock.go | 4 +- testing/mock/slasher_client_mock.go | 4 +- testing/mock/validator_client_mock.go | 6 +- testing/require/BUILD.bazel | 2 +- testing/require/requires.go | 2 +- testing/slasher/simulator/BUILD.bazel | 2 +- .../simulator/attestation_generator.go | 20 +- .../simulator/attestation_generator_test.go | 6 +- testing/slasher/simulator/block_generator.go | 16 +- .../slasher/simulator/block_generator_test.go | 2 +- testing/slasher/simulator/simulator.go | 28 +- testing/slasher/simulator/simulator_test.go | 16 +- .../spectest/general/phase0/bls/BUILD.bazel | 2 +- .../general/phase0/bls/aggregate_test.go | 10 +- .../phase0/bls/aggregate_verify_test.go | 12 +- .../phase0/bls/fast_aggregate_verify_test.go | 12 +- .../spectest/general/phase0/bls/sign_test.go | 10 +- .../general/phase0/bls/verify_test.go | 10 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_update_test.go | 2 +- .../inactivity_updates_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_flag_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../altair/epoch_processing/slashings_test.go | 2 +- .../mainnet/altair/finality/finality_test.go | 2 +- .../fork_helper/upgrade_to_altair_test.go | 2 +- .../altair/fork_transition/transition_test.go | 2 +- .../altair/forkchoice/forkchoice_test.go | 4 +- .../altair/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../altair/operations/block_header_test.go | 2 +- .../mainnet/altair/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../altair/operations/sync_committee_test.go | 2 +- .../altair/operations/voluntary_exit_test.go | 2 +- .../mainnet/altair/random/random_test.go | 2 +- .../mainnet/altair/rewards/rewards_test.go | 2 +- .../mainnet/altair/sanity/blocks_test.go | 2 +- .../mainnet/altair/sanity/slots_test.go | 2 +- .../altair/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_update_test.go | 2 +- .../inactivity_updates_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_flag_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../epoch_processing/slashings_test.go | 2 +- .../bellatrix/finality/finality_test.go | 2 +- .../fork_helper/upgrade_to_altair_test.go | 2 +- .../fork_transition/transition_test.go | 2 +- .../bellatrix/forkchoice/forkchoice_test.go | 4 +- .../bellatrix/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../bellatrix/operations/block_header_test.go | 2 +- .../bellatrix/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../operations/sync_committee_test.go | 2 +- .../operations/voluntary_exit_test.go | 2 +- .../mainnet/bellatrix/rewards/rewards_test.go | 2 +- .../mainnet/bellatrix/sanity/blocks_test.go | 2 +- .../mainnet/bellatrix/sanity/slots_test.go | 2 +- .../bellatrix/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_summaries_update_test.go | 2 +- .../inactivity_updates_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_flag_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../epoch_processing/slashings_test.go | 2 +- .../mainnet/capella/finality/finality_test.go | 2 +- .../fork_helper/upgrade_to_capella_test.go | 2 +- .../fork_transition/transition_test.go | 2 +- .../capella/forkchoice/forkchoice_test.go | 4 +- .../capella/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../capella/operations/block_header_test.go | 2 +- .../capella/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../capella/operations/sync_committee_test.go | 2 +- .../capella/operations/voluntary_exit_test.go | 2 +- .../mainnet/capella/rewards/rewards_test.go | 2 +- .../mainnet/capella/sanity/blocks_test.go | 2 +- .../mainnet/capella/sanity/slots_test.go | 2 +- .../capella/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/epoch_processing_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_update_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_record_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../phase0/epoch_processing/slashings_test.go | 2 +- .../mainnet/phase0/finality/finality_test.go | 2 +- .../phase0/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../phase0/operations/block_header_test.go | 2 +- .../mainnet/phase0/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../phase0/operations/voluntary_exit_test.go | 2 +- .../mainnet/phase0/random/random_test.go | 2 +- .../mainnet/phase0/rewards/rewards_test.go | 2 +- .../mainnet/phase0/sanity/blocks_test.go | 2 +- .../mainnet/phase0/sanity/slots_test.go | 2 +- .../shuffling/core/shuffle/shuffle_test.go | 2 +- .../phase0/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_update_test.go | 2 +- .../inactivity_updates_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_flag_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../altair/epoch_processing/slashings_test.go | 2 +- .../minimal/altair/finality/finality_test.go | 2 +- .../altair/fork/upgrade_to_altair_test.go | 2 +- .../altair/forkchoice/forkchoice_test.go | 4 +- .../altair/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../altair/operations/block_header_test.go | 2 +- .../minimal/altair/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../altair/operations/sync_committee_test.go | 2 +- .../altair/operations/voluntary_exit_test.go | 2 +- .../minimal/altair/random/random_test.go | 2 +- .../minimal/altair/rewards/rewards_test.go | 2 +- .../minimal/altair/sanity/blocks_test.go | 2 +- .../minimal/altair/sanity/slots_test.go | 2 +- .../altair/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_update_test.go | 2 +- .../inactivity_updates_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_flag_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../epoch_processing/slashings_test.go | 2 +- .../bellatrix/finality/finality_test.go | 2 +- .../bellatrix/fork/upgrade_to_altair_test.go | 2 +- .../bellatrix/forkchoice/forkchoice_test.go | 4 +- .../bellatrix/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../bellatrix/operations/block_header_test.go | 2 +- .../bellatrix/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../operations/sync_committee_test.go | 2 +- .../operations/voluntary_exit_test.go | 2 +- .../minimal/bellatrix/rewards/rewards_test.go | 2 +- .../minimal/bellatrix/sanity/blocks_test.go | 2 +- .../minimal/bellatrix/sanity/slots_test.go | 2 +- .../bellatrix/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_summaries_test.go | 2 +- .../inactivity_updates_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_flag_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../epoch_processing/slashings_test.go | 2 +- .../minimal/capella/finality/finality_test.go | 2 +- .../capella/fork/upgrade_to_capella_test.go | 2 +- .../capella/forkchoice/forkchoice_test.go | 4 +- .../capella/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../capella/operations/block_header_test.go | 2 +- .../bls_to_execution_change_test.go | 2 +- .../capella/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../capella/operations/sync_committee_test.go | 2 +- .../capella/operations/voluntary_exit_test.go | 2 +- .../capella/operations/withdrawals_test.go | 2 +- .../minimal/capella/rewards/rewards_test.go | 2 +- .../minimal/capella/sanity/blocks_test.go | 2 +- .../minimal/capella/sanity/slots_test.go | 2 +- .../capella/ssz_static/ssz_static_test.go | 2 +- .../effective_balance_updates_test.go | 2 +- .../epoch_processing/epoch_processing_test.go | 2 +- .../epoch_processing/eth1_data_reset_test.go | 2 +- .../historical_roots_update_test.go | 2 +- .../justification_and_finalization_test.go | 2 +- .../participation_record_updates_test.go | 2 +- .../randao_mixes_reset_test.go | 2 +- .../epoch_processing/registry_updates_test.go | 2 +- .../rewards_and_penalties_test.go | 2 +- .../epoch_processing/slashings_reset_test.go | 2 +- .../phase0/epoch_processing/slashings_test.go | 2 +- .../minimal/phase0/finality/finality_test.go | 2 +- .../phase0/operations/attestation_test.go | 2 +- .../operations/attester_slashing_test.go | 2 +- .../phase0/operations/block_header_test.go | 2 +- .../minimal/phase0/operations/deposit_test.go | 2 +- .../operations/proposer_slashing_test.go | 2 +- .../phase0/operations/voluntary_exit_test.go | 2 +- .../minimal/phase0/random/random_test.go | 2 +- .../minimal/phase0/rewards/rewards_test.go | 2 +- .../minimal/phase0/sanity/blocks_test.go | 2 +- .../minimal/phase0/sanity/slots_test.go | 2 +- .../shuffling/core/shuffle/shuffle_test.go | 2 +- .../phase0/ssz_static/ssz_static_test.go | 2 +- .../altair/epoch_processing/BUILD.bazel | 2 +- .../effective_balance_updates.go | 8 +- .../epoch_processing/eth1_data_reset.go | 8 +- .../shared/altair/epoch_processing/helpers.go | 10 +- .../historical_roots_update.go | 8 +- .../epoch_processing/inactivity_updates.go | 10 +- .../justification_and_finalization.go | 10 +- .../participation_flag_updates.go | 8 +- .../epoch_processing/randao_mixes_reset.go | 8 +- .../epoch_processing/registry_updates.go | 10 +- .../epoch_processing/rewards_and_penalties.go | 10 +- .../altair/epoch_processing/slashings.go | 12 +- .../epoch_processing/slashings_reset.go | 8 +- .../shared/altair/finality/BUILD.bazel | 2 +- .../shared/altair/finality/finality.go | 18 +- .../spectest/shared/altair/fork/BUILD.bazel | 2 +- .../spectest/shared/altair/fork/transition.go | 20 +- .../shared/altair/fork/upgrade_to_altair.go | 14 +- .../shared/altair/operations/BUILD.bazel | 2 +- .../shared/altair/operations/attestation.go | 16 +- .../altair/operations/attester_slashing.go | 16 +- .../shared/altair/operations/block_header.go | 14 +- .../shared/altair/operations/deposit.go | 14 +- .../shared/altair/operations/helpers.go | 16 +- .../altair/operations/proposer_slashing.go | 16 +- .../altair/operations/sync_committee.go | 14 +- .../altair/operations/voluntary_exit.go | 14 +- .../shared/altair/rewards/BUILD.bazel | 2 +- .../altair/rewards/rewards_penalties.go | 14 +- .../spectest/shared/altair/sanity/BUILD.bazel | 2 +- .../shared/altair/sanity/block_processing.go | 18 +- .../shared/altair/sanity/slot_processing.go | 12 +- .../shared/altair/ssz_static/BUILD.bazel | 2 +- .../shared/altair/ssz_static/ssz_static.go | 8 +- .../bellatrix/epoch_processing/BUILD.bazel | 2 +- .../effective_balance_updates.go | 8 +- .../epoch_processing/eth1_data_reset.go | 8 +- .../bellatrix/epoch_processing/helpers.go | 10 +- .../historical_roots_update.go | 8 +- .../epoch_processing/inactivity_updates.go | 10 +- .../justification_and_finalization.go | 10 +- .../participation_flag_updates.go | 8 +- .../epoch_processing/randao_mixes_reset.go | 8 +- .../epoch_processing/registry_updates.go | 10 +- .../epoch_processing/rewards_and_penalties.go | 10 +- .../bellatrix/epoch_processing/slashings.go | 12 +- .../epoch_processing/slashings_reset.go | 8 +- .../shared/bellatrix/finality/BUILD.bazel | 2 +- .../shared/bellatrix/finality/finality.go | 18 +- .../shared/bellatrix/fork/BUILD.bazel | 2 +- .../shared/bellatrix/fork/transition.go | 20 +- .../bellatrix/fork/upgrade_to_bellatrix.go | 14 +- .../shared/bellatrix/operations/BUILD.bazel | 2 +- .../bellatrix/operations/attestation.go | 16 +- .../bellatrix/operations/attester_slashing.go | 16 +- .../bellatrix/operations/block_header.go | 14 +- .../shared/bellatrix/operations/deposit.go | 14 +- .../shared/bellatrix/operations/helpers.go | 16 +- .../bellatrix/operations/proposer_slashing.go | 16 +- .../bellatrix/operations/sync_committee.go | 14 +- .../bellatrix/operations/voluntary_exit.go | 14 +- .../shared/bellatrix/rewards/BUILD.bazel | 2 +- .../bellatrix/rewards/rewards_penalties.go | 14 +- .../shared/bellatrix/sanity/BUILD.bazel | 2 +- .../bellatrix/sanity/block_processing.go | 18 +- .../bellatrix/sanity/slot_processing.go | 12 +- .../shared/bellatrix/ssz_static/BUILD.bazel | 2 +- .../shared/bellatrix/ssz_static/ssz_static.go | 10 +- .../capella/epoch_processing/BUILD.bazel | 2 +- .../effective_balance_updates.go | 8 +- .../epoch_processing/eth1_data_reset.go | 8 +- .../capella/epoch_processing/helpers.go | 10 +- .../historical_summaries_update.go | 8 +- .../epoch_processing/inactivity_updates.go | 10 +- .../justification_and_finalization.go | 10 +- .../participation_flag_updates.go | 8 +- .../epoch_processing/randao_mixes_reset.go | 8 +- .../epoch_processing/registry_updates.go | 10 +- .../epoch_processing/rewards_and_penalties.go | 10 +- .../capella/epoch_processing/slashings.go | 12 +- .../epoch_processing/slashings_reset.go | 8 +- .../shared/capella/finality/BUILD.bazel | 2 +- .../shared/capella/finality/finality.go | 18 +- .../spectest/shared/capella/fork/BUILD.bazel | 2 +- .../shared/capella/fork/transition.go | 20 +- .../shared/capella/fork/upgrade_to_capella.go | 14 +- .../shared/capella/operations/BUILD.bazel | 2 +- .../shared/capella/operations/attestation.go | 16 +- .../capella/operations/attester_slashing.go | 16 +- .../shared/capella/operations/block_header.go | 14 +- .../operations/bls_to_execution_changes.go | 14 +- .../shared/capella/operations/deposit.go | 14 +- .../shared/capella/operations/helpers.go | 16 +- .../capella/operations/proposer_slashing.go | 16 +- .../capella/operations/sync_committee.go | 14 +- .../capella/operations/voluntary_exit.go | 14 +- .../shared/capella/operations/withdrawals.go | 18 +- .../shared/capella/rewards/BUILD.bazel | 2 +- .../capella/rewards/rewards_penalties.go | 14 +- .../shared/capella/sanity/BUILD.bazel | 2 +- .../shared/capella/sanity/block_processing.go | 18 +- .../shared/capella/sanity/slot_processing.go | 12 +- .../shared/capella/ssz_static/BUILD.bazel | 2 +- .../shared/capella/ssz_static/ssz_static.go | 10 +- .../shared/common/forkchoice/BUILD.bazel | 2 +- .../shared/common/forkchoice/builder.go | 18 +- .../shared/common/forkchoice/builder_test.go | 8 +- .../shared/common/forkchoice/runner.go | 22 +- .../shared/common/forkchoice/service.go | 34 +- .../shared/common/ssz_static/BUILD.bazel | 2 +- .../shared/common/ssz_static/ssz_static.go | 6 +- .../ssz_static/ssz_static_example_test.go | 8 +- .../phase0/epoch_processing/BUILD.bazel | 2 +- .../effective_balance_updates.go | 8 +- .../epoch_processing/eth1_data_reset.go | 8 +- .../shared/phase0/epoch_processing/helpers.go | 10 +- .../historical_roots_update.go | 8 +- .../justification_and_finalization.go | 8 +- .../participation_record_updates.go | 8 +- .../epoch_processing/randao_mixes_reset.go | 8 +- .../epoch_processing/registry_updates.go | 10 +- .../epoch_processing/rewards_and_penalties.go | 10 +- .../phase0/epoch_processing/slashings.go | 14 +- .../epoch_processing/slashings_reset.go | 8 +- .../shared/phase0/finality/BUILD.bazel | 2 +- .../spectest/shared/phase0/finality/runner.go | 18 +- .../shared/phase0/operations/BUILD.bazel | 2 +- .../shared/phase0/operations/attestation.go | 14 +- .../phase0/operations/attester_slashing.go | 16 +- .../shared/phase0/operations/block_header.go | 14 +- .../shared/phase0/operations/deposit.go | 14 +- .../shared/phase0/operations/helpers.go | 16 +- .../phase0/operations/proposer_slashing.go | 16 +- .../phase0/operations/voluntary_exit.go | 14 +- .../shared/phase0/rewards/BUILD.bazel | 2 +- .../phase0/rewards/rewards_penalties.go | 14 +- .../spectest/shared/phase0/sanity/BUILD.bazel | 2 +- .../shared/phase0/sanity/block_processing.go | 18 +- .../shared/phase0/sanity/slot_processing.go | 12 +- .../phase0/shuffling/core/shuffle/BUILD.bazel | 2 +- .../phase0/shuffling/core/shuffle/shuffle.go | 10 +- .../core/shuffle/shuffle_test_format.go | 2 +- .../shared/phase0/ssz_static/BUILD.bazel | 2 +- .../shared/phase0/ssz_static/ssz_static.go | 8 +- testing/spectest/utils/BUILD.bazel | 2 +- testing/spectest/utils/config.go | 2 +- testing/spectest/utils/config_test.go | 6 +- testing/spectest/utils/utils.go | 2 +- testing/util/BUILD.bazel | 2 +- testing/util/altair.go | 32 +- testing/util/attestation.go | 28 +- testing/util/attestation_test.go | 10 +- testing/util/bellatrix.go | 26 +- testing/util/bellatrix_state.go | 20 +- testing/util/bellatrix_state_test.go | 4 +- testing/util/block.go | 38 +- testing/util/block_test.go | 24 +- testing/util/capella_block.go | 26 +- testing/util/capella_block_test.go | 12 +- testing/util/capella_state.go | 18 +- testing/util/deposits.go | 20 +- testing/util/deposits_test.go | 6 +- testing/util/helpers.go | 24 +- testing/util/helpers_test.go | 18 +- testing/util/merge.go | 4 +- testing/util/premine-state.go | 34 +- testing/util/state.go | 20 +- testing/util/state_test.go | 4 +- testing/util/sync_aggregate.go | 16 +- testing/util/sync_committee.go | 8 +- time/BUILD.bazel | 2 +- time/mclock/BUILD.bazel | 2 +- time/slots/BUILD.bazel | 2 +- time/slots/countdown.go | 4 +- time/slots/countdown_test.go | 6 +- time/slots/slotticker.go | 4 +- time/slots/slotticker_test.go | 2 +- time/slots/slottime.go | 8 +- time/slots/slottime_test.go | 10 +- time/slots/testing/BUILD.bazel | 2 +- time/slots/testing/mock.go | 2 +- time/slots/testing/mock_test.go | 2 +- tools/analyzers/comparesame/BUILD.bazel | 2 +- tools/analyzers/comparesame/analyzer_test.go | 2 +- tools/analyzers/cryptorand/BUILD.bazel | 2 +- tools/analyzers/cryptorand/analyzer_test.go | 2 +- tools/analyzers/errcheck/BUILD.bazel | 2 +- .../errcheck/embedded_walker_test.go | 4 +- tools/analyzers/featureconfig/BUILD.bazel | 2 +- tools/analyzers/gocognit/BUILD.bazel | 2 +- tools/analyzers/ineffassign/BUILD.bazel | 2 +- tools/analyzers/ineffassign/analyzer_test.go | 2 +- tools/analyzers/interfacechecker/BUILD.bazel | 2 +- tools/analyzers/logruswitherror/BUILD.bazel | 2 +- .../logruswitherror/analyzer_test.go | 2 +- tools/analyzers/maligned/BUILD.bazel | 2 +- tools/analyzers/nop/BUILD.bazel | 2 +- tools/analyzers/nop/analyzer_test.go | 2 +- tools/analyzers/properpermissions/BUILD.bazel | 2 +- .../properpermissions/analyzer_test.go | 2 +- tools/analyzers/recursivelock/BUILD.bazel | 2 +- .../analyzers/recursivelock/analyzer_test.go | 2 +- tools/analyzers/shadowpredecl/BUILD.bazel | 2 +- .../analyzers/shadowpredecl/analyzer_test.go | 2 +- tools/analyzers/slicedirect/BUILD.bazel | 2 +- tools/analyzers/slicedirect/analyzer_test.go | 2 +- tools/analyzers/uintcast/BUILD.bazel | 2 +- tools/analyzers/uintcast/analyzer_test.go | 4 +- tools/beacon-fuzz/BUILD.bazel | 2 +- tools/beacon-fuzz/main.go | 2 +- tools/benchmark-files-gen/BUILD.bazel | 2 +- tools/benchmark-files-gen/main.go | 28 +- tools/blocktree/BUILD.bazel | 2 +- tools/blocktree/main.go | 6 +- tools/bootnode/BUILD.bazel | 2 +- tools/bootnode/bootnode.go | 20 +- tools/bootnode/bootnode_test.go | 10 +- tools/enr-calculator/BUILD.bazel | 2 +- tools/enr-calculator/main.go | 6 +- tools/eth1exporter/BUILD.bazel | 2 +- tools/eth1exporter/main.go | 2 +- tools/eth1voting/BUILD.bazel | 2 +- tools/eth1voting/main.go | 12 +- tools/eth1voting/votes.go | 6 +- tools/exploredb/BUILD.bazel | 2 +- tools/exploredb/main.go | 12 +- tools/extractor/BUILD.bazel | 2 +- tools/extractor/main.go | 8 +- tools/forkchecker/BUILD.bazel | 2 +- tools/forkchecker/forkchecker.go | 6 +- tools/gocovmerge/BUILD.bazel | 2 +- tools/http-request-sink/BUILD.bazel | 2 +- tools/http-request-sink/main.go | 2 +- tools/http-request-sink/main_test.go | 4 +- tools/interop/convert-keys/BUILD.bazel | 2 +- tools/interop/convert-keys/main.go | 2 +- tools/interop/export-genesis/BUILD.bazel | 2 +- tools/interop/export-genesis/main.go | 4 +- tools/interop/split-keys/BUILD.bazel | 2 +- tools/interop/split-keys/main.go | 10 +- tools/interop/split-keys/main_test.go | 8 +- tools/keystores/BUILD.bazel | 2 +- tools/keystores/main.go | 8 +- tools/keystores/main_test.go | 10 +- tools/pcli/BUILD.bazel | 2 +- tools/pcli/main.go | 14 +- tools/replay-http/BUILD.bazel | 2 +- tools/specs-checker/BUILD.bazel | 2 +- tools/unencrypted-keys-gen/BUILD.bazel | 2 +- tools/unencrypted-keys-gen/keygen/BUILD.bazel | 2 +- tools/unencrypted-keys-gen/main.go | 6 +- tools/unencrypted-keys-gen/main_test.go | 6 +- validator/accounts/BUILD.bazel | 2 +- validator/accounts/accounts.go | 2 +- validator/accounts/accounts_backup.go | 4 +- validator/accounts/accounts_delete.go | 6 +- validator/accounts/accounts_exit.go | 16 +- validator/accounts/accounts_exit_test.go | 8 +- validator/accounts/accounts_helper.go | 14 +- validator/accounts/accounts_import.go | 14 +- validator/accounts/accounts_import_test.go | 18 +- validator/accounts/accounts_list.go | 8 +- validator/accounts/accounts_list_test.go | 24 +- validator/accounts/cli_manager.go | 18 +- validator/accounts/cli_options.go | 6 +- validator/accounts/iface/BUILD.bazel | 2 +- validator/accounts/iface/wallet.go | 4 +- validator/accounts/petnames/BUILD.bazel | 2 +- validator/accounts/petnames/names.go | 4 +- validator/accounts/testing/BUILD.bazel | 2 +- validator/accounts/testing/mock.go | 12 +- validator/accounts/userprompt/BUILD.bazel | 2 +- validator/accounts/userprompt/prompt.go | 6 +- validator/accounts/wallet/BUILD.bazel | 2 +- validator/accounts/wallet/wallet.go | 20 +- validator/accounts/wallet/wallet_test.go | 12 +- validator/accounts/wallet_create.go | 10 +- validator/accounts/wallet_recover.go | 6 +- .../accounts/wallet_recover_fuzz_test.go | 2 +- validator/client/BUILD.bazel | 2 +- validator/client/aggregate.go | 20 +- validator/client/aggregate_test.go | 20 +- validator/client/attest.go | 30 +- validator/client/attest_protect.go | 10 +- validator/client/attest_protect_test.go | 12 +- validator/client/attest_test.go | 30 +- validator/client/beacon-api/BUILD.bazel | 2 +- validator/client/beacon-api/activation.go | 6 +- .../client/beacon-api/activation_test.go | 12 +- .../client/beacon-api/attestation_data.go | 6 +- .../beacon-api/attestation_data_test.go | 10 +- .../client/beacon-api/beacon_api_helpers.go | 6 +- .../beacon-api/beacon_api_helpers_test.go | 12 +- .../beacon-api/beacon_api_validator_client.go | 8 +- .../beacon_api_validator_client_test.go | 16 +- .../beacon-api/beacon_block_converter.go | 10 +- .../beacon-api/beacon_block_converter_test.go | 8 +- .../beacon-api/beacon_block_json_helpers.go | 6 +- .../beacon_block_json_helpers_test.go | 8 +- .../beacon-api/beacon_block_proto_helpers.go | 8 +- .../beacon_block_proto_helpers_test.go | 10 +- validator/client/beacon-api/domain_data.go | 8 +- .../client/beacon-api/domain_data_test.go | 12 +- validator/client/beacon-api/doppelganger.go | 8 +- .../client/beacon-api/doppelganger_test.go | 12 +- validator/client/beacon-api/duties.go | 8 +- validator/client/beacon-api/duties_test.go | 14 +- validator/client/beacon-api/genesis.go | 6 +- validator/client/beacon-api/genesis_test.go | 10 +- .../client/beacon-api/get_beacon_block.go | 6 +- .../beacon-api/get_beacon_block_test.go | 14 +- validator/client/beacon-api/index.go | 4 +- validator/client/beacon-api/index_test.go | 12 +- .../client/beacon-api/json_rest_handler.go | 2 +- .../beacon-api/json_rest_handler_test.go | 8 +- validator/client/beacon-api/mock/BUILD.bazel | 2 +- .../mock/beacon_block_converter_mock.go | 4 +- .../client/beacon-api/mock/duties_mock.go | 4 +- .../client/beacon-api/mock/genesis_mock.go | 4 +- .../beacon-api/mock/json_rest_handler_mock.go | 2 +- .../beacon-api/mock/state_validators_mock.go | 2 +- .../beacon-api/prepare_beacon_proposer.go | 4 +- .../prepare_beacon_proposer_test.go | 10 +- .../client/beacon-api/propose_attestation.go | 2 +- .../beacon-api/propose_attestation_test.go | 10 +- .../client/beacon-api/propose_beacon_block.go | 6 +- .../propose_beacon_block_altair_test.go | 12 +- .../propose_beacon_block_bellatrix_test.go | 14 +- ...ose_beacon_block_blinded_bellatrix_test.go | 16 +- ...opose_beacon_block_blinded_capella_test.go | 16 +- .../propose_beacon_block_capella_test.go | 14 +- .../propose_beacon_block_phase0_test.go | 12 +- .../beacon-api/propose_beacon_block_test.go | 8 +- validator/client/beacon-api/propose_exit.go | 4 +- .../client/beacon-api/propose_exit_test.go | 10 +- validator/client/beacon-api/registration.go | 4 +- .../client/beacon-api/registration_test.go | 10 +- .../client/beacon-api/state_validators.go | 2 +- .../beacon-api/state_validators_test.go | 8 +- validator/client/beacon-api/status.go | 6 +- validator/client/beacon-api/status_test.go | 14 +- validator/client/beacon-api/stream_blocks.go | 6 +- .../client/beacon-api/stream_blocks_test.go | 12 +- .../submit_aggregate_selection_proof.go | 10 +- .../submit_aggregate_selection_proof_test.go | 18 +- .../submit_signed_aggregate_proof.go | 4 +- .../submit_signed_aggregate_proof_test.go | 12 +- .../submit_signed_contribution_and_proof.go | 4 +- ...bmit_signed_contribution_and_proof_test.go | 10 +- .../beacon-api/subscribe_committee_subnets.go | 8 +- .../subscribe_committee_subnets_test.go | 14 +- validator/client/beacon-api/sync_committee.go | 8 +- .../client/beacon-api/sync_committee_test.go | 14 +- .../beacon-api/test-helpers/BUILD.bazel | 2 +- .../altair_beacon_block_test_helpers.go | 4 +- .../bellatrix_beacon_block_test_helpers.go | 8 +- .../capella_beacon_block_test_helpers.go | 8 +- .../phase0_beacon_block_test_helpers.go | 4 +- .../beacon-api/wait_for_chain_start_test.go | 10 +- validator/client/grpc-api/BUILD.bazel | 2 +- .../client/grpc-api/grpc_validator_client.go | 6 +- .../grpc-api/grpc_validator_client_test.go | 4 +- validator/client/iface/BUILD.bazel | 2 +- validator/client/iface/validator.go | 14 +- validator/client/iface/validator_client.go | 4 +- validator/client/key_reload.go | 4 +- validator/client/key_reload_test.go | 14 +- validator/client/log.go | 6 +- validator/client/metrics.go | 12 +- validator/client/metrics_test.go | 14 +- validator/client/propose.go | 32 +- validator/client/propose_protect.go | 8 +- validator/client/propose_protect_test.go | 18 +- validator/client/propose_test.go | 36 +- validator/client/registration.go | 14 +- validator/client/registration_test.go | 12 +- validator/client/runner.go | 14 +- validator/client/runner_test.go | 18 +- validator/client/service.go | 36 +- validator/client/service_test.go | 6 +- .../slashing_protection_interchange_test.go | 14 +- validator/client/sync_committee.go | 20 +- validator/client/sync_committee_test.go | 14 +- validator/client/testutil/BUILD.bazel | 2 +- validator/client/testutil/helper.go | 6 +- validator/client/testutil/mock_validator.go | 14 +- .../validator-client-factory/BUILD.bazel | 2 +- .../validator_client_factory.go | 10 +- validator/client/validator.go | 44 +- validator/client/validator_test.go | 44 +- validator/client/wait_for_activation.go | 14 +- validator/client/wait_for_activation_test.go | 18 +- validator/db/BUILD.bazel | 2 +- validator/db/alias.go | 2 +- validator/db/iface/BUILD.bazel | 4 +- validator/db/iface/interface.go | 10 +- validator/db/kv/BUILD.bazel | 2 +- validator/db/kv/attester_protection.go | 12 +- validator/db/kv/attester_protection_test.go | 12 +- validator/db/kv/backup.go | 4 +- validator/db/kv/backup_test.go | 6 +- validator/db/kv/db.go | 12 +- .../db/kv/deprecated_attester_protection.go | 8 +- .../kv/deprecated_attester_protection_test.go | 10 +- validator/db/kv/eip_blacklisted_keys.go | 2 +- validator/db/kv/eip_blacklisted_keys_test.go | 6 +- validator/db/kv/genesis_test.go | 6 +- validator/db/kv/graffiti.go | 2 +- validator/db/kv/graffiti_test.go | 6 +- validator/db/kv/kv_test.go | 4 +- .../migration_optimal_attester_protection.go | 10 +- ...ration_optimal_attester_protection_test.go | 8 +- .../migration_source_target_epochs_bucket.go | 2 +- ...ration_source_target_epochs_bucket_test.go | 6 +- validator/db/kv/proposer_protection.go | 10 +- validator/db/kv/proposer_protection_test.go | 12 +- validator/db/kv/prune_attester_protection.go | 6 +- .../db/kv/prune_attester_protection_test.go | 10 +- validator/db/migrate.go | 6 +- validator/db/migrate_test.go | 8 +- validator/db/restore.go | 8 +- validator/db/restore_test.go | 10 +- validator/db/testing/BUILD.bazel | 2 +- validator/db/testing/setup_db.go | 6 +- validator/db/testing/setup_db_test.go | 4 +- validator/graffiti/BUILD.bazel | 2 +- validator/graffiti/parse_graffiti.go | 4 +- validator/graffiti/parse_graffiti_test.go | 8 +- validator/helpers/BUILD.bazel | 2 +- validator/keymanager/BUILD.bazel | 2 +- validator/keymanager/derived/BUILD.bazel | 2 +- validator/keymanager/derived/eip_test.go | 6 +- validator/keymanager/derived/keymanager.go | 16 +- .../keymanager/derived/keymanager_test.go | 16 +- validator/keymanager/derived/mnemonic.go | 4 +- validator/keymanager/derived/mnemonic_test.go | 4 +- validator/keymanager/local/BUILD.bazel | 2 +- validator/keymanager/local/backup.go | 6 +- validator/keymanager/local/backup_test.go | 10 +- validator/keymanager/local/delete.go | 6 +- validator/keymanager/local/delete_test.go | 12 +- validator/keymanager/local/import.go | 6 +- validator/keymanager/local/import_test.go | 12 +- validator/keymanager/local/keymanager.go | 18 +- validator/keymanager/local/keymanager_test.go | 16 +- validator/keymanager/local/refresh.go | 14 +- validator/keymanager/local/refresh_test.go | 12 +- .../keymanager/remote-web3signer/BUILD.bazel | 2 +- .../remote-web3signer/internal/BUILD.bazel | 2 +- .../remote-web3signer/internal/client.go | 8 +- .../remote-web3signer/internal/client_test.go | 4 +- .../remote-web3signer/keymanager.go | 20 +- .../remote-web3signer/keymanager_test.go | 16 +- .../remote-web3signer/v1/BUILD.bazel | 2 +- .../remote-web3signer/v1/custom_mappers.go | 8 +- .../v1/custom_mappers_test.go | 10 +- .../remote-web3signer/v1/mock/BUILD.bazel | 2 +- .../remote-web3signer/v1/mock/mocks.go | 10 +- .../remote-web3signer/v1/requests.go | 6 +- .../remote-web3signer/v1/requests_test.go | 10 +- validator/keymanager/types.go | 10 +- validator/keymanager/types_test.go | 12 +- validator/node/BUILD.bazel | 2 +- validator/node/node.go | 62 +-- validator/node/node_test.go | 20 +- validator/rpc/BUILD.bazel | 2 +- validator/rpc/accounts.go | 18 +- validator/rpc/accounts_test.go | 26 +- validator/rpc/apimiddleware/BUILD.bazel | 2 +- .../rpc/apimiddleware/endpoint_factory.go | 2 +- validator/rpc/apimiddleware/structs_test.go | 6 +- validator/rpc/auth_token.go | 8 +- validator/rpc/auth_token_test.go | 2 +- validator/rpc/beacon.go | 12 +- validator/rpc/beacon_test.go | 10 +- validator/rpc/health.go | 6 +- validator/rpc/health_test.go | 8 +- validator/rpc/intercepter_test.go | 2 +- validator/rpc/server.go | 20 +- validator/rpc/server_test.go | 2 +- validator/rpc/slashing.go | 4 +- validator/rpc/slashing_test.go | 14 +- validator/rpc/standard_api.go | 20 +- validator/rpc/standard_api_test.go | 44 +- validator/rpc/wallet.go | 14 +- validator/rpc/wallet_test.go | 30 +- .../slashing-protection-history/BUILD.bazel | 2 +- .../slashing-protection-history/export.go | 12 +- .../export_test.go | 12 +- .../format/BUILD.bazel | 2 +- .../slashing-protection-history/helpers.go | 4 +- .../helpers_test.go | 4 +- .../slashing-protection-history/import.go | 16 +- .../import_test.go | 18 +- .../round_trip_test.go | 16 +- validator/testing/BUILD.bazel | 2 +- validator/testing/mock_protector.go | 2 +- validator/testing/mock_slasher.go | 2 +- validator/testing/protection_history.go | 16 +- validator/web/BUILD.bazel | 2 +- validator/web/handler_test.go | 2 +- 2182 files changed, 11207 insertions(+), 11242 deletions(-) diff --git a/.deepsource.toml b/.deepsource.toml index f064f47a3f26..45389f43e42b 100644 --- a/.deepsource.toml +++ b/.deepsource.toml @@ -11,7 +11,7 @@ name = "go" enabled = true [analyzers.meta] -import_paths = ["github.com/prysmaticlabs/prysm/v3"] +import_paths = ["github.com/prysmaticlabs/prysm/v4"] [[analyzers]] name = "test-coverage" diff --git a/BUILD.bazel b/BUILD.bazel index 8adfcd2be857..b131104ac87d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -12,7 +12,7 @@ exports_files([ "LICENSE.md", ]) -# gazelle:prefix github.com/prysmaticlabs/prysm/v3 +# gazelle:prefix github.com/prysmaticlabs/prysm/v4 # gazelle:map_kind go_library go_library @prysm//tools/go:def.bzl # gazelle:map_kind go_test go_test @prysm//tools/go:def.bzl # gazelle:map_kind go_repository go_repository @prysm//tools/go:def.bzl diff --git a/api/client/beacon/BUILD.bazel b/api/client/beacon/BUILD.bazel index 0378f357f59a..1002b730252d 100644 --- a/api/client/beacon/BUILD.bazel +++ b/api/client/beacon/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "doc.go", "errors.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/api/client/beacon", + importpath = "github.com/prysmaticlabs/prysm/v4/api/client/beacon", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/api/client/beacon/checkpoint.go b/api/client/beacon/checkpoint.go index f45e5d59006f..9182da7e0431 100644 --- a/api/client/beacon/checkpoint.go +++ b/api/client/beacon/checkpoint.go @@ -6,14 +6,14 @@ import ( "path" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" "golang.org/x/mod/semver" ) diff --git a/api/client/beacon/checkpoint_test.go b/api/client/beacon/checkpoint_test.go index 32ec81ac1fb7..3cfd10b9a233 100644 --- a/api/client/beacon/checkpoint_test.go +++ b/api/client/beacon/checkpoint_test.go @@ -10,21 +10,21 @@ import ( "net/url" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - blocktest "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" - - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + blocktest "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" + + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type testRT struct { diff --git a/api/client/beacon/client.go b/api/client/beacon/client.go index 5b30a83fd989..7876c6b8f3b7 100644 --- a/api/client/beacon/client.go +++ b/api/client/beacon/client.go @@ -16,15 +16,15 @@ import ( "text/template" "time" - "github.com/prysmaticlabs/prysm/v3/network/forks" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/network/forks" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" log "github.com/sirupsen/logrus" ) diff --git a/api/client/beacon/client_test.go b/api/client/beacon/client_test.go index 107957fa4fc1..aaf67b218bdf 100644 --- a/api/client/beacon/client_test.go +++ b/api/client/beacon/client_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestParseNodeVersion(t *testing.T) { diff --git a/api/client/builder/BUILD.bazel b/api/client/builder/BUILD.bazel index e060d95e7ab2..8d0ee150c472 100644 --- a/api/client/builder/BUILD.bazel +++ b/api/client/builder/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "errors.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/api/client/builder", + importpath = "github.com/prysmaticlabs/prysm/v4/api/client/builder", visibility = ["//visibility:public"], deps = [ "//consensus-types/blocks:go_default_library", diff --git a/api/client/builder/bid.go b/api/client/builder/bid.go index 7ec0f2813571..10eee69a4b03 100644 --- a/api/client/builder/bid.go +++ b/api/client/builder/bid.go @@ -4,11 +4,11 @@ import ( "math/big" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SignedBid is an interface describing the method set of a signed builder bid. diff --git a/api/client/builder/client.go b/api/client/builder/client.go index c33a2c6359bc..223003c00817 100644 --- a/api/client/builder/client.go +++ b/api/client/builder/client.go @@ -15,14 +15,14 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/network/authorization" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/network/authorization" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" log "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/api/client/builder/client_test.go b/api/client/builder/client_test.go index e952a164a175..4788298eba6b 100644 --- a/api/client/builder/client_test.go +++ b/api/client/builder/client_test.go @@ -13,14 +13,14 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + types "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type roundtrip func(*http.Request) (*http.Response, error) diff --git a/api/client/builder/testing/BUILD.bazel b/api/client/builder/testing/BUILD.bazel index 9a3f015b528f..81aa66919cdb 100644 --- a/api/client/builder/testing/BUILD.bazel +++ b/api/client/builder/testing/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/api/client/builder/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/api/client/builder/testing", visibility = ["//visibility:public"], deps = [ "//api/client/builder:go_default_library", diff --git a/api/client/builder/testing/mock.go b/api/client/builder/testing/mock.go index c45850aa462e..fad2611a7c1e 100644 --- a/api/client/builder/testing/mock.go +++ b/api/client/builder/testing/mock.go @@ -3,11 +3,11 @@ package testing import ( "context" - "github.com/prysmaticlabs/prysm/v3/api/client/builder" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/api/client/builder" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // MockClient is a mock implementation of BuilderClient. diff --git a/api/client/builder/types.go b/api/client/builder/types.go index a4f27673298d..eb085c0964fd 100644 --- a/api/client/builder/types.go +++ b/api/client/builder/types.go @@ -8,10 +8,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + types "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type SignedValidatorRegistration struct { diff --git a/api/client/builder/types_test.go b/api/client/builder/types_test.go index 3d62ce87da1d..bc7e753cc766 100644 --- a/api/client/builder/types_test.go +++ b/api/client/builder/types_test.go @@ -14,10 +14,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/protobuf/proto" "github.com/prysmaticlabs/go-bitfield" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func ezDecode(t *testing.T, s string) []byte { diff --git a/api/gateway/BUILD.bazel b/api/gateway/BUILD.bazel index 958c62cd2fd5..893b6092651a 100644 --- a/api/gateway/BUILD.bazel +++ b/api/gateway/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "modifiers.go", "options.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/api/gateway", + importpath = "github.com/prysmaticlabs/prysm/v4/api/gateway", visibility = [ "//beacon-chain:__subpackages__", "//validator:__subpackages__", diff --git a/api/gateway/apimiddleware/BUILD.bazel b/api/gateway/apimiddleware/BUILD.bazel index 095d9b7ff58c..0df942092bd1 100644 --- a/api/gateway/apimiddleware/BUILD.bazel +++ b/api/gateway/apimiddleware/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "process_request.go", "structs.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware", + importpath = "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware", visibility = ["//visibility:public"], deps = [ "//api/grpc:go_default_library", diff --git a/api/gateway/apimiddleware/param_handling.go b/api/gateway/apimiddleware/param_handling.go index bc70f829efea..ca7cb716b6ad 100644 --- a/api/gateway/apimiddleware/param_handling.go +++ b/api/gateway/apimiddleware/param_handling.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/gorilla/mux" - butil "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + butil "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" "github.com/wealdtech/go-bytesutil" ) diff --git a/api/gateway/apimiddleware/param_handling_test.go b/api/gateway/apimiddleware/param_handling_test.go index d97791c9820f..4c9164ac8fbc 100644 --- a/api/gateway/apimiddleware/param_handling_test.go +++ b/api/gateway/apimiddleware/param_handling_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestHandleURLParameters(t *testing.T) { diff --git a/api/gateway/apimiddleware/process_request.go b/api/gateway/apimiddleware/process_request.go index e195942c1eda..aab9516995de 100644 --- a/api/gateway/apimiddleware/process_request.go +++ b/api/gateway/apimiddleware/process_request.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/grpc" + "github.com/prysmaticlabs/prysm/v4/api/grpc" ) // DeserializeRequestBodyIntoContainer deserializes the request's body into an endpoint-specific struct. diff --git a/api/gateway/apimiddleware/process_request_test.go b/api/gateway/apimiddleware/process_request_test.go index fec8b3fc66a7..b1ed54eb316d 100644 --- a/api/gateway/apimiddleware/process_request_test.go +++ b/api/gateway/apimiddleware/process_request_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus/hooks/test" ) diff --git a/api/gateway/gateway.go b/api/gateway/gateway.go index f768b4fc432e..efe1c9d9680e 100644 --- a/api/gateway/gateway.go +++ b/api/gateway/gateway.go @@ -13,8 +13,8 @@ import ( "github.com/gorilla/mux" gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/runtime" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/runtime" "github.com/rs/cors" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" diff --git a/api/gateway/gateway_test.go b/api/gateway/gateway_test.go index 804e1370e634..bba4883ccdff 100644 --- a/api/gateway/gateway_test.go +++ b/api/gateway/gateway_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/api/gateway/options.go b/api/gateway/options.go index 236bfd73ede2..cc5e5a8842b3 100644 --- a/api/gateway/options.go +++ b/api/gateway/options.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/mux" gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" ) type Option func(g *Gateway) error diff --git a/api/grpc/BUILD.bazel b/api/grpc/BUILD.bazel index 8abbd0381f87..032fd1c3d1c2 100644 --- a/api/grpc/BUILD.bazel +++ b/api/grpc/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "grpcutils.go", "parameters.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/api/grpc", + importpath = "github.com/prysmaticlabs/prysm/v4/api/grpc", visibility = ["//visibility:public"], deps = [ "@com_github_sirupsen_logrus//:go_default_library", diff --git a/api/grpc/grpcutils_test.go b/api/grpc/grpcutils_test.go index a2b72f19cd2a..bea19083aed4 100644 --- a/api/grpc/grpcutils_test.go +++ b/api/grpc/grpcutils_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/api/pagination/BUILD.bazel b/api/pagination/BUILD.bazel index feba61052e87..5596f298c8e1 100644 --- a/api/pagination/BUILD.bazel +++ b/api/pagination/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["pagination.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/api/pagination", + importpath = "github.com/prysmaticlabs/prysm/v4/api/pagination", visibility = ["//visibility:public"], deps = [ "//config/params:go_default_library", diff --git a/api/pagination/pagination.go b/api/pagination/pagination.go index bb95443c5760..40bb1ee88dfc 100644 --- a/api/pagination/pagination.go +++ b/api/pagination/pagination.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) // StartAndEndPage takes in the requested page token, wanted page size, total page size. diff --git a/api/pagination/pagination_test.go b/api/pagination/pagination_test.go index 767a0b982a2b..daca9c28ab46 100644 --- a/api/pagination/pagination_test.go +++ b/api/pagination/pagination_test.go @@ -3,9 +3,9 @@ package pagination_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/api/pagination" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/api/pagination" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStartAndEndPage(t *testing.T) { diff --git a/async/BUILD.bazel b/async/BUILD.bazel index da27a596fe83..06c515c017ad 100644 --- a/async/BUILD.bazel +++ b/async/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "multilock.go", "scatter.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/async", + importpath = "github.com/prysmaticlabs/prysm/v4/async", visibility = ["//visibility:public"], deps = ["@com_github_sirupsen_logrus//:go_default_library"], ) diff --git a/async/abool/BUILD.bazel b/async/abool/BUILD.bazel index 2a6f1c960311..48143545911f 100644 --- a/async/abool/BUILD.bazel +++ b/async/abool/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["abool.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/async/abool", + importpath = "github.com/prysmaticlabs/prysm/v4/async/abool", visibility = ["//visibility:public"], ) diff --git a/async/benchmark_test.go b/async/benchmark_test.go index 1ddfeba0f3b2..3c7c8cca37cc 100644 --- a/async/benchmark_test.go +++ b/async/benchmark_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/testing/require" log "github.com/sirupsen/logrus" ) diff --git a/async/debounce_test.go b/async/debounce_test.go index 1a5f9b2ee87f..307e539616e5 100644 --- a/async/debounce_test.go +++ b/async/debounce_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestDebounce_NoEvents(t *testing.T) { diff --git a/async/event/BUILD.bazel b/async/event/BUILD.bazel index b9a1f058e48e..44d8f8eecd89 100644 --- a/async/event/BUILD.bazel +++ b/async/event/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "feed.go", "subscription.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/async/event", + importpath = "github.com/prysmaticlabs/prysm/v4/async/event", visibility = ["//visibility:public"], deps = ["//time/mclock:go_default_library"], ) diff --git a/async/event/example_feed_test.go b/async/event/example_feed_test.go index 402aeb2b328e..ff1e88e18498 100644 --- a/async/event/example_feed_test.go +++ b/async/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/async/event" + "github.com/prysmaticlabs/prysm/v4/async/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/async/event/example_scope_test.go b/async/event/example_scope_test.go index fb6b80b3cb41..8b2e1943780f 100644 --- a/async/event/example_scope_test.go +++ b/async/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/prysmaticlabs/prysm/v3/async/event" + "github.com/prysmaticlabs/prysm/v4/async/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/async/event/example_subscription_test.go b/async/event/example_subscription_test.go index df04607ca8e0..08c4652d696e 100644 --- a/async/event/example_subscription_test.go +++ b/async/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/async/event" + "github.com/prysmaticlabs/prysm/v4/async/event" ) func ExampleNewSubscription() { diff --git a/async/event/feed_test.go b/async/event/feed_test.go index e8b1fd7a2a87..88ff935ab9fb 100644 --- a/async/event/feed_test.go +++ b/async/event/feed_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestFeedPanics(t *testing.T) { diff --git a/async/event/subscription.go b/async/event/subscription.go index e5cfc850200e..fe732d4f5775 100644 --- a/async/event/subscription.go +++ b/async/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/prysmaticlabs/prysm/v3/time/mclock" + "github.com/prysmaticlabs/prysm/v4/time/mclock" ) // waitQuotient is divided against the max backoff time, in order to have N requests based on the full diff --git a/async/event/subscription_test.go b/async/event/subscription_test.go index 3bef56cda6ab..eb839b58e565 100644 --- a/async/event/subscription_test.go +++ b/async/event/subscription_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) var errInts = errors.New("error in subscribeInts") diff --git a/async/every_test.go b/async/every_test.go index 55d80d4fccc3..b062f06f327c 100644 --- a/async/every_test.go +++ b/async/every_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/async" + "github.com/prysmaticlabs/prysm/v4/async" ) func TestEveryRuns(t *testing.T) { diff --git a/async/scatter_test.go b/async/scatter_test.go index ff81823a3710..c0e88aed98ac 100644 --- a/async/scatter_test.go +++ b/async/scatter_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDouble(t *testing.T) { diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index c9e7347154ca..ef1eb46d7ac7 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "service.go", "weak_subjectivity_checks.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain", visibility = [ "//beacon-chain:__subpackages__", "//cmd/beacon-chain:__subpackages__", diff --git a/beacon-chain/blockchain/chain_info.go b/beacon-chain/blockchain/chain_info.go index 121ed7a89893..3c3ff159f150 100644 --- a/beacon-chain/blockchain/chain_info.go +++ b/beacon-chain/blockchain/chain_info.go @@ -6,17 +6,17 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/chain_info_norace_test.go b/beacon-chain/blockchain/chain_info_norace_test.go index 82064b53bbdf..05988df9f81a 100644 --- a/beacon-chain/blockchain/chain_info_norace_test.go +++ b/beacon-chain/blockchain/chain_info_norace_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestHeadSlot_DataRace(t *testing.T) { diff --git a/beacon-chain/blockchain/chain_info_test.go b/beacon-chain/blockchain/chain_info_test.go index 61cb53d0c8ae..4c8359e8d42c 100644 --- a/beacon-chain/blockchain/chain_info_test.go +++ b/beacon-chain/blockchain/chain_info_test.go @@ -5,22 +5,22 @@ import ( "testing" "time" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/blockchain/error_test.go b/beacon-chain/blockchain/error_test.go index ecf9041ded95..3ed66ada0a88 100644 --- a/beacon-chain/blockchain/error_test.go +++ b/beacon-chain/blockchain/error_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestIsInvalidBlock(t *testing.T) { diff --git a/beacon-chain/blockchain/execution_engine.go b/beacon-chain/blockchain/execution_engine.go index 1a310b78188e..a2b6afe1bea2 100644 --- a/beacon-chain/blockchain/execution_engine.go +++ b/beacon-chain/blockchain/execution_engine.go @@ -5,22 +5,22 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - payloadattribute "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + payloadattribute "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/execution_engine_test.go b/beacon-chain/blockchain/execution_engine_test.go index 0981650d2e5c..71255754979e 100644 --- a/beacon-chain/blockchain/execution_engine_test.go +++ b/beacon-chain/blockchain/execution_engine_test.go @@ -7,27 +7,27 @@ import ( "github.com/ethereum/go-ethereum/common" gethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - bstate "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + bstate "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/forkchoice_update_execution.go b/beacon-chain/blockchain/forkchoice_update_execution.go index 42b885dac399..279001d6338b 100644 --- a/beacon-chain/blockchain/forkchoice_update_execution.go +++ b/beacon-chain/blockchain/forkchoice_update_execution.go @@ -6,13 +6,13 @@ import ( "time" "github.com/pkg/errors" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/forkchoice_update_execution_test.go b/beacon-chain/blockchain/forkchoice_update_execution_test.go index 771ad4a22d37..213080bdcc02 100644 --- a/beacon-chain/blockchain/forkchoice_update_execution_test.go +++ b/beacon-chain/blockchain/forkchoice_update_execution_test.go @@ -5,17 +5,17 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/head.go b/beacon-chain/blockchain/head.go index e734a0b4086c..f263cef4205e 100644 --- a/beacon-chain/blockchain/head.go +++ b/beacon-chain/blockchain/head.go @@ -6,21 +6,21 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/head_sync_committee_info.go b/beacon-chain/blockchain/head_sync_committee_info.go index ea9ace948b6b..483522605602 100644 --- a/beacon-chain/blockchain/head_sync_committee_info.go +++ b/beacon-chain/blockchain/head_sync_committee_info.go @@ -5,17 +5,17 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // Initialize the state cache for sync committees. diff --git a/beacon-chain/blockchain/head_sync_committee_info_test.go b/beacon-chain/blockchain/head_sync_committee_info_test.go index 723122276931..3ec833138664 100644 --- a/beacon-chain/blockchain/head_sync_committee_info_test.go +++ b/beacon-chain/blockchain/head_sync_committee_info_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestService_HeadSyncCommitteeIndices(t *testing.T) { diff --git a/beacon-chain/blockchain/head_test.go b/beacon-chain/blockchain/head_test.go index 35288e743cee..360c41d95640 100644 --- a/beacon-chain/blockchain/head_test.go +++ b/beacon-chain/blockchain/head_test.go @@ -7,22 +7,22 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/init_sync_process_block.go b/beacon-chain/blockchain/init_sync_process_block.go index dfe63174bc7e..9b3dddaff42f 100644 --- a/beacon-chain/blockchain/init_sync_process_block.go +++ b/beacon-chain/blockchain/init_sync_process_block.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" ) // This saves a beacon block to the initial sync blocks cache. It rate limits how many blocks diff --git a/beacon-chain/blockchain/init_sync_process_block_test.go b/beacon-chain/blockchain/init_sync_process_block_test.go index a890674b003d..c4ed9d56757d 100644 --- a/beacon-chain/blockchain/init_sync_process_block_test.go +++ b/beacon-chain/blockchain/init_sync_process_block_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestService_getBlock(t *testing.T) { diff --git a/beacon-chain/blockchain/init_test.go b/beacon-chain/blockchain/init_test.go index 37df892e9fd4..2b748a44d640 100644 --- a/beacon-chain/blockchain/init_test.go +++ b/beacon-chain/blockchain/init_test.go @@ -1,7 +1,7 @@ package blockchain import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func init() { diff --git a/beacon-chain/blockchain/log.go b/beacon-chain/blockchain/log.go index 05be53659838..fc73eecb47bf 100644 --- a/beacon-chain/blockchain/log.go +++ b/beacon-chain/blockchain/log.go @@ -6,15 +6,15 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusBlocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusBlocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/log_test.go b/beacon-chain/blockchain/log_test.go index 5a00f94f9536..b2b20fc092c8 100644 --- a/beacon-chain/blockchain/log_test.go +++ b/beacon-chain/blockchain/log_test.go @@ -3,11 +3,11 @@ package blockchain import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/metrics.go b/beacon-chain/blockchain/metrics.go index 0ab741cce8f0..0cadeb291402 100644 --- a/beacon-chain/blockchain/metrics.go +++ b/beacon-chain/blockchain/metrics.go @@ -6,15 +6,15 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) var ( diff --git a/beacon-chain/blockchain/metrics_test.go b/beacon-chain/blockchain/metrics_test.go index f596f35851e6..1bd6606c8918 100644 --- a/beacon-chain/blockchain/metrics_test.go +++ b/beacon-chain/blockchain/metrics_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestReportEpochMetrics_BadHeadState(t *testing.T) { diff --git a/beacon-chain/blockchain/mock_test.go b/beacon-chain/blockchain/mock_test.go index e997e986c415..bc2b88d9f75b 100644 --- a/beacon-chain/blockchain/mock_test.go +++ b/beacon-chain/blockchain/mock_test.go @@ -3,9 +3,9 @@ package blockchain import ( "testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" ) func testServiceOptsWithDB(t *testing.T) []Option { diff --git a/beacon-chain/blockchain/options.go b/beacon-chain/blockchain/options.go index f89efda960eb..3ab69b5318ab 100644 --- a/beacon-chain/blockchain/options.go +++ b/beacon-chain/blockchain/options.go @@ -1,21 +1,21 @@ package blockchain import ( - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type Option func(s *Service) error diff --git a/beacon-chain/blockchain/pow_block.go b/beacon-chain/blockchain/pow_block.go index 04792ad20bf2..815ff41625b2 100644 --- a/beacon-chain/blockchain/pow_block.go +++ b/beacon-chain/blockchain/pow_block.go @@ -10,13 +10,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/holiman/uint256" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/pow_block_test.go b/beacon-chain/blockchain/pow_block_test.go index 25508cd64aca..0509ec7b05fe 100644 --- a/beacon-chain/blockchain/pow_block_test.go +++ b/beacon-chain/blockchain/pow_block_test.go @@ -8,17 +8,17 @@ import ( gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/holiman/uint256" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mocks "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mocks "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func Test_validTerminalPowBlock(t *testing.T) { diff --git a/beacon-chain/blockchain/process_attestation.go b/beacon-chain/blockchain/process_attestation.go index 7858a8707eba..decf415639f3 100644 --- a/beacon-chain/blockchain/process_attestation.go +++ b/beacon-chain/blockchain/process_attestation.go @@ -5,11 +5,11 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/process_attestation_helpers.go b/beacon-chain/blockchain/process_attestation_helpers.go index c8afac4b6053..064650fe2049 100644 --- a/beacon-chain/blockchain/process_attestation_helpers.go +++ b/beacon-chain/blockchain/process_attestation_helpers.go @@ -6,15 +6,15 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // getAttPreState retrieves the att pre state by either from the cache or the DB. diff --git a/beacon-chain/blockchain/process_attestation_test.go b/beacon-chain/blockchain/process_attestation_test.go index f3c26ad400e5..dc5fae1700eb 100644 --- a/beacon-chain/blockchain/process_attestation_test.go +++ b/beacon-chain/blockchain/process_attestation_test.go @@ -5,19 +5,19 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestStore_OnAttestation_ErrorConditions(t *testing.T) { diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index 08e1c4b143bf..20166ef01f1e 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -6,28 +6,28 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/process_block_helpers.go b/beacon-chain/blockchain/process_block_helpers.go index 19b77885f40d..0797ab1e54b0 100644 --- a/beacon-chain/blockchain/process_block_helpers.go +++ b/beacon-chain/blockchain/process_block_helpers.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/pkg/errors" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/process_block_test.go b/beacon-chain/blockchain/process_block_test.go index c53044724f32..18bea9daf066 100644 --- a/beacon-chain/blockchain/process_block_test.go +++ b/beacon-chain/blockchain/process_block_test.go @@ -12,35 +12,35 @@ import ( "github.com/ethereum/go-ethereum/common" gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/receive_attestation.go b/beacon-chain/blockchain/receive_attestation.go index f7ede5c75d46..743334169655 100644 --- a/beacon-chain/blockchain/receive_attestation.go +++ b/beacon-chain/blockchain/receive_attestation.go @@ -7,16 +7,16 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/receive_attestation_test.go b/beacon-chain/blockchain/receive_attestation_test.go index 43a8a9d4dfb3..6ab970bb797a 100644 --- a/beacon-chain/blockchain/receive_attestation_test.go +++ b/beacon-chain/blockchain/receive_attestation_test.go @@ -5,22 +5,22 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/receive_block.go b/beacon-chain/blockchain/receive_block.go index 44588565c630..589b4901f41a 100644 --- a/beacon-chain/blockchain/receive_block.go +++ b/beacon-chain/blockchain/receive_block.go @@ -5,16 +5,16 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/receive_block_test.go b/beacon-chain/blockchain/receive_block_test.go index 71bdbffafa5d..53a2f2e7f63f 100644 --- a/beacon-chain/blockchain/receive_block_test.go +++ b/beacon-chain/blockchain/receive_block_test.go @@ -6,22 +6,22 @@ import ( "testing" "time" - blockchainTesting "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + blockchainTesting "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index 2d1441bb9eda..ab62c1aa0be1 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -11,33 +11,33 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - f "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + f "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/blockchain/service_norace_test.go b/beacon-chain/blockchain/service_norace_test.go index 2907527d348a..e34daedf2132 100644 --- a/beacon-chain/blockchain/service_norace_test.go +++ b/beacon-chain/blockchain/service_norace_test.go @@ -5,10 +5,10 @@ import ( "io" "testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/service_test.go b/beacon-chain/blockchain/service_test.go index 0b2bf2cca589..d00b43608214 100644 --- a/beacon-chain/blockchain/service_test.go +++ b/beacon-chain/blockchain/service_test.go @@ -8,35 +8,35 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/async/event" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/blockchain/testing/BUILD.bazel b/beacon-chain/blockchain/testing/BUILD.bazel index ad81395530ca..598957c5dee3 100644 --- a/beacon-chain/blockchain/testing/BUILD.bazel +++ b/beacon-chain/blockchain/testing/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing", visibility = [ "//beacon-chain:__subpackages__", "//testing:__subpackages__", diff --git a/beacon-chain/blockchain/testing/mock.go b/beacon-chain/blockchain/testing/mock.go index 856adc087857..4d9687077699 100644 --- a/beacon-chain/blockchain/testing/mock.go +++ b/beacon-chain/blockchain/testing/mock.go @@ -9,24 +9,24 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/weak_subjectivity_checks.go b/beacon-chain/blockchain/weak_subjectivity_checks.go index c812a091e502..e50264a6d1f1 100644 --- a/beacon-chain/blockchain/weak_subjectivity_checks.go +++ b/beacon-chain/blockchain/weak_subjectivity_checks.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) type weakSubjectivityDB interface { diff --git a/beacon-chain/blockchain/weak_subjectivity_checks_test.go b/beacon-chain/blockchain/weak_subjectivity_checks_test.go index e143b556950f..719cc3eb7b82 100644 --- a/beacon-chain/blockchain/weak_subjectivity_checks_test.go +++ b/beacon-chain/blockchain/weak_subjectivity_checks_test.go @@ -5,16 +5,16 @@ import ( "testing" "github.com/pkg/errors" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestService_VerifyWeakSubjectivityRoot(t *testing.T) { diff --git a/beacon-chain/builder/BUILD.bazel b/beacon-chain/builder/BUILD.bazel index 241fe1e635d1..aac03a6bdea9 100644 --- a/beacon-chain/builder/BUILD.bazel +++ b/beacon-chain/builder/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "option.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder", visibility = ["//visibility:public"], deps = [ "//api/client/builder:go_default_library", diff --git a/beacon-chain/builder/option.go b/beacon-chain/builder/option.go index 5eba6bac3c79..a3edc3f9acc6 100644 --- a/beacon-chain/builder/option.go +++ b/beacon-chain/builder/option.go @@ -1,10 +1,10 @@ package builder import ( - "github.com/prysmaticlabs/prysm/v3/api/client/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/api/client/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" "github.com/urfave/cli/v2" ) diff --git a/beacon-chain/builder/service.go b/beacon-chain/builder/service.go index dc6e99a524ee..774a97b06f60 100644 --- a/beacon-chain/builder/service.go +++ b/beacon-chain/builder/service.go @@ -6,13 +6,13 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/client/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/api/client/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" log "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/builder/service_test.go b/beacon-chain/builder/service_test.go index 84c08dfdbfc1..6a98441e88af 100644 --- a/beacon-chain/builder/service_test.go +++ b/beacon-chain/builder/service_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - buildertesting "github.com/prysmaticlabs/prysm/v3/api/client/builder/testing" - blockchainTesting "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtesting "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + buildertesting "github.com/prysmaticlabs/prysm/v4/api/client/builder/testing" + blockchainTesting "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtesting "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_NewServiceWithBuilder(t *testing.T) { diff --git a/beacon-chain/builder/testing/BUILD.bazel b/beacon-chain/builder/testing/BUILD.bazel index 35c6e2c27501..875465e0917c 100644 --- a/beacon-chain/builder/testing/BUILD.bazel +++ b/beacon-chain/builder/testing/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder/testing", visibility = ["//visibility:public"], deps = [ "//api/client/builder:go_default_library", diff --git a/beacon-chain/builder/testing/mock.go b/beacon-chain/builder/testing/mock.go index 445abf9b9db9..c38321f9fd51 100644 --- a/beacon-chain/builder/testing/mock.go +++ b/beacon-chain/builder/testing/mock.go @@ -5,14 +5,14 @@ import ( "math/big" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/client/builder" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/client/builder" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // MockBuilderService to mock builder. diff --git a/beacon-chain/cache/BUILD.bazel b/beacon-chain/cache/BUILD.bazel index f39ae7256a41..0f8ef9d9c594 100644 --- a/beacon-chain/cache/BUILD.bazel +++ b/beacon-chain/cache/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "sync_committee_head_state.go", "sync_subnet_ids.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache", visibility = [ "//beacon-chain:__subpackages__", "//testing/spectest:__subpackages__", diff --git a/beacon-chain/cache/active_balance.go b/beacon-chain/cache/active_balance.go index 88a74a5bb0e8..9fc5a8c2e7ad 100644 --- a/beacon-chain/cache/active_balance.go +++ b/beacon-chain/cache/active_balance.go @@ -10,10 +10,10 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) const ( diff --git a/beacon-chain/cache/active_balance_disabled.go b/beacon-chain/cache/active_balance_disabled.go index bbb57f17d579..10dc772b184e 100644 --- a/beacon-chain/cache/active_balance_disabled.go +++ b/beacon-chain/cache/active_balance_disabled.go @@ -6,7 +6,7 @@ import ( "sync" lru "github.com/hashicorp/golang-lru" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" ) // FakeBalanceCache is a fake struct with 1 LRU cache for looking up balance by epoch. diff --git a/beacon-chain/cache/active_balance_test.go b/beacon-chain/cache/active_balance_test.go index 859271ce0aea..d0e6101a2341 100644 --- a/beacon-chain/cache/active_balance_test.go +++ b/beacon-chain/cache/active_balance_test.go @@ -7,11 +7,11 @@ import ( "math" "testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBalanceCache_AddGetBalance(t *testing.T) { diff --git a/beacon-chain/cache/attestation_data.go b/beacon-chain/cache/attestation_data.go index 72b1c72bb22f..6f284ee0267e 100644 --- a/beacon-chain/cache/attestation_data.go +++ b/beacon-chain/cache/attestation_data.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/cache/attestation_data_test.go b/beacon-chain/cache/attestation_data_test.go index a0e287c7f40f..65c399d8607b 100644 --- a/beacon-chain/cache/attestation_data_test.go +++ b/beacon-chain/cache/attestation_data_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/cache/checkpoint_state.go b/beacon-chain/cache/checkpoint_state.go index 962e19711190..0f8762fd6f80 100644 --- a/beacon-chain/cache/checkpoint_state.go +++ b/beacon-chain/cache/checkpoint_state.go @@ -4,10 +4,10 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var ( diff --git a/beacon-chain/cache/checkpoint_state_test.go b/beacon-chain/cache/checkpoint_state_test.go index 85efadf3baff..08e1709c1081 100644 --- a/beacon-chain/cache/checkpoint_state_test.go +++ b/beacon-chain/cache/checkpoint_state_test.go @@ -3,14 +3,14 @@ package cache import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/cache/committee.go b/beacon-chain/cache/committee.go index 3528e756f9ac..6fa8a624ba40 100644 --- a/beacon-chain/cache/committee.go +++ b/beacon-chain/cache/committee.go @@ -12,11 +12,11 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - mathutil "github.com/prysmaticlabs/prysm/v3/math" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + mathutil "github.com/prysmaticlabs/prysm/v4/math" ) const ( diff --git a/beacon-chain/cache/committee_disabled.go b/beacon-chain/cache/committee_disabled.go index b44f66d40948..b984df68f16e 100644 --- a/beacon-chain/cache/committee_disabled.go +++ b/beacon-chain/cache/committee_disabled.go @@ -6,7 +6,7 @@ package cache import ( "context" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // FakeCommitteeCache is a struct with 1 queue for looking up shuffled indices list by seed. diff --git a/beacon-chain/cache/committee_fuzz_test.go b/beacon-chain/cache/committee_fuzz_test.go index 926caf16380a..e88be377a430 100644 --- a/beacon-chain/cache/committee_fuzz_test.go +++ b/beacon-chain/cache/committee_fuzz_test.go @@ -7,8 +7,8 @@ import ( "testing" fuzz "github.com/google/gofuzz" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestCommitteeKeyFuzz_OK(t *testing.T) { diff --git a/beacon-chain/cache/committee_test.go b/beacon-chain/cache/committee_test.go index f610332c8ba3..9d1d562a94c4 100644 --- a/beacon-chain/cache/committee_test.go +++ b/beacon-chain/cache/committee_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestCommitteeKeyFn_OK(t *testing.T) { diff --git a/beacon-chain/cache/committees.go b/beacon-chain/cache/committees.go index a50fd794a3c4..3595764da525 100644 --- a/beacon-chain/cache/committees.go +++ b/beacon-chain/cache/committees.go @@ -3,7 +3,7 @@ package cache import ( "errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // ErrNotCommittee will be returned when a cache object is not a pointer to diff --git a/beacon-chain/cache/common.go b/beacon-chain/cache/common.go index 3500252817e7..86f10b41fbc5 100644 --- a/beacon-chain/cache/common.go +++ b/beacon-chain/cache/common.go @@ -1,7 +1,7 @@ package cache import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/cache/depositcache/BUILD.bazel b/beacon-chain/cache/depositcache/BUILD.bazel index 4c1c58367202..95566c0883c4 100644 --- a/beacon-chain/cache/depositcache/BUILD.bazel +++ b/beacon-chain/cache/depositcache/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "log.go", "pending_deposits.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache", visibility = [ "//beacon-chain:__subpackages__", "//testing/spectest:__subpackages__", diff --git a/beacon-chain/cache/depositcache/deposits_cache.go b/beacon-chain/cache/depositcache/deposits_cache.go index c1870a207fb4..3f0e6aac9184 100644 --- a/beacon-chain/cache/depositcache/deposits_cache.go +++ b/beacon-chain/cache/depositcache/deposits_cache.go @@ -14,11 +14,11 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/cache/depositcache/deposits_cache_test.go b/beacon-chain/cache/depositcache/deposits_cache_test.go index b42e510f8387..29b4df14d4df 100644 --- a/beacon-chain/cache/depositcache/deposits_cache_test.go +++ b/beacon-chain/cache/depositcache/deposits_cache_test.go @@ -7,12 +7,12 @@ import ( "math/big" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/cache/depositcache/pending_deposits.go b/beacon-chain/cache/depositcache/pending_deposits.go index 612bf6c3b0b2..171f2beb9398 100644 --- a/beacon-chain/cache/depositcache/pending_deposits.go +++ b/beacon-chain/cache/depositcache/pending_deposits.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/cache/depositcache/pending_deposits_test.go b/beacon-chain/cache/depositcache/pending_deposits_test.go index 60f7e9903aaf..897a0b8d4278 100644 --- a/beacon-chain/cache/depositcache/pending_deposits_test.go +++ b/beacon-chain/cache/depositcache/pending_deposits_test.go @@ -5,9 +5,9 @@ import ( "math/big" "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/cache/depositsnapshot/BUILD.bazel b/beacon-chain/cache/depositsnapshot/BUILD.bazel index 412a32e266bb..1108788d3cf6 100644 --- a/beacon-chain/cache/depositsnapshot/BUILD.bazel +++ b/beacon-chain/cache/depositsnapshot/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "merkle_tree.go", "zerohashes.gen.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositsnapshot", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositsnapshot", visibility = ["//visibility:public"], deps = [ "//container/slice:go_default_library", diff --git a/beacon-chain/cache/depositsnapshot/deposit_tree.go b/beacon-chain/cache/depositsnapshot/deposit_tree.go index e006f0f7d506..80f2b88b15cc 100644 --- a/beacon-chain/cache/depositsnapshot/deposit_tree.go +++ b/beacon-chain/cache/depositsnapshot/deposit_tree.go @@ -7,9 +7,9 @@ import ( "crypto/sha256" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - eth "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + eth "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" ) var ( diff --git a/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot.go b/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot.go index 6aad60e00b0b..8d79b8defa6b 100644 --- a/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot.go +++ b/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) var ( diff --git a/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot_test.go b/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot_test.go index 78236a5602cf..654674c867fc 100644 --- a/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot_test.go +++ b/beacon-chain/cache/depositsnapshot/deposit_tree_snapshot_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDepositTreeSnapshot_CalculateRoot(t *testing.T) { diff --git a/beacon-chain/cache/depositsnapshot/merkle_tree.go b/beacon-chain/cache/depositsnapshot/merkle_tree.go index 24b8f331fff3..2a14402f4602 100644 --- a/beacon-chain/cache/depositsnapshot/merkle_tree.go +++ b/beacon-chain/cache/depositsnapshot/merkle_tree.go @@ -2,9 +2,9 @@ package depositsnapshot import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/math" ) const ( diff --git a/beacon-chain/cache/depositsnapshot/merkle_tree_test.go b/beacon-chain/cache/depositsnapshot/merkle_tree_test.go index d28bb04912a5..2813be708938 100644 --- a/beacon-chain/cache/depositsnapshot/merkle_tree_test.go +++ b/beacon-chain/cache/depositsnapshot/merkle_tree_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func hexString(t *testing.T, hexStr string) [32]byte { diff --git a/beacon-chain/cache/depositsnapshot/spec_test.go b/beacon-chain/cache/depositsnapshot/spec_test.go index 901adb906b29..fbd03245c850 100644 --- a/beacon-chain/cache/depositsnapshot/spec_test.go +++ b/beacon-chain/cache/depositsnapshot/spec_test.go @@ -9,9 +9,9 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/io/file" - eth "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/io/file" + eth "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/testing/require" "gopkg.in/yaml.v3" ) diff --git a/beacon-chain/cache/payload_id.go b/beacon-chain/cache/payload_id.go index f212fe8d779d..7d4fdb9dc47b 100644 --- a/beacon-chain/cache/payload_id.go +++ b/beacon-chain/cache/payload_id.go @@ -4,8 +4,8 @@ import ( "bytes" "sync" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) const vIdLength = 8 diff --git a/beacon-chain/cache/payload_id_test.go b/beacon-chain/cache/payload_id_test.go index 07b48985edab..89f17b15b360 100644 --- a/beacon-chain/cache/payload_id_test.go +++ b/beacon-chain/cache/payload_id_test.go @@ -3,8 +3,8 @@ package cache import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestValidatorPayloadIDsCache_GetAndSaveValidatorPayloadIDs(t *testing.T) { diff --git a/beacon-chain/cache/proposer_indices.go b/beacon-chain/cache/proposer_indices.go index 0352d3835d8e..1676d56daf79 100644 --- a/beacon-chain/cache/proposer_indices.go +++ b/beacon-chain/cache/proposer_indices.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/cache/proposer_indices_disabled.go b/beacon-chain/cache/proposer_indices_disabled.go index e80ef4e030d9..17c2609a57d2 100644 --- a/beacon-chain/cache/proposer_indices_disabled.go +++ b/beacon-chain/cache/proposer_indices_disabled.go @@ -3,7 +3,7 @@ // This file is used in fuzzer builds to bypass proposer indices caches. package cache -import "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" +import "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" // FakeProposerIndicesCache is a struct with 1 queue for looking up proposer indices by root. type FakeProposerIndicesCache struct { diff --git a/beacon-chain/cache/proposer_indices_test.go b/beacon-chain/cache/proposer_indices_test.go index e4b642685dba..6cf9ad2929be 100644 --- a/beacon-chain/cache/proposer_indices_test.go +++ b/beacon-chain/cache/proposer_indices_test.go @@ -6,10 +6,10 @@ import ( "strconv" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestProposerKeyFn_OK(t *testing.T) { diff --git a/beacon-chain/cache/proposer_indices_type.go b/beacon-chain/cache/proposer_indices_type.go index 06f1c4d76141..2454167aff96 100644 --- a/beacon-chain/cache/proposer_indices_type.go +++ b/beacon-chain/cache/proposer_indices_type.go @@ -3,7 +3,7 @@ package cache import ( "errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // ErrNotProposerIndices will be returned when a cache object is not a pointer to diff --git a/beacon-chain/cache/skip_slot_cache.go b/beacon-chain/cache/skip_slot_cache.go index 3be5346c12e1..5347940a8118 100644 --- a/beacon-chain/cache/skip_slot_cache.go +++ b/beacon-chain/cache/skip_slot_cache.go @@ -9,8 +9,8 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" "go.opencensus.io/trace" ) diff --git a/beacon-chain/cache/skip_slot_cache_test.go b/beacon-chain/cache/skip_slot_cache_test.go index 412853435f1f..35b503018cef 100644 --- a/beacon-chain/cache/skip_slot_cache_test.go +++ b/beacon-chain/cache/skip_slot_cache_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSkipSlotCache_RoundTrip(t *testing.T) { diff --git a/beacon-chain/cache/subnet_ids.go b/beacon-chain/cache/subnet_ids.go index 0963339f00e2..e47bf8288f56 100644 --- a/beacon-chain/cache/subnet_ids.go +++ b/beacon-chain/cache/subnet_ids.go @@ -6,10 +6,10 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/patrickmn/go-cache" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" ) type subnetIDs struct { diff --git a/beacon-chain/cache/subnet_ids_test.go b/beacon-chain/cache/subnet_ids_test.go index 78c9b743e0d7..c94d8ffa52a5 100644 --- a/beacon-chain/cache/subnet_ids_test.go +++ b/beacon-chain/cache/subnet_ids_test.go @@ -3,10 +3,10 @@ package cache import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSubnetIDsCache_RoundTrip(t *testing.T) { diff --git a/beacon-chain/cache/sync_committee.go b/beacon-chain/cache/sync_committee.go index 3a3ac565f7a5..c332be74d9a7 100644 --- a/beacon-chain/cache/sync_committee.go +++ b/beacon-chain/cache/sync_committee.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/cache/sync_committee_disabled.go b/beacon-chain/cache/sync_committee_disabled.go index 4640cdeae9a9..3cde4de06e43 100644 --- a/beacon-chain/cache/sync_committee_disabled.go +++ b/beacon-chain/cache/sync_committee_disabled.go @@ -3,8 +3,8 @@ package cache import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // FakeSyncCommitteeCache is a fake `SyncCommitteeCache` to satisfy fuzzing. diff --git a/beacon-chain/cache/sync_committee_head_state.go b/beacon-chain/cache/sync_committee_head_state.go index f4df6c742dbf..a8f2c88dcf64 100644 --- a/beacon-chain/cache/sync_committee_head_state.go +++ b/beacon-chain/cache/sync_committee_head_state.go @@ -4,10 +4,10 @@ import ( "sync" lru "github.com/hashicorp/golang-lru" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SyncCommitteeHeadStateCache for the latest head state requested by a sync committee participant. diff --git a/beacon-chain/cache/sync_committee_head_state_test.go b/beacon-chain/cache/sync_committee_head_state_test.go index a2c7227ca875..291d0d7bb1e9 100644 --- a/beacon-chain/cache/sync_committee_head_state_test.go +++ b/beacon-chain/cache/sync_committee_head_state_test.go @@ -3,12 +3,12 @@ package cache import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSyncCommitteeHeadState(t *testing.T) { diff --git a/beacon-chain/cache/sync_committee_test.go b/beacon-chain/cache/sync_committee_test.go index e4311b4f4500..5c6e7615ef51 100644 --- a/beacon-chain/cache/sync_committee_test.go +++ b/beacon-chain/cache/sync_committee_test.go @@ -3,11 +3,11 @@ package cache_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSyncCommitteeCache_CanUpdateAndRetrieve(t *testing.T) { diff --git a/beacon-chain/cache/sync_subnet_ids.go b/beacon-chain/cache/sync_subnet_ids.go index ea56e2f79f60..4fbce0e982b2 100644 --- a/beacon-chain/cache/sync_subnet_ids.go +++ b/beacon-chain/cache/sync_subnet_ids.go @@ -5,11 +5,11 @@ import ( "time" "github.com/patrickmn/go-cache" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) type syncSubnetIDs struct { diff --git a/beacon-chain/cache/sync_subnet_ids_test.go b/beacon-chain/cache/sync_subnet_ids_test.go index 26674a41f7da..af553e453d33 100644 --- a/beacon-chain/cache/sync_subnet_ids_test.go +++ b/beacon-chain/cache/sync_subnet_ids_test.go @@ -3,10 +3,10 @@ package cache import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSyncSubnetIDsCache_Roundtrip(t *testing.T) { diff --git a/beacon-chain/core/altair/BUILD.bazel b/beacon-chain/core/altair/BUILD.bazel index 6fee5c2c7afb..98a3cbc3bf68 100644 --- a/beacon-chain/core/altair/BUILD.bazel +++ b/beacon-chain/core/altair/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "transition.go", "upgrade.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/blocks:go_default_library", diff --git a/beacon-chain/core/altair/attestation.go b/beacon-chain/core/altair/attestation.go index 44b7715c23f1..a6366147c891 100644 --- a/beacon-chain/core/altair/attestation.go +++ b/beacon-chain/core/altair/attestation.go @@ -6,16 +6,16 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/altair/attestation_test.go b/beacon-chain/core/altair/attestation_test.go index 87d1a17b4219..98ad7efe267a 100644 --- a/beacon-chain/core/altair/attestation_test.go +++ b/beacon-chain/core/altair/attestation_test.go @@ -7,22 +7,22 @@ import ( fuzz "github.com/google/gofuzz" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessAttestations_InclusionDelayFailure(t *testing.T) { diff --git a/beacon-chain/core/altair/block.go b/beacon-chain/core/altair/block.go index 24b42801a5e7..6637c0220a1a 100644 --- a/beacon-chain/core/altair/block.go +++ b/beacon-chain/core/altair/block.go @@ -4,15 +4,15 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - p2pType "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + p2pType "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ProcessSyncAggregate verifies sync committee aggregate signature signing over the previous slot block root. diff --git a/beacon-chain/core/altair/block_test.go b/beacon-chain/core/altair/block_test.go index 9aef8c40de9e..0d5ed6752d22 100644 --- a/beacon-chain/core/altair/block_test.go +++ b/beacon-chain/core/altair/block_test.go @@ -6,21 +6,21 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - p2pType "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + p2pType "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestProcessSyncCommittee_PerfectParticipation(t *testing.T) { diff --git a/beacon-chain/core/altair/deposit.go b/beacon-chain/core/altair/deposit.go index c552f0a9603f..842122028532 100644 --- a/beacon-chain/core/altair/deposit.go +++ b/beacon-chain/core/altair/deposit.go @@ -4,10 +4,10 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ProcessDeposits processes validator deposits for beacon state Altair. diff --git a/beacon-chain/core/altair/deposit_fuzz_test.go b/beacon-chain/core/altair/deposit_fuzz_test.go index bd504fd6ad67..eadf2aab8bdc 100644 --- a/beacon-chain/core/altair/deposit_fuzz_test.go +++ b/beacon-chain/core/altair/deposit_fuzz_test.go @@ -5,10 +5,10 @@ import ( "testing" fuzz "github.com/google/gofuzz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFuzzProcessDeposits_10000(t *testing.T) { diff --git a/beacon-chain/core/altair/deposit_test.go b/beacon-chain/core/altair/deposit_test.go index bd6b55a7be01..f581facf0f76 100644 --- a/beacon-chain/core/altair/deposit_test.go +++ b/beacon-chain/core/altair/deposit_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessDeposits_SameValidatorMultipleDepositsSameBlock(t *testing.T) { diff --git a/beacon-chain/core/altair/epoch_precompute.go b/beacon-chain/core/altair/epoch_precompute.go index 7b52496c953a..454125c094fc 100644 --- a/beacon-chain/core/altair/epoch_precompute.go +++ b/beacon-chain/core/altair/epoch_precompute.go @@ -4,12 +4,12 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/math" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/altair/epoch_precompute_test.go b/beacon-chain/core/altair/epoch_precompute_test.go index a11f17afb96d..2acefce8abbb 100644 --- a/beacon-chain/core/altair/epoch_precompute_test.go +++ b/beacon-chain/core/altair/epoch_precompute_test.go @@ -5,14 +5,14 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestInitializeEpochValidators_Ok(t *testing.T) { diff --git a/beacon-chain/core/altair/epoch_spec.go b/beacon-chain/core/altair/epoch_spec.go index 6b3229695b5c..fd8cd49fa0ec 100644 --- a/beacon-chain/core/altair/epoch_spec.go +++ b/beacon-chain/core/altair/epoch_spec.go @@ -3,10 +3,10 @@ package altair import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/core/altair/epoch_spec_test.go b/beacon-chain/core/altair/epoch_spec_test.go index 90217e4cb4a3..715c24b6c656 100644 --- a/beacon-chain/core/altair/epoch_spec_test.go +++ b/beacon-chain/core/altair/epoch_spec_test.go @@ -6,18 +6,18 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/altair/reward.go b/beacon-chain/core/altair/reward.go index a00537608f02..9f9471e89389 100644 --- a/beacon-chain/core/altair/reward.go +++ b/beacon-chain/core/altair/reward.go @@ -2,11 +2,11 @@ package altair import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" ) // BaseReward takes state and validator index and calculate diff --git a/beacon-chain/core/altair/reward_test.go b/beacon-chain/core/altair/reward_test.go index b835b27a2a40..98f24a4271fa 100644 --- a/beacon-chain/core/altair/reward_test.go +++ b/beacon-chain/core/altair/reward_test.go @@ -4,13 +4,13 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func Test_BaseReward(t *testing.T) { diff --git a/beacon-chain/core/altair/sync_committee.go b/beacon-chain/core/altair/sync_committee.go index 70c0b05c5219..b47f8777cfe6 100644 --- a/beacon-chain/core/altair/sync_committee.go +++ b/beacon-chain/core/altair/sync_committee.go @@ -6,18 +6,18 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) const maxRandomByte = uint64(1<<8 - 1) diff --git a/beacon-chain/core/altair/sync_committee_test.go b/beacon-chain/core/altair/sync_committee_test.go index ef2142a1ba4a..2a6f45926040 100644 --- a/beacon-chain/core/altair/sync_committee_test.go +++ b/beacon-chain/core/altair/sync_committee_test.go @@ -5,17 +5,17 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) func TestSyncCommitteeIndices_CanGet(t *testing.T) { diff --git a/beacon-chain/core/altair/transition.go b/beacon-chain/core/altair/transition.go index f48b790a327c..7ddd074b6142 100644 --- a/beacon-chain/core/altair/transition.go +++ b/beacon-chain/core/altair/transition.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - e "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" + e "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/altair/transition_test.go b/beacon-chain/core/altair/transition_test.go index 6d48675d4ac3..f46585a058b7 100644 --- a/beacon-chain/core/altair/transition_test.go +++ b/beacon-chain/core/altair/transition_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessEpoch_CanProcess(t *testing.T) { diff --git a/beacon-chain/core/altair/upgrade.go b/beacon-chain/core/altair/upgrade.go index 78ce5b81027d..6ac4403facdc 100644 --- a/beacon-chain/core/altair/upgrade.go +++ b/beacon-chain/core/altair/upgrade.go @@ -3,13 +3,13 @@ package altair import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" ) // UpgradeToAltair updates input state to return the version Altair state. diff --git a/beacon-chain/core/altair/upgrade_test.go b/beacon-chain/core/altair/upgrade_test.go index 042553e91362..2c9800f26578 100644 --- a/beacon-chain/core/altair/upgrade_test.go +++ b/beacon-chain/core/altair/upgrade_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestTranslateParticipation(t *testing.T) { diff --git a/beacon-chain/core/blocks/BUILD.bazel b/beacon-chain/core/blocks/BUILD.bazel index 38c2cde22a11..11537263aab2 100644 --- a/beacon-chain/core/blocks/BUILD.bazel +++ b/beacon-chain/core/blocks/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "signature.go", "withdrawals.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/beacon-chain/core/blocks/attestation.go b/beacon-chain/core/blocks/attestation.go index 0f1766316c2c..83c4d90c654d 100644 --- a/beacon-chain/core/blocks/attestation.go +++ b/beacon-chain/core/blocks/attestation.go @@ -5,17 +5,17 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/blocks/attestation_regression_test.go b/beacon-chain/core/blocks/attestation_regression_test.go index 0dad28df79fa..078c440999b3 100644 --- a/beacon-chain/core/blocks/attestation_regression_test.go +++ b/beacon-chain/core/blocks/attestation_regression_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // Beaconfuzz discovered an off by one issue where an attestation could be produced which would pass diff --git a/beacon-chain/core/blocks/attestation_test.go b/beacon-chain/core/blocks/attestation_test.go index dee6e3d868d5..d61fc01ab702 100644 --- a/beacon-chain/core/blocks/attestation_test.go +++ b/beacon-chain/core/blocks/attestation_test.go @@ -5,22 +5,22 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessAggregatedAttestation_OverlappingBits(t *testing.T) { diff --git a/beacon-chain/core/blocks/attester_slashing.go b/beacon-chain/core/blocks/attester_slashing.go index 1547ebb75196..796afec8260b 100644 --- a/beacon-chain/core/blocks/attester_slashing.go +++ b/beacon-chain/core/blocks/attester_slashing.go @@ -5,16 +5,16 @@ import ( "sort" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/slashings" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/slashings" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ProcessAttesterSlashings is one of the operations performed diff --git a/beacon-chain/core/blocks/attester_slashing_test.go b/beacon-chain/core/blocks/attester_slashing_test.go index e617268eb456..deaef71a594d 100644 --- a/beacon-chain/core/blocks/attester_slashing_test.go +++ b/beacon-chain/core/blocks/attester_slashing_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSlashableAttestationData_CanSlash(t *testing.T) { diff --git a/beacon-chain/core/blocks/block_operations_fuzz_test.go b/beacon-chain/core/blocks/block_operations_fuzz_test.go index f8eafbe4721a..631e08fbf76a 100644 --- a/beacon-chain/core/blocks/block_operations_fuzz_test.go +++ b/beacon-chain/core/blocks/block_operations_fuzz_test.go @@ -5,14 +5,14 @@ import ( "testing" fuzz "github.com/google/gofuzz" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFuzzProcessAttestationNoVerify_10000(t *testing.T) { diff --git a/beacon-chain/core/blocks/block_regression_test.go b/beacon-chain/core/blocks/block_regression_test.go index 1e71afd8aad7..6287f16f83cb 100644 --- a/beacon-chain/core/blocks/block_regression_test.go +++ b/beacon-chain/core/blocks/block_regression_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessAttesterSlashings_RegressionSlashableIndices(t *testing.T) { diff --git a/beacon-chain/core/blocks/deposit.go b/beacon-chain/core/blocks/deposit.go index b8842481a71a..70ade1430c14 100644 --- a/beacon-chain/core/blocks/deposit.go +++ b/beacon-chain/core/blocks/deposit.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ProcessPreGenesisDeposits processes a deposit for the beacon state before chainstart. diff --git a/beacon-chain/core/blocks/deposit_test.go b/beacon-chain/core/blocks/deposit_test.go index e56fc489e38a..903c49c7babc 100644 --- a/beacon-chain/core/blocks/deposit_test.go +++ b/beacon-chain/core/blocks/deposit_test.go @@ -4,19 +4,19 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessDeposits_SameValidatorMultipleDepositsSameBlock(t *testing.T) { diff --git a/beacon-chain/core/blocks/eth1_data.go b/beacon-chain/core/blocks/eth1_data.go index b3bef1439d81..ad286e157cbe 100644 --- a/beacon-chain/core/blocks/eth1_data.go +++ b/beacon-chain/core/blocks/eth1_data.go @@ -5,9 +5,9 @@ import ( "context" "errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ProcessEth1DataInBlock is an operation performed on each diff --git a/beacon-chain/core/blocks/eth1_data_test.go b/beacon-chain/core/blocks/eth1_data_test.go index 868095949921..f1b1e891139b 100644 --- a/beacon-chain/core/blocks/eth1_data_test.go +++ b/beacon-chain/core/blocks/eth1_data_test.go @@ -5,16 +5,16 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/blocks/exit.go b/beacon-chain/core/blocks/exit.go index c2a7bb4c87fe..fddc1643a03d 100644 --- a/beacon-chain/core/blocks/exit.go +++ b/beacon-chain/core/blocks/exit.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ValidatorAlreadyExitedMsg defines a message saying that a validator has already exited. diff --git a/beacon-chain/core/blocks/exit_test.go b/beacon-chain/core/blocks/exit_test.go index d597e60c886c..74b52cf49dee 100644 --- a/beacon-chain/core/blocks/exit_test.go +++ b/beacon-chain/core/blocks/exit_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessVoluntaryExits_NotActiveLongEnoughToExit(t *testing.T) { diff --git a/beacon-chain/core/blocks/genesis.go b/beacon-chain/core/blocks/genesis.go index a75910b7f2d1..941c86347d40 100644 --- a/beacon-chain/core/blocks/genesis.go +++ b/beacon-chain/core/blocks/genesis.go @@ -6,14 +6,14 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // NewGenesisBlock returns the canonical, genesis block for the beacon chain protocol. diff --git a/beacon-chain/core/blocks/genesis_test.go b/beacon-chain/core/blocks/genesis_test.go index 1266a10e0128..2b045e81225a 100644 --- a/beacon-chain/core/blocks/genesis_test.go +++ b/beacon-chain/core/blocks/genesis_test.go @@ -3,9 +3,9 @@ package blocks_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestGenesisBlock_InitializedCorrectly(t *testing.T) { diff --git a/beacon-chain/core/blocks/header.go b/beacon-chain/core/blocks/header.go index cbc6fb1f7d5a..46e94992583b 100644 --- a/beacon-chain/core/blocks/header.go +++ b/beacon-chain/core/blocks/header.go @@ -5,13 +5,13 @@ import ( "context" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ProcessBlockHeader validates a block by its header. diff --git a/beacon-chain/core/blocks/header_test.go b/beacon-chain/core/blocks/header_test.go index 851643f000e5..e143d3340e29 100644 --- a/beacon-chain/core/blocks/header_test.go +++ b/beacon-chain/core/blocks/header_test.go @@ -5,19 +5,19 @@ import ( "io" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/blocks/payload.go b/beacon-chain/core/blocks/payload.go index 59d6d85a7a67..0c7352ee188f 100644 --- a/beacon-chain/core/blocks/payload.go +++ b/beacon-chain/core/blocks/payload.go @@ -4,14 +4,14 @@ import ( "bytes" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var ( diff --git a/beacon-chain/core/blocks/payload_test.go b/beacon-chain/core/blocks/payload_test.go index b854457ed7c6..a81c66fbec89 100644 --- a/beacon-chain/core/blocks/payload_test.go +++ b/beacon-chain/core/blocks/payload_test.go @@ -4,19 +4,19 @@ import ( "math/big" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func Test_IsMergeComplete(t *testing.T) { diff --git a/beacon-chain/core/blocks/proposer_slashing.go b/beacon-chain/core/blocks/proposer_slashing.go index aee872fdca86..a0ea4a88ed0c 100644 --- a/beacon-chain/core/blocks/proposer_slashing.go +++ b/beacon-chain/core/blocks/proposer_slashing.go @@ -5,15 +5,15 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/blocks/proposer_slashing_regression_test.go b/beacon-chain/core/blocks/proposer_slashing_regression_test.go index facf87d54d26..f00e3d35723a 100644 --- a/beacon-chain/core/blocks/proposer_slashing_regression_test.go +++ b/beacon-chain/core/blocks/proposer_slashing_regression_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // Beaconfuzz discovered an issue where a proposer slashing could be produced which would pass diff --git a/beacon-chain/core/blocks/proposer_slashing_test.go b/beacon-chain/core/blocks/proposer_slashing_test.go index fd5d649f2432..2d97099da6ec 100644 --- a/beacon-chain/core/blocks/proposer_slashing_test.go +++ b/beacon-chain/core/blocks/proposer_slashing_test.go @@ -5,21 +5,21 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestProcessProposerSlashings_UnmatchedHeaderSlots(t *testing.T) { diff --git a/beacon-chain/core/blocks/randao.go b/beacon-chain/core/blocks/randao.go index 407eb601d62b..a162a2e07234 100644 --- a/beacon-chain/core/blocks/randao.go +++ b/beacon-chain/core/blocks/randao.go @@ -4,12 +4,12 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ProcessRandao checks the block proposer's diff --git a/beacon-chain/core/blocks/randao_test.go b/beacon-chain/core/blocks/randao_test.go index 966747c05093..5fe089f86db1 100644 --- a/beacon-chain/core/blocks/randao_test.go +++ b/beacon-chain/core/blocks/randao_test.go @@ -5,17 +5,17 @@ import ( "encoding/binary" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProcessRandao_IncorrectProposerFailsVerification(t *testing.T) { diff --git a/beacon-chain/core/blocks/signature.go b/beacon-chain/core/blocks/signature.go index 95b5fa4415fe..03ec70717943 100644 --- a/beacon-chain/core/blocks/signature.go +++ b/beacon-chain/core/blocks/signature.go @@ -5,17 +5,17 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // retrieves the signature batch from the raw data, public key,signature and domain provided. diff --git a/beacon-chain/core/blocks/signature_test.go b/beacon-chain/core/blocks/signature_test.go index 3116add11b70..d86396713b5a 100644 --- a/beacon-chain/core/blocks/signature_test.go +++ b/beacon-chain/core/blocks/signature_test.go @@ -3,16 +3,16 @@ package blocks_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestVerifyBlockHeaderSignature(t *testing.T) { diff --git a/beacon-chain/core/blocks/withdrawals.go b/beacon-chain/core/blocks/withdrawals.go index d3e943f4bf4c..7f78f7810cc9 100644 --- a/beacon-chain/core/blocks/withdrawals.go +++ b/beacon-chain/core/blocks/withdrawals.go @@ -5,20 +5,20 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) const executionToBLSPadding = 12 diff --git a/beacon-chain/core/blocks/withdrawals_test.go b/beacon-chain/core/blocks/withdrawals_test.go index 19533f4c7805..db989b96d963 100644 --- a/beacon-chain/core/blocks/withdrawals_test.go +++ b/beacon-chain/core/blocks/withdrawals_test.go @@ -5,24 +5,24 @@ import ( "math/rand" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestProcessBLSToExecutionChange(t *testing.T) { diff --git a/beacon-chain/core/capella/BUILD.bazel b/beacon-chain/core/capella/BUILD.bazel index 8c7a49b6f191..72605e1fa9c3 100644 --- a/beacon-chain/core/capella/BUILD.bazel +++ b/beacon-chain/core/capella/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["upgrade.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/time:go_default_library", diff --git a/beacon-chain/core/capella/upgrade.go b/beacon-chain/core/capella/upgrade.go index 7941c5c00a6c..f3e9e3173d31 100644 --- a/beacon-chain/core/capella/upgrade.go +++ b/beacon-chain/core/capella/upgrade.go @@ -1,12 +1,12 @@ package capella import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // UpgradeToCapella updates a generic state to return the version Capella state. diff --git a/beacon-chain/core/capella/upgrade_test.go b/beacon-chain/core/capella/upgrade_test.go index a7023882b40f..c801268062bc 100644 --- a/beacon-chain/core/capella/upgrade_test.go +++ b/beacon-chain/core/capella/upgrade_test.go @@ -3,14 +3,14 @@ package capella_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestUpgradeToCapella(t *testing.T) { diff --git a/beacon-chain/core/epoch/BUILD.bazel b/beacon-chain/core/epoch/BUILD.bazel index 84293bb2132d..be43c49640b1 100644 --- a/beacon-chain/core/epoch/BUILD.bazel +++ b/beacon-chain/core/epoch/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["epoch_processing.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch", visibility = [ "//beacon-chain:__subpackages__", "//testing/spectest:__subpackages__", diff --git a/beacon-chain/core/epoch/epoch_processing.go b/beacon-chain/core/epoch/epoch_processing.go index 04ded5597887..48550c15db34 100644 --- a/beacon-chain/core/epoch/epoch_processing.go +++ b/beacon-chain/core/epoch/epoch_processing.go @@ -10,18 +10,18 @@ import ( "sort" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // sortableIndices implements the Sort interface to sort newly activated validator indices diff --git a/beacon-chain/core/epoch/epoch_processing_fuzz_test.go b/beacon-chain/core/epoch/epoch_processing_fuzz_test.go index 8d16c954d4ed..b795135a9570 100644 --- a/beacon-chain/core/epoch/epoch_processing_fuzz_test.go +++ b/beacon-chain/core/epoch/epoch_processing_fuzz_test.go @@ -4,9 +4,9 @@ import ( "testing" fuzz "github.com/google/gofuzz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFuzzFinalUpdates_10000(t *testing.T) { diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index 1fea78d0191f..1dddef2fecb6 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -7,20 +7,20 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/epoch/precompute/BUILD.bazel b/beacon-chain/core/epoch/precompute/BUILD.bazel index 68fba9b7ad35..3d316080236a 100644 --- a/beacon-chain/core/epoch/precompute/BUILD.bazel +++ b/beacon-chain/core/epoch/precompute/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "slashing.go", "type.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute", visibility = [ "//beacon-chain:__subpackages__", "//testing/spectest:__subpackages__", diff --git a/beacon-chain/core/epoch/precompute/attestation.go b/beacon-chain/core/epoch/precompute/attestation.go index 235c72607940..0b3fb9e2f45a 100644 --- a/beacon-chain/core/epoch/precompute/attestation.go +++ b/beacon-chain/core/epoch/precompute/attestation.go @@ -5,15 +5,15 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/epoch/precompute/attestation_test.go b/beacon-chain/core/epoch/precompute/attestation_test.go index 720282c33123..c09757140254 100644 --- a/beacon-chain/core/epoch/precompute/attestation_test.go +++ b/beacon-chain/core/epoch/precompute/attestation_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestUpdateValidator_Works(t *testing.T) { diff --git a/beacon-chain/core/epoch/precompute/justification_finalization.go b/beacon-chain/core/epoch/precompute/justification_finalization.go index 16f720bcdcbc..4aa63cfd2673 100644 --- a/beacon-chain/core/epoch/precompute/justification_finalization.go +++ b/beacon-chain/core/epoch/precompute/justification_finalization.go @@ -3,12 +3,12 @@ package precompute import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var errNilState = errors.New("nil state") diff --git a/beacon-chain/core/epoch/precompute/justification_finalization_test.go b/beacon-chain/core/epoch/precompute/justification_finalization_test.go index 434c59441e11..6553088c5205 100644 --- a/beacon-chain/core/epoch/precompute/justification_finalization_test.go +++ b/beacon-chain/core/epoch/precompute/justification_finalization_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestProcessJustificationAndFinalizationPreCompute_ConsecutiveEpochs(t *testing.T) { diff --git a/beacon-chain/core/epoch/precompute/new.go b/beacon-chain/core/epoch/precompute/new.go index bf3907f11355..a6109152620f 100644 --- a/beacon-chain/core/epoch/precompute/new.go +++ b/beacon-chain/core/epoch/precompute/new.go @@ -7,10 +7,10 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/epoch/precompute/new_test.go b/beacon-chain/core/epoch/precompute/new_test.go index 795e38104038..165e26e496d3 100644 --- a/beacon-chain/core/epoch/precompute/new_test.go +++ b/beacon-chain/core/epoch/precompute/new_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestNew(t *testing.T) { diff --git a/beacon-chain/core/epoch/precompute/reward_penalty.go b/beacon-chain/core/epoch/precompute/reward_penalty.go index 68d7a3b5d09e..5b466c260208 100644 --- a/beacon-chain/core/epoch/precompute/reward_penalty.go +++ b/beacon-chain/core/epoch/precompute/reward_penalty.go @@ -2,12 +2,12 @@ package precompute import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" ) type attesterRewardsFunc func(state.ReadOnlyBeaconState, *Balance, []*Validator) ([]uint64, []uint64, error) diff --git a/beacon-chain/core/epoch/precompute/reward_penalty_test.go b/beacon-chain/core/epoch/precompute/reward_penalty_test.go index ae50879c80f6..d6d33c21e0a3 100644 --- a/beacon-chain/core/epoch/precompute/reward_penalty_test.go +++ b/beacon-chain/core/epoch/precompute/reward_penalty_test.go @@ -6,19 +6,19 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestProcessRewardsAndPenaltiesPrecompute(t *testing.T) { diff --git a/beacon-chain/core/epoch/precompute/slashing.go b/beacon-chain/core/epoch/precompute/slashing.go index de30e3c7c262..12653c728da6 100644 --- a/beacon-chain/core/epoch/precompute/slashing.go +++ b/beacon-chain/core/epoch/precompute/slashing.go @@ -1,13 +1,13 @@ package precompute import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ProcessSlashingsPrecompute processes the slashed validators during epoch processing. diff --git a/beacon-chain/core/epoch/precompute/slashing_test.go b/beacon-chain/core/epoch/precompute/slashing_test.go index 9c098fbe8656..531eff2555fa 100644 --- a/beacon-chain/core/epoch/precompute/slashing_test.go +++ b/beacon-chain/core/epoch/precompute/slashing_test.go @@ -4,12 +4,12 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/epoch/precompute/type.go b/beacon-chain/core/epoch/precompute/type.go index 4d7e2c104377..3f9ce0947d20 100644 --- a/beacon-chain/core/epoch/precompute/type.go +++ b/beacon-chain/core/epoch/precompute/type.go @@ -1,6 +1,6 @@ package precompute -import "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" +import "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" // Validator stores the pre computation of individual validator's attesting records these records // consist of attestation votes, block inclusion record. Pre computing and storing such record diff --git a/beacon-chain/core/execution/BUILD.bazel b/beacon-chain/core/execution/BUILD.bazel index cf4efff737af..b4c4153281b7 100644 --- a/beacon-chain/core/execution/BUILD.bazel +++ b/beacon-chain/core/execution/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["upgrade.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution", visibility = [ "//beacon-chain:__subpackages__", "//cmd/prysmctl/testnet:__pkg__", diff --git a/beacon-chain/core/execution/upgrade.go b/beacon-chain/core/execution/upgrade.go index 0f489788ff1e..60505750f322 100644 --- a/beacon-chain/core/execution/upgrade.go +++ b/beacon-chain/core/execution/upgrade.go @@ -1,12 +1,12 @@ package execution import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // UpgradeToBellatrix updates inputs a generic state to return the version Bellatrix state. diff --git a/beacon-chain/core/execution/upgrade_test.go b/beacon-chain/core/execution/upgrade_test.go index ea436599ade3..2f07929ab083 100644 --- a/beacon-chain/core/execution/upgrade_test.go +++ b/beacon-chain/core/execution/upgrade_test.go @@ -3,13 +3,13 @@ package execution_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestUpgradeToBellatrix(t *testing.T) { diff --git a/beacon-chain/core/feed/BUILD.bazel b/beacon-chain/core/feed/BUILD.bazel index a713571750dd..144110cc037c 100644 --- a/beacon-chain/core/feed/BUILD.bazel +++ b/beacon-chain/core/feed/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["event.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed", visibility = [ "//beacon-chain:__subpackages__", "//testing/slasher/simulator:__subpackages__", diff --git a/beacon-chain/core/feed/block/BUILD.bazel b/beacon-chain/core/feed/block/BUILD.bazel index a4d337c4aaf9..06b234577e92 100644 --- a/beacon-chain/core/feed/block/BUILD.bazel +++ b/beacon-chain/core/feed/block/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "events.go", "notifier.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//async/event:go_default_library", diff --git a/beacon-chain/core/feed/block/events.go b/beacon-chain/core/feed/block/events.go index 168100c91496..fece706610db 100644 --- a/beacon-chain/core/feed/block/events.go +++ b/beacon-chain/core/feed/block/events.go @@ -2,7 +2,7 @@ // during the runtime of a beacon node. package block -import "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" +import "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" const ( // ReceivedBlock is sent after a block has been received by the beacon node via p2p or RPC. diff --git a/beacon-chain/core/feed/block/notifier.go b/beacon-chain/core/feed/block/notifier.go index e80876509185..0a933ff172f2 100644 --- a/beacon-chain/core/feed/block/notifier.go +++ b/beacon-chain/core/feed/block/notifier.go @@ -1,6 +1,6 @@ package block -import "github.com/prysmaticlabs/prysm/v3/async/event" +import "github.com/prysmaticlabs/prysm/v4/async/event" // Notifier interface defines the methods of the service that provides block updates to consumers. type Notifier interface { diff --git a/beacon-chain/core/feed/operation/BUILD.bazel b/beacon-chain/core/feed/operation/BUILD.bazel index 3ecba71ec887..0aab656a01b9 100644 --- a/beacon-chain/core/feed/operation/BUILD.bazel +++ b/beacon-chain/core/feed/operation/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "events.go", "notifier.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//async/event:go_default_library", diff --git a/beacon-chain/core/feed/operation/events.go b/beacon-chain/core/feed/operation/events.go index 860f1d9a91a9..dd73766257f5 100644 --- a/beacon-chain/core/feed/operation/events.go +++ b/beacon-chain/core/feed/operation/events.go @@ -2,7 +2,7 @@ package operation import ( - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) const ( diff --git a/beacon-chain/core/feed/operation/notifier.go b/beacon-chain/core/feed/operation/notifier.go index c16cbaf3b99d..ddc44815cb03 100644 --- a/beacon-chain/core/feed/operation/notifier.go +++ b/beacon-chain/core/feed/operation/notifier.go @@ -1,6 +1,6 @@ package operation -import "github.com/prysmaticlabs/prysm/v3/async/event" +import "github.com/prysmaticlabs/prysm/v4/async/event" // Notifier interface defines the methods of the service that provides beacon block operation updates to consumers. type Notifier interface { diff --git a/beacon-chain/core/feed/state/BUILD.bazel b/beacon-chain/core/feed/state/BUILD.bazel index ce317b1b2eeb..0110fd884063 100644 --- a/beacon-chain/core/feed/state/BUILD.bazel +++ b/beacon-chain/core/feed/state/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "events.go", "notifier.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state", visibility = [ "//beacon-chain:__subpackages__", "//testing/slasher/simulator:__subpackages__", diff --git a/beacon-chain/core/feed/state/events.go b/beacon-chain/core/feed/state/events.go index 2b1364691755..191501936f14 100644 --- a/beacon-chain/core/feed/state/events.go +++ b/beacon-chain/core/feed/state/events.go @@ -6,8 +6,8 @@ package state import ( "time" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) const ( diff --git a/beacon-chain/core/feed/state/notifier.go b/beacon-chain/core/feed/state/notifier.go index 424886150336..159df20152c5 100644 --- a/beacon-chain/core/feed/state/notifier.go +++ b/beacon-chain/core/feed/state/notifier.go @@ -1,6 +1,6 @@ package state -import "github.com/prysmaticlabs/prysm/v3/async/event" +import "github.com/prysmaticlabs/prysm/v4/async/event" // Notifier interface defines the methods of the service that provides state updates to consumers. type Notifier interface { diff --git a/beacon-chain/core/helpers/BUILD.bazel b/beacon-chain/core/helpers/BUILD.bazel index b753ea2af54f..b6283bd29d24 100644 --- a/beacon-chain/core/helpers/BUILD.bazel +++ b/beacon-chain/core/helpers/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "validators.go", "weak_subjectivity.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers", visibility = ["//visibility:public"], deps = [ "//beacon-chain/cache:go_default_library", diff --git a/beacon-chain/core/helpers/attestation.go b/beacon-chain/core/helpers/attestation.go index 7540c80ea32d..21353f2ca9d8 100644 --- a/beacon-chain/core/helpers/attestation.go +++ b/beacon-chain/core/helpers/attestation.go @@ -6,13 +6,13 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ValidateNilAttestation checks if any composite field of input attestation is nil. diff --git a/beacon-chain/core/helpers/attestation_test.go b/beacon-chain/core/helpers/attestation_test.go index 6dfa899386e4..3e0c69373a67 100644 --- a/beacon-chain/core/helpers/attestation_test.go +++ b/beacon-chain/core/helpers/attestation_test.go @@ -6,18 +6,18 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestAttestation_IsAggregator(t *testing.T) { diff --git a/beacon-chain/core/helpers/beacon_committee.go b/beacon-chain/core/helpers/beacon_committee.go index 771c6d4c3bc2..85a85cc6fb3e 100644 --- a/beacon-chain/core/helpers/beacon_committee.go +++ b/beacon-chain/core/helpers/beacon_committee.go @@ -10,17 +10,17 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var ( diff --git a/beacon-chain/core/helpers/beacon_committee_test.go b/beacon-chain/core/helpers/beacon_committee_test.go index 5c047abc1e66..5b0051ecc2d7 100644 --- a/beacon-chain/core/helpers/beacon_committee_test.go +++ b/beacon-chain/core/helpers/beacon_committee_test.go @@ -7,17 +7,17 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestComputeCommittee_WithoutCache(t *testing.T) { diff --git a/beacon-chain/core/helpers/block.go b/beacon-chain/core/helpers/block.go index 2cb88306ccab..475ade343839 100644 --- a/beacon-chain/core/helpers/block.go +++ b/beacon-chain/core/helpers/block.go @@ -4,10 +4,10 @@ import ( "math" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // BlockRootAtSlot returns the block root stored in the BeaconState for a recent slot. diff --git a/beacon-chain/core/helpers/block_test.go b/beacon-chain/core/helpers/block_test.go index 16da474e7eea..6a994eb0a420 100644 --- a/beacon-chain/core/helpers/block_test.go +++ b/beacon-chain/core/helpers/block_test.go @@ -5,13 +5,13 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBlockRootAtSlot_CorrectBlockRoot(t *testing.T) { diff --git a/beacon-chain/core/helpers/genesis.go b/beacon-chain/core/helpers/genesis.go index d6b6c2eb83a9..8904e77a9764 100644 --- a/beacon-chain/core/helpers/genesis.go +++ b/beacon-chain/core/helpers/genesis.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // UpdateGenesisEth1Data updates eth1 data for genesis state. diff --git a/beacon-chain/core/helpers/randao.go b/beacon-chain/core/helpers/randao.go index 59f88b58f342..efbe6556bfc4 100644 --- a/beacon-chain/core/helpers/randao.go +++ b/beacon-chain/core/helpers/randao.go @@ -1,12 +1,12 @@ package helpers import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // Seed returns the randao seed used for shuffling of a given epoch. diff --git a/beacon-chain/core/helpers/randao_test.go b/beacon-chain/core/helpers/randao_test.go index 8e988843b626..b6695a5e8562 100644 --- a/beacon-chain/core/helpers/randao_test.go +++ b/beacon-chain/core/helpers/randao_test.go @@ -4,13 +4,13 @@ import ( "encoding/binary" "testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestRandaoMix_OK(t *testing.T) { diff --git a/beacon-chain/core/helpers/rewards_penalties.go b/beacon-chain/core/helpers/rewards_penalties.go index ff12ce5baaf1..c0efc55cf33a 100644 --- a/beacon-chain/core/helpers/rewards_penalties.go +++ b/beacon-chain/core/helpers/rewards_penalties.go @@ -3,12 +3,12 @@ package helpers import ( "errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var balanceCache = cache.NewEffectiveBalanceCache() diff --git a/beacon-chain/core/helpers/rewards_penalties_test.go b/beacon-chain/core/helpers/rewards_penalties_test.go index 47ebe5a682bc..baeec1e2f344 100644 --- a/beacon-chain/core/helpers/rewards_penalties_test.go +++ b/beacon-chain/core/helpers/rewards_penalties_test.go @@ -4,13 +4,13 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestTotalBalance_OK(t *testing.T) { diff --git a/beacon-chain/core/helpers/shuffle.go b/beacon-chain/core/helpers/shuffle.go index 30860dd72006..6c229e8656a3 100644 --- a/beacon-chain/core/helpers/shuffle.go +++ b/beacon-chain/core/helpers/shuffle.go @@ -4,11 +4,11 @@ import ( "encoding/binary" "fmt" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) const seedSize = int8(32) diff --git a/beacon-chain/core/helpers/shuffle_test.go b/beacon-chain/core/helpers/shuffle_test.go index bb2f65eb3ed1..0ca6f97c2f6c 100644 --- a/beacon-chain/core/helpers/shuffle_test.go +++ b/beacon-chain/core/helpers/shuffle_test.go @@ -5,11 +5,11 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestShuffleList_InvalidValidatorCount(t *testing.T) { diff --git a/beacon-chain/core/helpers/sync_committee.go b/beacon-chain/core/helpers/sync_committee.go index c7e7e1c18769..1066547c777b 100644 --- a/beacon-chain/core/helpers/sync_committee.go +++ b/beacon-chain/core/helpers/sync_committee.go @@ -6,14 +6,14 @@ import ( "bytes" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/core/helpers/sync_committee_test.go b/beacon-chain/core/helpers/sync_committee_test.go index 3d60ce25a0e9..21bc6040fdb3 100644 --- a/beacon-chain/core/helpers/sync_committee_test.go +++ b/beacon-chain/core/helpers/sync_committee_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestIsCurrentEpochSyncCommittee_UsingCache(t *testing.T) { diff --git a/beacon-chain/core/helpers/validators.go b/beacon-chain/core/helpers/validators.go index e0b3338b20d5..b0a2edfbba6b 100644 --- a/beacon-chain/core/helpers/validators.go +++ b/beacon-chain/core/helpers/validators.go @@ -7,15 +7,15 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/core/helpers/validators_test.go b/beacon-chain/core/helpers/validators_test.go index 58d86f64ea5c..ed890814819a 100644 --- a/beacon-chain/core/helpers/validators_test.go +++ b/beacon-chain/core/helpers/validators_test.go @@ -5,17 +5,17 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestIsActiveValidator_OK(t *testing.T) { diff --git a/beacon-chain/core/helpers/weak_subjectivity.go b/beacon-chain/core/helpers/weak_subjectivity.go index 016be170dce2..aa26a51cc67f 100644 --- a/beacon-chain/core/helpers/weak_subjectivity.go +++ b/beacon-chain/core/helpers/weak_subjectivity.go @@ -8,15 +8,15 @@ import ( "strconv" "strings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ComputeWeakSubjectivityPeriod returns weak subjectivity period for the active validator count and finalized epoch. diff --git a/beacon-chain/core/helpers/weak_subjectivity_test.go b/beacon-chain/core/helpers/weak_subjectivity_test.go index 451de8f393d7..6bf16d7e940f 100644 --- a/beacon-chain/core/helpers/weak_subjectivity_test.go +++ b/beacon-chain/core/helpers/weak_subjectivity_test.go @@ -5,15 +5,15 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestWeakSubjectivity_ComputeWeakSubjectivityPeriod(t *testing.T) { diff --git a/beacon-chain/core/signing/BUILD.bazel b/beacon-chain/core/signing/BUILD.bazel index 7a20b3e421d5..8d3b87b712b6 100644 --- a/beacon-chain/core/signing/BUILD.bazel +++ b/beacon-chain/core/signing/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "signature.go", "signing_root.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/core/signing/domain.go b/beacon-chain/core/signing/domain.go index 479895bfba5a..b35f5d4e8a5c 100644 --- a/beacon-chain/core/signing/domain.go +++ b/beacon-chain/core/signing/domain.go @@ -2,9 +2,9 @@ package signing import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Domain returns the domain version for BLS private key to sign and verify. diff --git a/beacon-chain/core/signing/domain_test.go b/beacon-chain/core/signing/domain_test.go index 096fa4623511..16f2addfdabf 100644 --- a/beacon-chain/core/signing/domain_test.go +++ b/beacon-chain/core/signing/domain_test.go @@ -3,11 +3,11 @@ package signing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDomain_OK(t *testing.T) { diff --git a/beacon-chain/core/signing/signature.go b/beacon-chain/core/signing/signature.go index 286ad93648d7..ca2dad9681a7 100644 --- a/beacon-chain/core/signing/signature.go +++ b/beacon-chain/core/signing/signature.go @@ -2,8 +2,8 @@ package signing import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var ErrNilRegistration = errors.New("nil signed registration") diff --git a/beacon-chain/core/signing/signature_test.go b/beacon-chain/core/signing/signature_test.go index 7aae0120405b..ddf20e644094 100644 --- a/beacon-chain/core/signing/signature_test.go +++ b/beacon-chain/core/signing/signature_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestVerifyRegistrationSignature(t *testing.T) { diff --git a/beacon-chain/core/signing/signing_root.go b/beacon-chain/core/signing/signing_root.go index bc57f9421851..aac1b6d2f9eb 100644 --- a/beacon-chain/core/signing/signing_root.go +++ b/beacon-chain/core/signing/signing_root.go @@ -5,12 +5,12 @@ import ( "github.com/pkg/errors" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ForkVersionByteLength length of fork version byte array. diff --git a/beacon-chain/core/signing/signing_root_test.go b/beacon-chain/core/signing/signing_root_test.go index 174746f4135e..e8930b1e452a 100644 --- a/beacon-chain/core/signing/signing_root_test.go +++ b/beacon-chain/core/signing/signing_root_test.go @@ -7,18 +7,18 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" fuzz "github.com/google/gofuzz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSigningRoot_ComputeSigningRoot(t *testing.T) { diff --git a/beacon-chain/core/time/BUILD.bazel b/beacon-chain/core/time/BUILD.bazel index 411d8e4820b7..832a5793d4a0 100644 --- a/beacon-chain/core/time/BUILD.bazel +++ b/beacon-chain/core/time/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["slot_epoch.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/core/time/slot_epoch.go b/beacon-chain/core/time/slot_epoch.go index 2dcec7fe47f2..c41587131c2f 100644 --- a/beacon-chain/core/time/slot_epoch.go +++ b/beacon-chain/core/time/slot_epoch.go @@ -1,11 +1,11 @@ package time import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // CurrentEpoch returns the current epoch number calculated from diff --git a/beacon-chain/core/time/slot_epoch_test.go b/beacon-chain/core/time/slot_epoch_test.go index eb5d1f0f2b25..dfc1da60d07d 100644 --- a/beacon-chain/core/time/slot_epoch_test.go +++ b/beacon-chain/core/time/slot_epoch_test.go @@ -3,16 +3,16 @@ package time_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestSlotToEpoch_OK(t *testing.T) { diff --git a/beacon-chain/core/transition/BUILD.bazel b/beacon-chain/core/transition/BUILD.bazel index f44b5d456d01..7aeac6c76399 100644 --- a/beacon-chain/core/transition/BUILD.bazel +++ b/beacon-chain/core/transition/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "transition.go", "transition_no_verify_sig.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition", visibility = ["//visibility:public"], deps = [ "//beacon-chain/cache:go_default_library", diff --git a/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go b/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go index 5a2e7ffdcefa..b73bcf92d2b0 100644 --- a/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go +++ b/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go @@ -6,21 +6,21 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - p2pType "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + p2pType "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestExecuteAltairStateTransitionNoVerify_FullProcess(t *testing.T) { diff --git a/beacon-chain/core/transition/bellatrix_transition_no_verify_sig_test.go b/beacon-chain/core/transition/bellatrix_transition_no_verify_sig_test.go index 18df53884cc4..ecc3529d9cba 100644 --- a/beacon-chain/core/transition/bellatrix_transition_no_verify_sig_test.go +++ b/beacon-chain/core/transition/bellatrix_transition_no_verify_sig_test.go @@ -6,23 +6,23 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - p2pType "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + p2pType "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestExecuteBellatrixStateTransitionNoVerify_FullProcess(t *testing.T) { diff --git a/beacon-chain/core/transition/benchmarks_test.go b/beacon-chain/core/transition/benchmarks_test.go index a69e00d476e0..a74c9582b4a5 100644 --- a/beacon-chain/core/transition/benchmarks_test.go +++ b/beacon-chain/core/transition/benchmarks_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - coreState "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/benchmark" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + coreState "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/benchmark" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/transition/interop/BUILD.bazel b/beacon-chain/core/transition/interop/BUILD.bazel index f4e589ebf57a..74f0277d0393 100644 --- a/beacon-chain/core/transition/interop/BUILD.bazel +++ b/beacon-chain/core/transition/interop/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "write_block_to_disk.go", "write_state_to_disk.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/interop", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/interop", visibility = [ "//beacon-chain:__subpackages__", "//tools:__subpackages__", diff --git a/beacon-chain/core/transition/interop/write_block_to_disk.go b/beacon-chain/core/transition/interop/write_block_to_disk.go index d768da905851..98938138ea41 100644 --- a/beacon-chain/core/transition/interop/write_block_to_disk.go +++ b/beacon-chain/core/transition/interop/write_block_to_disk.go @@ -5,9 +5,9 @@ import ( "os" "path" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/io/file" ) // WriteBlockToDisk as a block ssz. Writes to temp directory. Debug! diff --git a/beacon-chain/core/transition/interop/write_state_to_disk.go b/beacon-chain/core/transition/interop/write_state_to_disk.go index b9757a97a8e8..87bab0c6ff38 100644 --- a/beacon-chain/core/transition/interop/write_state_to_disk.go +++ b/beacon-chain/core/transition/interop/write_state_to_disk.go @@ -5,9 +5,9 @@ import ( "os" "path" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/io/file" ) // WriteStateToDisk as a state ssz. Writes to temp directory. Debug! diff --git a/beacon-chain/core/transition/skip_slot_cache.go b/beacon-chain/core/transition/skip_slot_cache.go index 51bcaa4ed98e..4897b7905b8a 100644 --- a/beacon-chain/core/transition/skip_slot_cache.go +++ b/beacon-chain/core/transition/skip_slot_cache.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // SkipSlotCache exists for the unlikely scenario that is a large gap between the head state and diff --git a/beacon-chain/core/transition/skip_slot_cache_test.go b/beacon-chain/core/transition/skip_slot_cache_test.go index 73a7b7e37ff1..d4929e8c72fb 100644 --- a/beacon-chain/core/transition/skip_slot_cache_test.go +++ b/beacon-chain/core/transition/skip_slot_cache_test.go @@ -5,15 +5,15 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSkipSlotCache_OK(t *testing.T) { diff --git a/beacon-chain/core/transition/state-bellatrix.go b/beacon-chain/core/transition/state-bellatrix.go index 0e5710097d11..4f4e34623721 100644 --- a/beacon-chain/core/transition/state-bellatrix.go +++ b/beacon-chain/core/transition/state-bellatrix.go @@ -4,17 +4,17 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // GenesisBeaconStateBellatrix gets called when MinGenesisActiveValidatorCount count of diff --git a/beacon-chain/core/transition/state.go b/beacon-chain/core/transition/state.go index d24a62b60df5..9ada3dc37c48 100644 --- a/beacon-chain/core/transition/state.go +++ b/beacon-chain/core/transition/state.go @@ -4,14 +4,14 @@ import ( "context" "github.com/pkg/errors" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // GenesisBeaconState gets called when MinGenesisActiveValidatorCount count of diff --git a/beacon-chain/core/transition/state_fuzz_test.go b/beacon-chain/core/transition/state_fuzz_test.go index 876d87f664c2..a11fdc6a3ef1 100644 --- a/beacon-chain/core/transition/state_fuzz_test.go +++ b/beacon-chain/core/transition/state_fuzz_test.go @@ -5,9 +5,9 @@ import ( "testing" fuzz "github.com/google/gofuzz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenesisBeaconState_1000(t *testing.T) { diff --git a/beacon-chain/core/transition/state_test.go b/beacon-chain/core/transition/state_test.go index ea5e53dba9ab..3f22db8f425a 100644 --- a/beacon-chain/core/transition/state_test.go +++ b/beacon-chain/core/transition/state_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/core/transition/stateutils/BUILD.bazel b/beacon-chain/core/transition/stateutils/BUILD.bazel index 5bc9dcb3f597..2ee63cbfee82 100644 --- a/beacon-chain/core/transition/stateutils/BUILD.bazel +++ b/beacon-chain/core/transition/stateutils/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["validator_index_map.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/stateutils", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/stateutils", visibility = [ "//beacon-chain:__subpackages__", "//testing/util:__pkg__", diff --git a/beacon-chain/core/transition/stateutils/validator_index_map.go b/beacon-chain/core/transition/stateutils/validator_index_map.go index dd5085c95ed6..51bba13377b6 100644 --- a/beacon-chain/core/transition/stateutils/validator_index_map.go +++ b/beacon-chain/core/transition/stateutils/validator_index_map.go @@ -4,10 +4,10 @@ package stateutils import ( - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ValidatorIndexMap builds a lookup map for quickly determining the index of diff --git a/beacon-chain/core/transition/stateutils/validator_index_map_test.go b/beacon-chain/core/transition/stateutils/validator_index_map_test.go index c92a0b1421a1..ec69ab9aadb2 100644 --- a/beacon-chain/core/transition/stateutils/validator_index_map_test.go +++ b/beacon-chain/core/transition/stateutils/validator_index_map_test.go @@ -3,14 +3,14 @@ package stateutils_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/stateutils" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/stateutils" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestValidatorIndexMap_OK(t *testing.T) { diff --git a/beacon-chain/core/transition/trailing_slot_state_cache.go b/beacon-chain/core/transition/trailing_slot_state_cache.go index ec3af63c1702..378220e4f382 100644 --- a/beacon-chain/core/transition/trailing_slot_state_cache.go +++ b/beacon-chain/core/transition/trailing_slot_state_cache.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" ) type nextSlotCache struct { diff --git a/beacon-chain/core/transition/trailing_slot_state_cache_test.go b/beacon-chain/core/transition/trailing_slot_state_cache_test.go index bf67ab45a58a..88c572cf2034 100644 --- a/beacon-chain/core/transition/trailing_slot_state_cache_test.go +++ b/beacon-chain/core/transition/trailing_slot_state_cache_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestTrailingSlotState_RoundTrip(t *testing.T) { diff --git a/beacon-chain/core/transition/transition.go b/beacon-chain/core/transition/transition.go index a000f57a5114..2b9701cef40f 100644 --- a/beacon-chain/core/transition/transition.go +++ b/beacon-chain/core/transition/transition.go @@ -9,22 +9,22 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella" - e "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella" + e "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/transition/transition_fuzz_test.go b/beacon-chain/core/transition/transition_fuzz_test.go index cc0ddfe9c44a..a275727c0e1c 100644 --- a/beacon-chain/core/transition/transition_fuzz_test.go +++ b/beacon-chain/core/transition/transition_fuzz_test.go @@ -5,12 +5,12 @@ import ( "testing" fuzz "github.com/google/gofuzz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFuzzExecuteStateTransition_1000(t *testing.T) { diff --git a/beacon-chain/core/transition/transition_no_verify_sig.go b/beacon-chain/core/transition/transition_no_verify_sig.go index aa79a835c064..16d3ffc25bb7 100644 --- a/beacon-chain/core/transition/transition_no_verify_sig.go +++ b/beacon-chain/core/transition/transition_no_verify_sig.go @@ -6,16 +6,16 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/interop" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/interop" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/transition/transition_no_verify_sig_test.go b/beacon-chain/core/transition/transition_no_verify_sig_test.go index de53d1d056aa..7fc6d0b14954 100644 --- a/beacon-chain/core/transition/transition_no_verify_sig_test.go +++ b/beacon-chain/core/transition/transition_no_verify_sig_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestExecuteStateTransitionNoVerify_FullProcess(t *testing.T) { diff --git a/beacon-chain/core/transition/transition_test.go b/beacon-chain/core/transition/transition_test.go index ed23314c99ba..3a8e5f380ea5 100644 --- a/beacon-chain/core/transition/transition_test.go +++ b/beacon-chain/core/transition/transition_test.go @@ -6,25 +6,25 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func init() { diff --git a/beacon-chain/core/validators/BUILD.bazel b/beacon-chain/core/validators/BUILD.bazel index 0b6bac460156..21bf85257e00 100644 --- a/beacon-chain/core/validators/BUILD.bazel +++ b/beacon-chain/core/validators/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["validator.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators", visibility = [ "//beacon-chain:__subpackages__", "//testing/endtoend:__subpackages__", diff --git a/beacon-chain/core/validators/validator.go b/beacon-chain/core/validators/validator.go index 6569321e3411..daf5c99e36e9 100644 --- a/beacon-chain/core/validators/validator.go +++ b/beacon-chain/core/validators/validator.go @@ -8,14 +8,14 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // InitiateValidatorExit takes in validator index and updates diff --git a/beacon-chain/core/validators/validator_test.go b/beacon-chain/core/validators/validator_test.go index f3ec711b2f51..f106c07f3734 100644 --- a/beacon-chain/core/validators/validator_test.go +++ b/beacon-chain/core/validators/validator_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestHasVoted_OK(t *testing.T) { diff --git a/beacon-chain/db/BUILD.bazel b/beacon-chain/db/BUILD.bazel index 618a640ee9b6..f4798256a0e6 100644 --- a/beacon-chain/db/BUILD.bazel +++ b/beacon-chain/db/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "log.go", "restore.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/db", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/db", visibility = [ "//beacon-chain:__subpackages__", "//cmd/beacon-chain:__subpackages__", diff --git a/beacon-chain/db/alias.go b/beacon-chain/db/alias.go index f04668ff78ad..9ee1c8afe5e8 100644 --- a/beacon-chain/db/alias.go +++ b/beacon-chain/db/alias.go @@ -1,6 +1,6 @@ package db -import "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" +import "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" // ReadOnlyDatabase exposes Prysm's Ethereum data backend for read access only, no information about // head info. For head info, use github.com/prysmaticlabs/prysm/blockchain.HeadFetcher. diff --git a/beacon-chain/db/db.go b/beacon-chain/db/db.go index bbf1204a0948..bcdf60137666 100644 --- a/beacon-chain/db/db.go +++ b/beacon-chain/db/db.go @@ -5,7 +5,7 @@ package db import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" ) // NewDB initializes a new DB. diff --git a/beacon-chain/db/db_test.go b/beacon-chain/db/db_test.go index b0cfa35f55f9..1efe7a0a67eb 100644 --- a/beacon-chain/db/db_test.go +++ b/beacon-chain/db/db_test.go @@ -1,5 +1,5 @@ package db -import "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" +import "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" var _ Database = (*kv.Store)(nil) diff --git a/beacon-chain/db/errors.go b/beacon-chain/db/errors.go index 5843b7c44dd3..1d6b430b9b1c 100644 --- a/beacon-chain/db/errors.go +++ b/beacon-chain/db/errors.go @@ -1,6 +1,6 @@ package db -import "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" +import "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" // ErrNotFound can be used to determine if an error from a method in the database package // represents a "not found" error. These often require different handling than a low-level diff --git a/beacon-chain/db/filters/BUILD.bazel b/beacon-chain/db/filters/BUILD.bazel index 8e2cf42da760..ca111ca739bd 100644 --- a/beacon-chain/db/filters/BUILD.bazel +++ b/beacon-chain/db/filters/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["filter.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters", visibility = [ "//beacon-chain:__subpackages__", "//tools:__subpackages__", diff --git a/beacon-chain/db/filters/filter.go b/beacon-chain/db/filters/filter.go index 0a10bd827146..082916bb7dcc 100644 --- a/beacon-chain/db/filters/filter.go +++ b/beacon-chain/db/filters/filter.go @@ -14,7 +14,7 @@ // } package filters -import primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" +import primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" // FilterType defines an enum which is used as the keys in a map that tracks // set attribute filters for data as part of the `FilterQuery` struct type. diff --git a/beacon-chain/db/filters/filter_test.go b/beacon-chain/db/filters/filter_test.go index 15b8d9179962..c6b282eb0178 100644 --- a/beacon-chain/db/filters/filter_test.go +++ b/beacon-chain/db/filters/filter_test.go @@ -3,8 +3,8 @@ package filters import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestQueryFilter_ChainsCorrectly(t *testing.T) { diff --git a/beacon-chain/db/iface/BUILD.bazel b/beacon-chain/db/iface/BUILD.bazel index 876f13006b9f..784eb5daefcf 100644 --- a/beacon-chain/db/iface/BUILD.bazel +++ b/beacon-chain/db/iface/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "errors.go", "interface.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface", # Other packages must use github.com/prysmaticlabs/prysm/beacon-chain/db.Database alias. visibility = ["//visibility:public"], deps = [ diff --git a/beacon-chain/db/iface/interface.go b/beacon-chain/db/iface/interface.go index aea252b3d0b4..0f220e6f3e65 100644 --- a/beacon-chain/db/iface/interface.go +++ b/beacon-chain/db/iface/interface.go @@ -8,13 +8,13 @@ import ( "io" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/backup" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/backup" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ReadOnlyDatabase defines a struct which only has read access to database methods. diff --git a/beacon-chain/db/kv/BUILD.bazel b/beacon-chain/db/kv/BUILD.bazel index dde9868e6e8f..7ab14dd34e4a 100644 --- a/beacon-chain/db/kv/BUILD.bazel +++ b/beacon-chain/db/kv/BUILD.bazel @@ -28,7 +28,7 @@ go_library( "validated_checkpoint.go", "wss.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/blocks:go_default_library", diff --git a/beacon-chain/db/kv/archived_point.go b/beacon-chain/db/kv/archived_point.go index 2146719f45ed..6beff55fe6d2 100644 --- a/beacon-chain/db/kv/archived_point.go +++ b/beacon-chain/db/kv/archived_point.go @@ -3,8 +3,8 @@ package kv import ( "context" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/archived_point_test.go b/beacon-chain/db/kv/archived_point_test.go index 63f00daf1dbd..5f470f1792af 100644 --- a/beacon-chain/db/kv/archived_point_test.go +++ b/beacon-chain/db/kv/archived_point_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestArchivedPointIndexRoot_CanSaveRetrieve(t *testing.T) { diff --git a/beacon-chain/db/kv/backup.go b/beacon-chain/db/kv/backup.go index a04bb4a5053d..ab328c156eb7 100644 --- a/beacon-chain/db/kv/backup.go +++ b/beacon-chain/db/kv/backup.go @@ -5,9 +5,9 @@ import ( "fmt" "path" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/io/file" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/backup_test.go b/beacon-chain/db/kv/backup_test.go index 70e946e974d8..056c95e5f3c4 100644 --- a/beacon-chain/db/kv/backup_test.go +++ b/beacon-chain/db/kv/backup_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestStore_Backup(t *testing.T) { diff --git a/beacon-chain/db/kv/blocks.go b/beacon-chain/db/kv/blocks.go index 743d9be3f2bd..93baea1e7ec5 100644 --- a/beacon-chain/db/kv/blocks.go +++ b/beacon-chain/db/kv/blocks.go @@ -9,16 +9,16 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/blocks_test.go b/beacon-chain/db/kv/blocks_test.go index ae384733a3e9..5349f08c5ad3 100644 --- a/beacon-chain/db/kv/blocks_test.go +++ b/beacon-chain/db/kv/blocks_test.go @@ -6,16 +6,16 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/db/kv/checkpoint.go b/beacon-chain/db/kv/checkpoint.go index b734094077da..af652b94e86b 100644 --- a/beacon-chain/db/kv/checkpoint.go +++ b/beacon-chain/db/kv/checkpoint.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/checkpoint_test.go b/beacon-chain/db/kv/checkpoint_test.go index 7df4a4022e74..a4c4916ee19f 100644 --- a/beacon-chain/db/kv/checkpoint_test.go +++ b/beacon-chain/db/kv/checkpoint_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/db/kv/deposit_contract_test.go b/beacon-chain/db/kv/deposit_contract_test.go index 264272cc23f8..2ebba7b7cfcb 100644 --- a/beacon-chain/db/kv/deposit_contract_test.go +++ b/beacon-chain/db/kv/deposit_contract_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_DepositContract(t *testing.T) { diff --git a/beacon-chain/db/kv/encoding.go b/beacon-chain/db/kv/encoding.go index 25df9d4678ba..7e2d888e49aa 100644 --- a/beacon-chain/db/kv/encoding.go +++ b/beacon-chain/db/kv/encoding.go @@ -7,7 +7,7 @@ import ( "github.com/golang/snappy" fastssz "github.com/prysmaticlabs/fastssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/db/kv/encoding_test.go b/beacon-chain/db/kv/encoding_test.go index b96f6a951567..3ba809ca5bf8 100644 --- a/beacon-chain/db/kv/encoding_test.go +++ b/beacon-chain/db/kv/encoding_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - testpb "github.com/prysmaticlabs/prysm/v3/proto/testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + testpb "github.com/prysmaticlabs/prysm/v4/proto/testing" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_encode_handlesNilFromFunction(t *testing.T) { diff --git a/beacon-chain/db/kv/execution_chain.go b/beacon-chain/db/kv/execution_chain.go index 2a49ab8b26a9..f8d3c01ac0d3 100644 --- a/beacon-chain/db/kv/execution_chain.go +++ b/beacon-chain/db/kv/execution_chain.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/db/kv/execution_chain_test.go b/beacon-chain/db/kv/execution_chain_test.go index 209ba023ba21..0d846dd19ca5 100644 --- a/beacon-chain/db/kv/execution_chain_test.go +++ b/beacon-chain/db/kv/execution_chain_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func TestStore_SavePowchainData(t *testing.T) { diff --git a/beacon-chain/db/kv/finalized_block_roots.go b/beacon-chain/db/kv/finalized_block_roots.go index 37f81ed1e8df..20aae076882b 100644 --- a/beacon-chain/db/kv/finalized_block_roots.go +++ b/beacon-chain/db/kv/finalized_block_roots.go @@ -4,12 +4,12 @@ import ( "bytes" "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/finalized_block_roots_test.go b/beacon-chain/db/kv/finalized_block_roots_test.go index 6f4dbf9746da..5115e826e5f7 100644 --- a/beacon-chain/db/kv/finalized_block_roots_test.go +++ b/beacon-chain/db/kv/finalized_block_roots_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) var genesisBlockRoot = bytesutil.ToBytes32([]byte{'G', 'E', 'N', 'E', 'S', 'I', 'S'}) diff --git a/beacon-chain/db/kv/genesis.go b/beacon-chain/db/kv/genesis.go index 510d6961064a..cd7f706e4abd 100644 --- a/beacon-chain/db/kv/genesis.go +++ b/beacon-chain/db/kv/genesis.go @@ -4,11 +4,11 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - dbIface "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + dbIface "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SaveGenesisData bootstraps the beaconDB with a given genesis state. diff --git a/beacon-chain/db/kv/genesis_test.go b/beacon-chain/db/kv/genesis_test.go index abf7fae95c3e..f8667715cf00 100644 --- a/beacon-chain/db/kv/genesis_test.go +++ b/beacon-chain/db/kv/genesis_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestStore_SaveGenesisData(t *testing.T) { diff --git a/beacon-chain/db/kv/init_test.go b/beacon-chain/db/kv/init_test.go index d7044f1563f9..c45e351fc006 100644 --- a/beacon-chain/db/kv/init_test.go +++ b/beacon-chain/db/kv/init_test.go @@ -1,7 +1,7 @@ package kv import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func init() { diff --git a/beacon-chain/db/kv/kv.go b/beacon-chain/db/kv/kv.go index a5ef6516b2e4..97d4b4edbc8b 100644 --- a/beacon-chain/db/kv/kv.go +++ b/beacon-chain/db/kv/kv.go @@ -14,11 +14,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" prombolt "github.com/prysmaticlabs/prombbolt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/io/file" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/kv_test.go b/beacon-chain/db/kv/kv_test.go index e92ef556bb54..3941d468cbb0 100644 --- a/beacon-chain/db/kv/kv_test.go +++ b/beacon-chain/db/kv/kv_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/migration_archived_index.go b/beacon-chain/db/kv/migration_archived_index.go index 04a1f24ec571..b6ae625593c4 100644 --- a/beacon-chain/db/kv/migration_archived_index.go +++ b/beacon-chain/db/kv/migration_archived_index.go @@ -4,9 +4,9 @@ import ( "bytes" "context" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/migration_archived_index_test.go b/beacon-chain/db/kv/migration_archived_index_test.go index 099e410433e3..bc28a64c1129 100644 --- a/beacon-chain/db/kv/migration_archived_index_test.go +++ b/beacon-chain/db/kv/migration_archived_index_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/util" "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/migration_block_slot_index.go b/beacon-chain/db/kv/migration_block_slot_index.go index 1e58296642ec..b90eaa671227 100644 --- a/beacon-chain/db/kv/migration_block_slot_index.go +++ b/beacon-chain/db/kv/migration_block_slot_index.go @@ -5,7 +5,7 @@ import ( "context" "strconv" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/migration_block_slot_index_test.go b/beacon-chain/db/kv/migration_block_slot_index_test.go index b9ea7584d9c8..d4a36ad3b646 100644 --- a/beacon-chain/db/kv/migration_block_slot_index_test.go +++ b/beacon-chain/db/kv/migration_block_slot_index_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/migration_state_validators.go b/beacon-chain/db/kv/migration_state_validators.go index 54b5caf60f1c..fb08b5d43aec 100644 --- a/beacon-chain/db/kv/migration_state_validators.go +++ b/beacon-chain/db/kv/migration_state_validators.go @@ -7,10 +7,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - "github.com/prysmaticlabs/prysm/v3/monitoring/progress" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + "github.com/prysmaticlabs/prysm/v4/monitoring/progress" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/schollz/progressbar/v3" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/migration_state_validators_test.go b/beacon-chain/db/kv/migration_state_validators_test.go index 87b90c3016fa..78cf03fe8518 100644 --- a/beacon-chain/db/kv/migration_state_validators_test.go +++ b/beacon-chain/db/kv/migration_state_validators_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/state.go b/beacon-chain/db/kv/state.go index 8140703e89f4..a0322154de41 100644 --- a/beacon-chain/db/kv/state.go +++ b/beacon-chain/db/kv/state.go @@ -7,18 +7,18 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/genesis" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/genesis" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/state_summary.go b/beacon-chain/db/kv/state_summary.go index 351a0b49d62f..220262e75ab5 100644 --- a/beacon-chain/db/kv/state_summary.go +++ b/beacon-chain/db/kv/state_summary.go @@ -3,8 +3,8 @@ package kv import ( "context" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/state_summary_cache.go b/beacon-chain/db/kv/state_summary_cache.go index d926411f6b71..fcb71bbd2f4c 100644 --- a/beacon-chain/db/kv/state_summary_cache.go +++ b/beacon-chain/db/kv/state_summary_cache.go @@ -3,7 +3,7 @@ package kv import ( "sync" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) const stateSummaryCachePruneCount = 128 diff --git a/beacon-chain/db/kv/state_summary_test.go b/beacon-chain/db/kv/state_summary_test.go index 34575935c000..1127ba288cfc 100644 --- a/beacon-chain/db/kv/state_summary_test.go +++ b/beacon-chain/db/kv/state_summary_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStateSummary_CanSaveRetrieve(t *testing.T) { diff --git a/beacon-chain/db/kv/state_test.go b/beacon-chain/db/kv/state_test.go index c15ab5d50468..56aee2bd3cc7 100644 --- a/beacon-chain/db/kv/state_test.go +++ b/beacon-chain/db/kv/state_test.go @@ -7,17 +7,17 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/utils.go b/beacon-chain/db/kv/utils.go index 8f8bdb4153d0..403d39c8bdbc 100644 --- a/beacon-chain/db/kv/utils.go +++ b/beacon-chain/db/kv/utils.go @@ -5,7 +5,7 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/utils_test.go b/beacon-chain/db/kv/utils_test.go index a4e195703deb..36d89718ffdd 100644 --- a/beacon-chain/db/kv/utils_test.go +++ b/beacon-chain/db/kv/utils_test.go @@ -5,9 +5,9 @@ import ( "crypto/rand" "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/kv/validated_checkpoint.go b/beacon-chain/db/kv/validated_checkpoint.go index 0ee20c66870c..78fda726a398 100644 --- a/beacon-chain/db/kv/validated_checkpoint.go +++ b/beacon-chain/db/kv/validated_checkpoint.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/validated_checkpoint_test.go b/beacon-chain/db/kv/validated_checkpoint_test.go index f264c9471572..20276a51f8f7 100644 --- a/beacon-chain/db/kv/validated_checkpoint_test.go +++ b/beacon-chain/db/kv/validated_checkpoint_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/db/kv/wss.go b/beacon-chain/db/kv/wss.go index cfc64c08e38a..6646a3403c62 100644 --- a/beacon-chain/db/kv/wss.go +++ b/beacon-chain/db/kv/wss.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SaveOrigin loads an ssz serialized Block & BeaconState from an io.Reader diff --git a/beacon-chain/db/kv/wss_test.go b/beacon-chain/db/kv/wss_test.go index 4d524f77336a..d8ebed05dea3 100644 --- a/beacon-chain/db/kv/wss_test.go +++ b/beacon-chain/db/kv/wss_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/genesis" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/genesis" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSaveOrigin(t *testing.T) { diff --git a/beacon-chain/db/restore.go b/beacon-chain/db/restore.go index 7b68c9c46c19..29fb91f3470b 100644 --- a/beacon-chain/db/restore.go +++ b/beacon-chain/db/restore.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" "github.com/urfave/cli/v2" ) diff --git a/beacon-chain/db/restore_test.go b/beacon-chain/db/restore_test.go index eba8d058f640..b9ac15351719 100644 --- a/beacon-chain/db/restore_test.go +++ b/beacon-chain/db/restore_test.go @@ -7,13 +7,13 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/beacon-chain/db/slasherkv/BUILD.bazel b/beacon-chain/db/slasherkv/BUILD.bazel index 072042f272a7..3f230be3cf5a 100644 --- a/beacon-chain/db/slasherkv/BUILD.bazel +++ b/beacon-chain/db/slasherkv/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "schema.go", "slasher.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/slasherkv", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/slasherkv", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/db/iface:go_default_library", diff --git a/beacon-chain/db/slasherkv/kv.go b/beacon-chain/db/slasherkv/kv.go index cc59a7850e7b..0c0147fcbbd3 100644 --- a/beacon-chain/db/slasherkv/kv.go +++ b/beacon-chain/db/slasherkv/kv.go @@ -9,9 +9,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/slasherkv/kv_test.go b/beacon-chain/db/slasherkv/kv_test.go index 2a03864cd3f4..68f5477d7fd8 100644 --- a/beacon-chain/db/slasherkv/kv_test.go +++ b/beacon-chain/db/slasherkv/kv_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // setupDB instantiates and returns a Store instance. diff --git a/beacon-chain/db/slasherkv/pruning.go b/beacon-chain/db/slasherkv/pruning.go index b0323f3da596..2b337160ade3 100644 --- a/beacon-chain/db/slasherkv/pruning.go +++ b/beacon-chain/db/slasherkv/pruning.go @@ -6,8 +6,8 @@ import ( "encoding/binary" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/slasherkv/pruning_test.go b/beacon-chain/db/slasherkv/pruning_test.go index f86708ac3d8c..a7ef9564a808 100644 --- a/beacon-chain/db/slasherkv/pruning_test.go +++ b/beacon-chain/db/slasherkv/pruning_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" bolt "go.etcd.io/bbolt" ) diff --git a/beacon-chain/db/slasherkv/slasher.go b/beacon-chain/db/slasherkv/slasher.go index 144c9ba271d9..0e8340940f54 100644 --- a/beacon-chain/db/slasherkv/slasher.go +++ b/beacon-chain/db/slasherkv/slasher.go @@ -11,10 +11,10 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" "golang.org/x/sync/errgroup" diff --git a/beacon-chain/db/slasherkv/slasher_test.go b/beacon-chain/db/slasherkv/slasher_test.go index 1626b448bcec..9ff873d7b8d4 100644 --- a/beacon-chain/db/slasherkv/slasher_test.go +++ b/beacon-chain/db/slasherkv/slasher_test.go @@ -9,13 +9,13 @@ import ( "testing" ssz "github.com/prysmaticlabs/fastssz" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_AttestationRecordForValidator_SaveRetrieve(t *testing.T) { diff --git a/beacon-chain/db/testing/BUILD.bazel b/beacon-chain/db/testing/BUILD.bazel index 857490bf9f35..7e568ba1606c 100644 --- a/beacon-chain/db/testing/BUILD.bazel +++ b/beacon-chain/db/testing/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["setup_db.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing", visibility = [ "//beacon-chain:__subpackages__", "//testing:__subpackages__", diff --git a/beacon-chain/db/testing/setup_db.go b/beacon-chain/db/testing/setup_db.go index cf4cc451f00c..a9dc820223af 100644 --- a/beacon-chain/db/testing/setup_db.go +++ b/beacon-chain/db/testing/setup_db.go @@ -6,10 +6,10 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/slasherkv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/slasherkv" ) // SetupDB instantiates and returns database backed by key value store. diff --git a/beacon-chain/deterministic-genesis/BUILD.bazel b/beacon-chain/deterministic-genesis/BUILD.bazel index 5539fb25d645..454622d4a6b7 100644 --- a/beacon-chain/deterministic-genesis/BUILD.bazel +++ b/beacon-chain/deterministic-genesis/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/deterministic-genesis", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/deterministic-genesis", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/cache/depositcache:go_default_library", diff --git a/beacon-chain/deterministic-genesis/service.go b/beacon-chain/deterministic-genesis/service.go index 4e5822ec976f..02b8a82251c0 100644 --- a/beacon-chain/deterministic-genesis/service.go +++ b/beacon-chain/deterministic-genesis/service.go @@ -9,16 +9,16 @@ import ( "os" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var _ runtime.Service = (*Service)(nil) diff --git a/beacon-chain/execution/BUILD.bazel b/beacon-chain/execution/BUILD.bazel index c3eaf23521b3..13b7d3bd8533 100644 --- a/beacon-chain/execution/BUILD.bazel +++ b/beacon-chain/execution/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "rpc_connection.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution", visibility = [ "//beacon-chain:__subpackages__", "//cmd/beacon-chain:__subpackages__", diff --git a/beacon-chain/execution/block_cache.go b/beacon-chain/execution/block_cache.go index a7d774e75c4f..6ad1eb1203f1 100644 --- a/beacon-chain/execution/block_cache.go +++ b/beacon-chain/execution/block_cache.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/config/params" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/execution/block_cache_test.go b/beacon-chain/execution/block_cache_test.go index 293a35e8f22d..d68305fc07a3 100644 --- a/beacon-chain/execution/block_cache_test.go +++ b/beacon-chain/execution/block_cache_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestHashKeyFn_OK(t *testing.T) { diff --git a/beacon-chain/execution/block_reader.go b/beacon-chain/execution/block_reader.go index 389749ead1b4..f502b5161307 100644 --- a/beacon-chain/execution/block_reader.go +++ b/beacon-chain/execution/block_reader.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" "go.opencensus.io/trace" ) diff --git a/beacon-chain/execution/block_reader_test.go b/beacon-chain/execution/block_reader_test.go index 7ed3bfaf07af..6ddebc516698 100644 --- a/beacon-chain/execution/block_reader_test.go +++ b/beacon-chain/execution/block_reader_test.go @@ -9,13 +9,13 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" gethTypes "github.com/ethereum/go-ethereum/core/types" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func setDefaultMocks(service *Service) *Service { diff --git a/beacon-chain/execution/check_transition_config.go b/beacon-chain/execution/check_transition_config.go index df4f34855490..d9254edcebcc 100644 --- a/beacon-chain/execution/check_transition_config.go +++ b/beacon-chain/execution/check_transition_config.go @@ -9,13 +9,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/holiman/uint256" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/network" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/network" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/execution/check_transition_config_test.go b/beacon-chain/execution/check_transition_config_test.go index 0e1fce45be22..11685f714949 100644 --- a/beacon-chain/execution/check_transition_config_test.go +++ b/beacon-chain/execution/check_transition_config_test.go @@ -14,16 +14,16 @@ import ( gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - mocks "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + mocks "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/execution/deposit.go b/beacon-chain/execution/deposit.go index aebac290a48d..bc8618c508cb 100644 --- a/beacon-chain/execution/deposit.go +++ b/beacon-chain/execution/deposit.go @@ -5,9 +5,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // DepositContractAddress returns the deposit contract address for the given chain. diff --git a/beacon-chain/execution/deposit_test.go b/beacon-chain/execution/deposit_test.go index 4c272dca3b21..63b7ad696a19 100644 --- a/beacon-chain/execution/deposit_test.go +++ b/beacon-chain/execution/deposit_test.go @@ -5,20 +5,20 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - testing2 "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + testing2 "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go index 751bbc02a7ae..068ff2d1fa0c 100644 --- a/beacon-chain/execution/engine_client.go +++ b/beacon-chain/execution/engine_client.go @@ -14,18 +14,18 @@ import ( gethRPC "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - payloadattribute "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + payloadattribute "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/execution/engine_client_fuzz_test.go b/beacon-chain/execution/engine_client_fuzz_test.go index c55ecbaa5f7e..9a988f95171b 100644 --- a/beacon-chain/execution/engine_client_fuzz_test.go +++ b/beacon-chain/execution/engine_client_fuzz_test.go @@ -16,9 +16,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func FuzzForkChoiceResponse(f *testing.F) { diff --git a/beacon-chain/execution/engine_client_test.go b/beacon-chain/execution/engine_client_test.go index acc2a58a2a49..c3cd70bca585 100644 --- a/beacon-chain/execution/engine_client_test.go +++ b/beacon-chain/execution/engine_client_test.go @@ -19,19 +19,19 @@ import ( gethRPC "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" "github.com/pkg/errors" - mocks "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - payloadattribute "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mocks "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + payloadattribute "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/execution/init_test.go b/beacon-chain/execution/init_test.go index 9d005f97babd..88446f9e0898 100644 --- a/beacon-chain/execution/init_test.go +++ b/beacon-chain/execution/init_test.go @@ -1,7 +1,7 @@ package execution import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func init() { diff --git a/beacon-chain/execution/log_processing.go b/beacon-chain/execution/log_processing.go index fc3367f736d2..d1c97edcf940 100644 --- a/beacon-chain/execution/log_processing.go +++ b/beacon-chain/execution/log_processing.go @@ -13,18 +13,18 @@ import ( "github.com/ethereum/go-ethereum/common" gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreState "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreState "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/execution/log_processing_test.go b/beacon-chain/execution/log_processing_test.go index 620eaefd856f..9dcb1eefaea3 100644 --- a/beacon-chain/execution/log_processing_test.go +++ b/beacon-chain/execution/log_processing_test.go @@ -9,18 +9,18 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/execution/options.go b/beacon-chain/execution/options.go index ec4748eac52f..f1a46e149a9a 100644 --- a/beacon-chain/execution/options.go +++ b/beacon-chain/execution/options.go @@ -2,12 +2,12 @@ package execution import ( "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/network/authorization" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/network/authorization" ) type Option func(s *Service) error diff --git a/beacon-chain/execution/prometheus.go b/beacon-chain/execution/prometheus.go index a51dd05b4c23..440187dd6192 100644 --- a/beacon-chain/execution/prometheus.go +++ b/beacon-chain/execution/prometheus.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "github.com/prysmaticlabs/prysm/v3/monitoring/clientstats" + "github.com/prysmaticlabs/prysm/v4/monitoring/clientstats" ) type BeaconNodeStatsUpdater interface { diff --git a/beacon-chain/execution/prometheus_test.go b/beacon-chain/execution/prometheus_test.go index aa92e836fef6..dde1bda51f0c 100644 --- a/beacon-chain/execution/prometheus_test.go +++ b/beacon-chain/execution/prometheus_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) // TestCleanup ensures that the cleanup function unregisters the prometheus.Collection diff --git a/beacon-chain/execution/provider.go b/beacon-chain/execution/provider.go index 185060dd9dc0..dcb9a2af834a 100644 --- a/beacon-chain/execution/provider.go +++ b/beacon-chain/execution/provider.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "strings" - "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/network/authorization" + "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/network/authorization" ) // HttpEndpoint extracts an httputils.Endpoint from the provider parameter. diff --git a/beacon-chain/execution/provider_test.go b/beacon-chain/execution/provider_test.go index be22666e0698..46af3dc642a3 100644 --- a/beacon-chain/execution/provider_test.go +++ b/beacon-chain/execution/provider_test.go @@ -3,8 +3,8 @@ package execution import ( "testing" - "github.com/prysmaticlabs/prysm/v3/network/authorization" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/network/authorization" + "github.com/prysmaticlabs/prysm/v4/testing/assert" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/execution/rpc_connection.go b/beacon-chain/execution/rpc_connection.go index 5e2937f3f8b9..8034f57b13ca 100644 --- a/beacon-chain/execution/rpc_connection.go +++ b/beacon-chain/execution/rpc_connection.go @@ -10,11 +10,11 @@ import ( "github.com/ethereum/go-ethereum/ethclient" gethRPC "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/network/authorization" + "github.com/prysmaticlabs/prysm/v4/config/params" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/network/authorization" ) func (s *Service) setupExecutionClientConnections(ctx context.Context, currEndpoint network.Endpoint) error { diff --git a/beacon-chain/execution/service.go b/beacon-chain/execution/service.go index 210fc9b388b3..4ec11851923a 100644 --- a/beacon-chain/execution/service.go +++ b/beacon-chain/execution/service.go @@ -20,24 +20,24 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/clientstats" - "github.com/prysmaticlabs/prysm/v3/network" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/clientstats" + "github.com/prysmaticlabs/prysm/v4/network" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/execution/service_test.go b/beacon-chain/execution/service_test.go index 35a87458cfed..1f93418af011 100644 --- a/beacon-chain/execution/service_test.go +++ b/beacon-chain/execution/service_test.go @@ -14,23 +14,23 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/clientstats" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/clientstats" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/execution/testing/BUILD.bazel b/beacon-chain/execution/testing/BUILD.bazel index 9bfca3034d97..0dff59719c1a 100644 --- a/beacon-chain/execution/testing/BUILD.bazel +++ b/beacon-chain/execution/testing/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "mock_execution_chain.go", "mock_faulty_powchain.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing", visibility = [ "//visibility:public", ], diff --git a/beacon-chain/execution/testing/genesis.go b/beacon-chain/execution/testing/genesis.go index 20821738aca0..1e0af1259a8b 100644 --- a/beacon-chain/execution/testing/genesis.go +++ b/beacon-chain/execution/testing/genesis.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/params" - clparams "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/time/slots" + clparams "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // defaultMinerAddress is used to send deposits and test transactions in the e2e test. diff --git a/beacon-chain/execution/testing/mock_engine_client.go b/beacon-chain/execution/testing/mock_engine_client.go index 3debe58538cf..4823b3ec102e 100644 --- a/beacon-chain/execution/testing/mock_engine_client.go +++ b/beacon-chain/execution/testing/mock_engine_client.go @@ -8,14 +8,14 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/holiman/uint256" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - payloadattribute "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + payloadattribute "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // EngineClient -- diff --git a/beacon-chain/execution/testing/mock_execution_chain.go b/beacon-chain/execution/testing/mock_execution_chain.go index b0fc49b21f36..baf194610b65 100644 --- a/beacon-chain/execution/testing/mock_execution_chain.go +++ b/beacon-chain/execution/testing/mock_execution_chain.go @@ -15,12 +15,12 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Chain defines a properly functioning mock for the powchain service. diff --git a/beacon-chain/execution/testing/mock_faulty_powchain.go b/beacon-chain/execution/testing/mock_faulty_powchain.go index 68194c8f023c..a32b4f6905b0 100644 --- a/beacon-chain/execution/testing/mock_faulty_powchain.go +++ b/beacon-chain/execution/testing/mock_faulty_powchain.go @@ -6,11 +6,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // FaultyExecutionChain defines an incorrectly functioning powchain service. diff --git a/beacon-chain/execution/types/BUILD.bazel b/beacon-chain/execution/types/BUILD.bazel index bd0f2a9afe56..cff79fa54945 100644 --- a/beacon-chain/execution/types/BUILD.bazel +++ b/beacon-chain/execution/types/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["eth1_types.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/types", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/types", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//encoding/bytesutil:go_default_library", diff --git a/beacon-chain/execution/types/eth1_types.go b/beacon-chain/execution/types/eth1_types.go index e083215fddb7..bea95d342bba 100644 --- a/beacon-chain/execution/types/eth1_types.go +++ b/beacon-chain/execution/types/eth1_types.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // HeaderInfo specifies the block header information in the ETH 1.0 chain. diff --git a/beacon-chain/execution/types/eth1_types_test.go b/beacon-chain/execution/types/eth1_types_test.go index c8236820298f..ebf292a9f512 100644 --- a/beacon-chain/execution/types/eth1_types_test.go +++ b/beacon-chain/execution/types/eth1_types_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestRoundtrip_HeaderInfo(t *testing.T) { diff --git a/beacon-chain/forkchoice/BUILD.bazel b/beacon-chain/forkchoice/BUILD.bazel index b750975e7768..6b3a89e499b1 100644 --- a/beacon-chain/forkchoice/BUILD.bazel +++ b/beacon-chain/forkchoice/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "error.go", "interfaces.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel b/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel index dcca93bb98c1..0f8be212f1ba 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel +++ b/beacon-chain/forkchoice/doubly-linked-tree/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "types.go", "unrealized_justification.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree", visibility = [ "//beacon-chain:__subpackages__", "//testing/spectest:__subpackages__", diff --git a/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go b/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go index e5e1ba8ff2b7..c4c2319bd791 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/ffg_update_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFFGUpdates_OneBranch(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go index 21c7ba03e6c0..d5ee060a1ed7 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice.go @@ -6,18 +6,18 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go index f9d0221314c1..36f11c526799 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/forkchoice_test.go @@ -6,19 +6,19 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // prepareForkchoiceState prepares a beacon State with the given data to mock diff --git a/beacon-chain/forkchoice/doubly-linked-tree/no_vote_test.go b/beacon-chain/forkchoice/doubly-linked-tree/no_vote_test.go index 231c8f27f38d..25a24718d729 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/no_vote_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/no_vote_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestNoVote_CanFindHead(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/node.go b/beacon-chain/forkchoice/doubly-linked-tree/node.go index 7a2bb5f981f1..36c998d96f36 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/node.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/node.go @@ -5,10 +5,10 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // orphanLateBlockFirstThreshold is the number of seconds after which we diff --git a/beacon-chain/forkchoice/doubly-linked-tree/node_test.go b/beacon-chain/forkchoice/doubly-linked-tree/node_test.go index c74db5fc9cdc..bb609893bb40 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/node_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/node_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestNode_ApplyWeightChanges_PositiveChange(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go b/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go index 3118963cfbbe..72e4fa86754f 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/on_tick.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // NewSlot mimics the implementation of `on_tick` in fork choice consensus spec. diff --git a/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go b/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go index 640505de7bdb..9bf41c3769a2 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/on_tick_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_NewSlot(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync.go b/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync.go index 49eb202e44c8..8df1ff5a6d8a 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync.go @@ -4,7 +4,7 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func (s *Store) setOptimisticToInvalid(ctx context.Context, root, parentRoot, payloadHash [32]byte) ([][32]byte, error) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync_test.go b/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync_test.go index 04dac13eb530..c8dbeaf7d182 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/optimistic_sync_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // We test the algorithm to update a node from SYNCING to INVALID diff --git a/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost.go b/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost.go index c0c207e05252..d12fcdc8ac0d 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" ) // resetBoostedProposerRoot sets the value of the proposer boosted root to zeros. diff --git a/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost_test.go b/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost_test.go index 96d2d5a58bc7..c132f227155b 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/proposer_boost_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // Helper function to simulate the block being on time or delayed for proposer diff --git a/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks.go b/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks.go index 5aa827c2b9d0..49362a8a8bac 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks.go @@ -3,9 +3,9 @@ package doublylinkedtree import ( "time" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // orphanLateBlockProposingEarly determines the maximum threshold that we diff --git a/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks_test.go b/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks_test.go index 3c7ed236e622..b6316fd0ebbd 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/reorg_late_blocks_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestForkChoice_ShouldOverrideFCU(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/store.go b/beacon-chain/forkchoice/doubly-linked-tree/store.go index 0211657b0755..dbf89590f375 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/store.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/store.go @@ -6,10 +6,10 @@ import ( "time" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/forkchoice/doubly-linked-tree/store_test.go b/beacon-chain/forkchoice/doubly-linked-tree/store_test.go index 0b5c21bb4f55..b68a0cb70b04 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/store_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/store_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_JustifiedEpoch(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/types.go b/beacon-chain/forkchoice/doubly-linked-tree/types.go index 58cea7ac1321..e33f3a812fc3 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/types.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/types.go @@ -3,10 +3,10 @@ package doublylinkedtree import ( "sync" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // ForkChoice defines the overall fork choice store which includes all block nodes, validator's latest votes and balances. diff --git a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go index d418d045c857..b75b5264a990 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification.go @@ -4,14 +4,14 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func (s *Store) setUnrealizedJustifiedEpoch(root [32]byte, epoch primitives.Epoch) error { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go index b1f4e8fcf804..cf89d0486a0d 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/unrealized_justification_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_SetUnrealizedEpochs(t *testing.T) { diff --git a/beacon-chain/forkchoice/doubly-linked-tree/vote_test.go b/beacon-chain/forkchoice/doubly-linked-tree/vote_test.go index 8a4a68553a68..5bcc9f99784e 100644 --- a/beacon-chain/forkchoice/doubly-linked-tree/vote_test.go +++ b/beacon-chain/forkchoice/doubly-linked-tree/vote_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestVotes_CanFindHead(t *testing.T) { diff --git a/beacon-chain/forkchoice/interfaces.go b/beacon-chain/forkchoice/interfaces.go index 9a19530584e8..cf0b61f09547 100644 --- a/beacon-chain/forkchoice/interfaces.go +++ b/beacon-chain/forkchoice/interfaces.go @@ -3,11 +3,11 @@ package forkchoice import ( "context" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" ) // BalancesByRooter is a handler to obtain the effective balances of the state diff --git a/beacon-chain/forkchoice/types/BUILD.bazel b/beacon-chain/forkchoice/types/BUILD.bazel index bfcdd2b98026..182d0b2558c3 100644 --- a/beacon-chain/forkchoice/types/BUILD.bazel +++ b/beacon-chain/forkchoice/types/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["types.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/beacon-chain/forkchoice/types/types.go b/beacon-chain/forkchoice/types/types.go index 46e41b1dd9d3..f777bb5b3259 100644 --- a/beacon-chain/forkchoice/types/types.go +++ b/beacon-chain/forkchoice/types/types.go @@ -1,10 +1,10 @@ package types import ( - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Checkpoint is an array version of ethpb.Checkpoint. It is used internally in diff --git a/beacon-chain/gateway/BUILD.bazel b/beacon-chain/gateway/BUILD.bazel index 4feed0fe8b57..e228373da0a6 100644 --- a/beacon-chain/gateway/BUILD.bazel +++ b/beacon-chain/gateway/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["helpers.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/gateway", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/gateway", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//api/gateway:go_default_library", diff --git a/beacon-chain/gateway/helpers.go b/beacon-chain/gateway/helpers.go index d10912d4b4e5..eb7b1992d1e3 100644 --- a/beacon-chain/gateway/helpers.go +++ b/beacon-chain/gateway/helpers.go @@ -2,10 +2,10 @@ package gateway import ( gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - "github.com/prysmaticlabs/prysm/v3/api/gateway" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/api/gateway" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/beacon-chain/gateway/helpers_test.go b/beacon-chain/gateway/helpers_test.go index 40d4f61d89cf..847979df2173 100644 --- a/beacon-chain/gateway/helpers_test.go +++ b/beacon-chain/gateway/helpers_test.go @@ -3,9 +3,9 @@ package gateway import ( "testing" - "github.com/prysmaticlabs/prysm/v3/api/gateway" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/api/gateway" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDefaultConfig(t *testing.T) { diff --git a/beacon-chain/monitor/BUILD.bazel b/beacon-chain/monitor/BUILD.bazel index b7b1b8be9dea..38149771cd6a 100644 --- a/beacon-chain/monitor/BUILD.bazel +++ b/beacon-chain/monitor/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "process_sync_committee.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/monitor", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/monitor", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//async/event:go_default_library", diff --git a/beacon-chain/monitor/process_attestation.go b/beacon-chain/monitor/process_attestation.go index 841565dbf4c8..ff6b40609243 100644 --- a/beacon-chain/monitor/process_attestation.go +++ b/beacon-chain/monitor/process_attestation.go @@ -4,17 +4,17 @@ import ( "context" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/monitor/process_attestation_test.go b/beacon-chain/monitor/process_attestation_test.go index ef743eaa7c73..05141df703d6 100644 --- a/beacon-chain/monitor/process_attestation_test.go +++ b/beacon-chain/monitor/process_attestation_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/monitor/process_block.go b/beacon-chain/monitor/process_block.go index 176b617d4390..6f4be7b2add2 100644 --- a/beacon-chain/monitor/process_block.go +++ b/beacon-chain/monitor/process_block.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/monitor/process_block_test.go b/beacon-chain/monitor/process_block_test.go index 996f8ef68e7b..fbf87819b326 100644 --- a/beacon-chain/monitor/process_block_test.go +++ b/beacon-chain/monitor/process_block_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/monitor/process_exit.go b/beacon-chain/monitor/process_exit.go index 9ef09b864258..cc43509914ef 100644 --- a/beacon-chain/monitor/process_exit.go +++ b/beacon-chain/monitor/process_exit.go @@ -1,8 +1,8 @@ package monitor import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/monitor/process_exit_test.go b/beacon-chain/monitor/process_exit_test.go index fde746071a9a..bca31de0fea2 100644 --- a/beacon-chain/monitor/process_exit_test.go +++ b/beacon-chain/monitor/process_exit_test.go @@ -3,10 +3,10 @@ package monitor import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/monitor/process_sync_committee.go b/beacon-chain/monitor/process_sync_committee.go index 06eb643b6b95..a1b516316824 100644 --- a/beacon-chain/monitor/process_sync_committee.go +++ b/beacon-chain/monitor/process_sync_committee.go @@ -3,9 +3,9 @@ package monitor import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/monitor/process_sync_committee_test.go b/beacon-chain/monitor/process_sync_committee_test.go index b0ff12512a03..97f3420a31e9 100644 --- a/beacon-chain/monitor/process_sync_committee_test.go +++ b/beacon-chain/monitor/process_sync_committee_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/monitor/service.go b/beacon-chain/monitor/service.go index 71631d4086e7..2eebef806316 100644 --- a/beacon-chain/monitor/service.go +++ b/beacon-chain/monitor/service.go @@ -6,16 +6,16 @@ import ( "sort" "sync" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/monitor/service_test.go b/beacon-chain/monitor/service_test.go index ca49bce08b30..f3460223be54 100644 --- a/beacon-chain/monitor/service_test.go +++ b/beacon-chain/monitor/service_test.go @@ -7,19 +7,19 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel index 21384c629978..4e361df66ab6 100644 --- a/beacon-chain/node/BUILD.bazel +++ b/beacon-chain/node/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "options.go", "prometheus.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/node", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/node", visibility = [ "//beacon-chain:__subpackages__", "//cmd/beacon-chain:__subpackages__", @@ -63,7 +63,6 @@ go_library( "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", - "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", ], diff --git a/beacon-chain/node/config.go b/beacon-chain/node/config.go index afb021974082..6bdc70ecda65 100644 --- a/beacon-chain/node/config.go +++ b/beacon-chain/node/config.go @@ -4,12 +4,11 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - fastssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - tracing2 "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + tracing2 "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" "github.com/urfave/cli/v2" ) @@ -190,7 +189,3 @@ func configureExecutionSetting(cliCtx *cli.Context) error { " Default fee recipient will be used as a fall back", checksumAddress.Hex()) return params.SetActive(c) } - -func configureFastSSZHashingAlgorithm() { - fastssz.EnableVectorizedHTR = true -} diff --git a/beacon-chain/node/config_test.go b/beacon-chain/node/config_test.go index 934dd9b3b69a..e981b552c14f 100644 --- a/beacon-chain/node/config_test.go +++ b/beacon-chain/node/config_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index a4d0d9584eba..3250462a2c0d 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -16,50 +16,50 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - apigateway "github.com/prysmaticlabs/prysm/v3/api/gateway" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/slasherkv" - interopcoldstart "github.com/prysmaticlabs/prysm/v3/beacon-chain/deterministic-genesis" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/gateway" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/monitor" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/node/registration" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - regularsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/backfill" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/checkpoint" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/genesis" - initialsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/prometheus" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/runtime/debug" - "github.com/prysmaticlabs/prysm/v3/runtime/prereqs" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + apigateway "github.com/prysmaticlabs/prysm/v4/api/gateway" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/slasherkv" + interopcoldstart "github.com/prysmaticlabs/prysm/v4/beacon-chain/deterministic-genesis" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/gateway" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/monitor" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/node/registration" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + regularsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/backfill" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/checkpoint" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/genesis" + initialsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/prometheus" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/runtime/debug" + "github.com/prysmaticlabs/prysm/v4/runtime/prereqs" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) @@ -148,7 +148,6 @@ func New(cliCtx *cli.Context, opts ...Option) (*BeaconNode, error) { if err := configureExecutionSetting(cliCtx); err != nil { return nil, err } - configureFastSSZHashingAlgorithm() // Initializes any forks here. params.BeaconConfig().InitializeForkSchedule() diff --git a/beacon-chain/node/node_test.go b/beacon-chain/node/node_test.go index 3ff64d84d195..35ab01bdbbba 100644 --- a/beacon-chain/node/node_test.go +++ b/beacon-chain/node/node_test.go @@ -10,21 +10,21 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/monitor" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/monitor" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/beacon-chain/node/options.go b/beacon-chain/node/options.go index 835d89f4a5f4..22e994afaee8 100644 --- a/beacon-chain/node/options.go +++ b/beacon-chain/node/options.go @@ -1,9 +1,9 @@ package node import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" ) // Option for beacon node configuration. diff --git a/beacon-chain/node/registration/BUILD.bazel b/beacon-chain/node/registration/BUILD.bazel index 3e8b93420e9b..0c25c459c75a 100644 --- a/beacon-chain/node/registration/BUILD.bazel +++ b/beacon-chain/node/registration/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "p2p.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/node/registration", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/node/registration", visibility = ["//beacon-chain/node:__subpackages__"], deps = [ "//cmd:go_default_library", diff --git a/beacon-chain/node/registration/p2p.go b/beacon-chain/node/registration/p2p.go index 1bf4953196cc..7cc28f820375 100644 --- a/beacon-chain/node/registration/p2p.go +++ b/beacon-chain/node/registration/p2p.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/urfave/cli/v2" "gopkg.in/yaml.v2" ) diff --git a/beacon-chain/node/registration/p2p_test.go b/beacon-chain/node/registration/p2p_test.go index 3b7cf7679d68..1c36ddbaa817 100644 --- a/beacon-chain/node/registration/p2p_test.go +++ b/beacon-chain/node/registration/p2p_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/beacon-chain/operations/attestations/BUILD.bazel b/beacon-chain/operations/attestations/BUILD.bazel index e948e555a5a2..d3bf2fd32f03 100644 --- a/beacon-chain/operations/attestations/BUILD.bazel +++ b/beacon-chain/operations/attestations/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "prune_expired.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations", visibility = [ "//beacon-chain:__subpackages__", "//testing/spectest:__subpackages__", diff --git a/beacon-chain/operations/attestations/kv/BUILD.bazel b/beacon-chain/operations/attestations/kv/BUILD.bazel index e8c3c05fe795..017d0cb06cb2 100644 --- a/beacon-chain/operations/attestations/kv/BUILD.bazel +++ b/beacon-chain/operations/attestations/kv/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "seen_bits.go", "unaggregated.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations/kv", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations/kv", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/beacon-chain/operations/attestations/kv/aggregated.go b/beacon-chain/operations/attestations/kv/aggregated.go index 6a4e25322a8a..94f7ce3e5c0d 100644 --- a/beacon-chain/operations/attestations/kv/aggregated.go +++ b/beacon-chain/operations/attestations/kv/aggregated.go @@ -4,10 +4,10 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" log "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/operations/attestations/kv/aggregated_test.go b/beacon-chain/operations/attestations/kv/aggregated_test.go index 5aab95c532e7..f42500b264d5 100644 --- a/beacon-chain/operations/attestations/kv/aggregated_test.go +++ b/beacon-chain/operations/attestations/kv/aggregated_test.go @@ -9,12 +9,12 @@ import ( "github.com/pkg/errors" fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestKV_Aggregated_AggregateUnaggregatedAttestations(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/benchmark_test.go b/beacon-chain/operations/attestations/kv/benchmark_test.go index eadcd0a716d6..3518d293abdd 100644 --- a/beacon-chain/operations/attestations/kv/benchmark_test.go +++ b/beacon-chain/operations/attestations/kv/benchmark_test.go @@ -3,9 +3,9 @@ package kv_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations/kv" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations/kv" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func BenchmarkAttCaches(b *testing.B) { diff --git a/beacon-chain/operations/attestations/kv/block.go b/beacon-chain/operations/attestations/kv/block.go index f582dddb832d..8235968a35d0 100644 --- a/beacon-chain/operations/attestations/kv/block.go +++ b/beacon-chain/operations/attestations/kv/block.go @@ -2,7 +2,7 @@ package kv import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SaveBlockAttestation saves an block attestation in cache. diff --git a/beacon-chain/operations/attestations/kv/block_test.go b/beacon-chain/operations/attestations/kv/block_test.go index 772f239fae12..c2db25037176 100644 --- a/beacon-chain/operations/attestations/kv/block_test.go +++ b/beacon-chain/operations/attestations/kv/block_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestKV_BlockAttestation_CanSaveRetrieve(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/forkchoice.go b/beacon-chain/operations/attestations/kv/forkchoice.go index 0b3e9da8ad24..b62db1c42822 100644 --- a/beacon-chain/operations/attestations/kv/forkchoice.go +++ b/beacon-chain/operations/attestations/kv/forkchoice.go @@ -2,7 +2,7 @@ package kv import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SaveForkchoiceAttestation saves an forkchoice attestation in cache. diff --git a/beacon-chain/operations/attestations/kv/forkchoice_test.go b/beacon-chain/operations/attestations/kv/forkchoice_test.go index 12035418c595..1b486cef8cd3 100644 --- a/beacon-chain/operations/attestations/kv/forkchoice_test.go +++ b/beacon-chain/operations/attestations/kv/forkchoice_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestKV_Forkchoice_CanSaveRetrieve(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/kv.go b/beacon-chain/operations/attestations/kv/kv.go index 61270d0dd687..b7bebbe5ece0 100644 --- a/beacon-chain/operations/attestations/kv/kv.go +++ b/beacon-chain/operations/attestations/kv/kv.go @@ -8,9 +8,9 @@ import ( "time" "github.com/patrickmn/go-cache" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var hashFn = hash.HashProto diff --git a/beacon-chain/operations/attestations/kv/seen_bits.go b/beacon-chain/operations/attestations/kv/seen_bits.go index 401c06fc34ec..32b52f3e30fc 100644 --- a/beacon-chain/operations/attestations/kv/seen_bits.go +++ b/beacon-chain/operations/attestations/kv/seen_bits.go @@ -4,7 +4,7 @@ import ( "github.com/patrickmn/go-cache" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c *AttCaches) insertSeenBit(att *ethpb.Attestation) error { diff --git a/beacon-chain/operations/attestations/kv/seen_bits_test.go b/beacon-chain/operations/attestations/kv/seen_bits_test.go index c3a885da5727..9f1212d7e368 100644 --- a/beacon-chain/operations/attestations/kv/seen_bits_test.go +++ b/beacon-chain/operations/attestations/kv/seen_bits_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestAttCaches_hasSeenBit(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/unaggregated.go b/beacon-chain/operations/attestations/kv/unaggregated.go index 8ab5feda7c80..774744acc943 100644 --- a/beacon-chain/operations/attestations/kv/unaggregated.go +++ b/beacon-chain/operations/attestations/kv/unaggregated.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/operations/attestations/kv/unaggregated_test.go b/beacon-chain/operations/attestations/kv/unaggregated_test.go index ccfc3c890f31..c5364b45c5df 100644 --- a/beacon-chain/operations/attestations/kv/unaggregated_test.go +++ b/beacon-chain/operations/attestations/kv/unaggregated_test.go @@ -9,11 +9,11 @@ import ( c "github.com/patrickmn/go-cache" fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestKV_Unaggregated_SaveUnaggregatedAttestation(t *testing.T) { diff --git a/beacon-chain/operations/attestations/mock/BUILD.bazel b/beacon-chain/operations/attestations/mock/BUILD.bazel index ad1d0e985eca..566fc1f97222 100644 --- a/beacon-chain/operations/attestations/mock/BUILD.bazel +++ b/beacon-chain/operations/attestations/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations/mock", visibility = ["//visibility:public"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/beacon-chain/operations/attestations/mock/mock.go b/beacon-chain/operations/attestations/mock/mock.go index 487ca589f25f..46990f39f37a 100644 --- a/beacon-chain/operations/attestations/mock/mock.go +++ b/beacon-chain/operations/attestations/mock/mock.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // PoolMock -- diff --git a/beacon-chain/operations/attestations/pool.go b/beacon-chain/operations/attestations/pool.go index c639e2b2636d..3e231d346a75 100644 --- a/beacon-chain/operations/attestations/pool.go +++ b/beacon-chain/operations/attestations/pool.go @@ -3,9 +3,9 @@ package attestations import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations/kv" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations/kv" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Pool defines the necessary methods for Prysm attestations pool to serve diff --git a/beacon-chain/operations/attestations/pool_test.go b/beacon-chain/operations/attestations/pool_test.go index 0d5e525a2b71..903438c189e0 100644 --- a/beacon-chain/operations/attestations/pool_test.go +++ b/beacon-chain/operations/attestations/pool_test.go @@ -1,7 +1,7 @@ package attestations import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations/kv" ) var _ Pool = (*kv.AttCaches)(nil) diff --git a/beacon-chain/operations/attestations/prepare_forkchoice.go b/beacon-chain/operations/attestations/prepare_forkchoice.go index d82ff7fcfe14..67104e5f4318 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice.go @@ -7,10 +7,10 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/operations/attestations/prepare_forkchoice_test.go b/beacon-chain/operations/attestations/prepare_forkchoice_test.go index ec90757fa529..d38e94ce0b7c 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice_test.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/operations/attestations/prune_expired.go b/beacon-chain/operations/attestations/prune_expired.go index ec2767ab418e..bef4d4ec5058 100644 --- a/beacon-chain/operations/attestations/prune_expired.go +++ b/beacon-chain/operations/attestations/prune_expired.go @@ -3,9 +3,9 @@ package attestations import ( "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) // pruneAttsPool prunes attestations pool on every slot interval. diff --git a/beacon-chain/operations/attestations/prune_expired_test.go b/beacon-chain/operations/attestations/prune_expired_test.go index f69f30238a3e..88e338685fdd 100644 --- a/beacon-chain/operations/attestations/prune_expired_test.go +++ b/beacon-chain/operations/attestations/prune_expired_test.go @@ -6,14 +6,14 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/async" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/async" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) func TestPruneExpired_Ticker(t *testing.T) { diff --git a/beacon-chain/operations/attestations/service.go b/beacon-chain/operations/attestations/service.go index c5a71bf875dd..9a74b9f001e0 100644 --- a/beacon-chain/operations/attestations/service.go +++ b/beacon-chain/operations/attestations/service.go @@ -8,8 +8,8 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" ) var forkChoiceProcessedRootsSize = 1 << 16 diff --git a/beacon-chain/operations/attestations/service_test.go b/beacon-chain/operations/attestations/service_test.go index d85f860fc05a..78c97ef211f2 100644 --- a/beacon-chain/operations/attestations/service_test.go +++ b/beacon-chain/operations/attestations/service_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStop_OK(t *testing.T) { diff --git a/beacon-chain/operations/blstoexec/BUILD.bazel b/beacon-chain/operations/blstoexec/BUILD.bazel index dca4c9a79a7c..f1fd6d0fe843 100644 --- a/beacon-chain/operations/blstoexec/BUILD.bazel +++ b/beacon-chain/operations/blstoexec/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "doc.go", "pool.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec", visibility = [ "//beacon-chain:__subpackages__", ], diff --git a/beacon-chain/operations/blstoexec/mock/BUILD.bazel b/beacon-chain/operations/blstoexec/mock/BUILD.bazel index 834f3908c945..f2b1a6ee7e57 100644 --- a/beacon-chain/operations/blstoexec/mock/BUILD.bazel +++ b/beacon-chain/operations/blstoexec/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec/mock", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/operations/blstoexec/mock/mock.go b/beacon-chain/operations/blstoexec/mock/mock.go index 85e82d995c9d..54b8dc1b2eb9 100644 --- a/beacon-chain/operations/blstoexec/mock/mock.go +++ b/beacon-chain/operations/blstoexec/mock/mock.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // PoolMock is a fake implementation of PoolManager. diff --git a/beacon-chain/operations/blstoexec/pool.go b/beacon-chain/operations/blstoexec/pool.go index 9703512061ab..8a383f978186 100644 --- a/beacon-chain/operations/blstoexec/pool.go +++ b/beacon-chain/operations/blstoexec/pool.go @@ -6,12 +6,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - doublylinkedlist "github.com/prysmaticlabs/prysm/v3/container/doubly-linked-list" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + doublylinkedlist "github.com/prysmaticlabs/prysm/v4/container/doubly-linked-list" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/operations/blstoexec/pool_test.go b/beacon-chain/operations/blstoexec/pool_test.go index 662342206027..4ec821aed3e2 100644 --- a/beacon-chain/operations/blstoexec/pool_test.go +++ b/beacon-chain/operations/blstoexec/pool_test.go @@ -3,18 +3,18 @@ package blstoexec import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPendingBLSToExecChanges(t *testing.T) { diff --git a/beacon-chain/operations/slashings/BUILD.bazel b/beacon-chain/operations/slashings/BUILD.bazel index 98a6fbed547e..30b7513bbe3b 100644 --- a/beacon-chain/operations/slashings/BUILD.bazel +++ b/beacon-chain/operations/slashings/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "service.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings", visibility = [ "//beacon-chain:__subpackages__", "//testing/endtoend:__subpackages__", diff --git a/beacon-chain/operations/slashings/mock/BUILD.bazel b/beacon-chain/operations/slashings/mock/BUILD.bazel index 610572eb0903..cbe66f584bb3 100644 --- a/beacon-chain/operations/slashings/mock/BUILD.bazel +++ b/beacon-chain/operations/slashings/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/operations/slashings/mock/mock.go b/beacon-chain/operations/slashings/mock/mock.go index bc8321cd736a..0bf402ed09c9 100644 --- a/beacon-chain/operations/slashings/mock/mock.go +++ b/beacon-chain/operations/slashings/mock/mock.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // PoolMock is a fake implementation of PoolManager. diff --git a/beacon-chain/operations/slashings/service.go b/beacon-chain/operations/slashings/service.go index c7a7d31b893e..8efa0e87cc84 100644 --- a/beacon-chain/operations/slashings/service.go +++ b/beacon-chain/operations/slashings/service.go @@ -6,14 +6,14 @@ import ( "sort" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/trailofbits/go-mutexasserts" "go.opencensus.io/trace" ) diff --git a/beacon-chain/operations/slashings/service_attester_test.go b/beacon-chain/operations/slashings/service_attester_test.go index 4d94de1f753b..c8653a3b672e 100644 --- a/beacon-chain/operations/slashings/service_attester_test.go +++ b/beacon-chain/operations/slashings/service_attester_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func validAttesterSlashingForValIdx(t *testing.T, beaconState state.BeaconState, privs []bls.SecretKey, valIdx ...uint64) *ethpb.AttesterSlashing { diff --git a/beacon-chain/operations/slashings/service_proposer_test.go b/beacon-chain/operations/slashings/service_proposer_test.go index 35d4ff2afb8a..bd3ba168885b 100644 --- a/beacon-chain/operations/slashings/service_proposer_test.go +++ b/beacon-chain/operations/slashings/service_proposer_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func proposerSlashingForValIdx(valIdx primitives.ValidatorIndex) *ethpb.ProposerSlashing { diff --git a/beacon-chain/operations/slashings/service_test.go b/beacon-chain/operations/slashings/service_test.go index 44294dbf03e9..60ad039acfdf 100644 --- a/beacon-chain/operations/slashings/service_test.go +++ b/beacon-chain/operations/slashings/service_test.go @@ -3,8 +3,8 @@ package slashings import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) var ( diff --git a/beacon-chain/operations/slashings/types.go b/beacon-chain/operations/slashings/types.go index 3c0d89816d4e..b115241134a8 100644 --- a/beacon-chain/operations/slashings/types.go +++ b/beacon-chain/operations/slashings/types.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // PoolInserter is capable of inserting new slashing objects into the operations pool. diff --git a/beacon-chain/operations/synccommittee/BUILD.bazel b/beacon-chain/operations/synccommittee/BUILD.bazel index 0f03d023b8ee..aa7ea44301f9 100644 --- a/beacon-chain/operations/synccommittee/BUILD.bazel +++ b/beacon-chain/operations/synccommittee/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "metric.go", "pool.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/beacon-chain/operations/synccommittee/contribution.go b/beacon-chain/operations/synccommittee/contribution.go index 74ec0b18c863..11c07d973b8d 100644 --- a/beacon-chain/operations/synccommittee/contribution.go +++ b/beacon-chain/operations/synccommittee/contribution.go @@ -4,9 +4,9 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/queue" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/queue" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // To give two slots tolerance for objects that arrive earlier. diff --git a/beacon-chain/operations/synccommittee/contribution_test.go b/beacon-chain/operations/synccommittee/contribution_test.go index a60f6cb522d4..e4787a04b87c 100644 --- a/beacon-chain/operations/synccommittee/contribution_test.go +++ b/beacon-chain/operations/synccommittee/contribution_test.go @@ -3,8 +3,8 @@ package synccommittee import ( "testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSyncCommitteeContributionCache_Nil(t *testing.T) { diff --git a/beacon-chain/operations/synccommittee/kv.go b/beacon-chain/operations/synccommittee/kv.go index f4cffb99d0a6..d0224c05377d 100644 --- a/beacon-chain/operations/synccommittee/kv.go +++ b/beacon-chain/operations/synccommittee/kv.go @@ -3,7 +3,7 @@ package synccommittee import ( "sync" - "github.com/prysmaticlabs/prysm/v3/container/queue" + "github.com/prysmaticlabs/prysm/v4/container/queue" ) // Store defines the caches for various sync committee objects diff --git a/beacon-chain/operations/synccommittee/message.go b/beacon-chain/operations/synccommittee/message.go index 6f468a0e41b2..5d0eb2c66afb 100644 --- a/beacon-chain/operations/synccommittee/message.go +++ b/beacon-chain/operations/synccommittee/message.go @@ -2,9 +2,9 @@ package synccommittee import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/queue" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/queue" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SaveSyncCommitteeMessage saves a sync committee message in to a priority queue. diff --git a/beacon-chain/operations/synccommittee/message_test.go b/beacon-chain/operations/synccommittee/message_test.go index 5c7348a4a35c..c16470a8263d 100644 --- a/beacon-chain/operations/synccommittee/message_test.go +++ b/beacon-chain/operations/synccommittee/message_test.go @@ -3,8 +3,8 @@ package synccommittee import ( "testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSyncCommitteeSignatureCache_Nil(t *testing.T) { diff --git a/beacon-chain/operations/synccommittee/pool.go b/beacon-chain/operations/synccommittee/pool.go index 6681b121a357..4faf0f310ef7 100644 --- a/beacon-chain/operations/synccommittee/pool.go +++ b/beacon-chain/operations/synccommittee/pool.go @@ -1,8 +1,8 @@ package synccommittee import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var _ = Pool(&Store{}) diff --git a/beacon-chain/operations/voluntaryexits/BUILD.bazel b/beacon-chain/operations/voluntaryexits/BUILD.bazel index 8d75c4870c5f..7f53aa5a5dff 100644 --- a/beacon-chain/operations/voluntaryexits/BUILD.bazel +++ b/beacon-chain/operations/voluntaryexits/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "doc.go", "pool.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits", visibility = [ "//beacon-chain:__subpackages__", ], diff --git a/beacon-chain/operations/voluntaryexits/mock/BUILD.bazel b/beacon-chain/operations/voluntaryexits/mock/BUILD.bazel index 1aabd0a86523..283c789b5f2b 100644 --- a/beacon-chain/operations/voluntaryexits/mock/BUILD.bazel +++ b/beacon-chain/operations/voluntaryexits/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits/mock", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/operations/voluntaryexits/mock/mock.go b/beacon-chain/operations/voluntaryexits/mock/mock.go index 409005d3e23c..72a240bb1f9c 100644 --- a/beacon-chain/operations/voluntaryexits/mock/mock.go +++ b/beacon-chain/operations/voluntaryexits/mock/mock.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // PoolMock is a fake implementation of PoolManager. diff --git a/beacon-chain/operations/voluntaryexits/pool.go b/beacon-chain/operations/voluntaryexits/pool.go index 0684bb79a599..c5a868211b9f 100644 --- a/beacon-chain/operations/voluntaryexits/pool.go +++ b/beacon-chain/operations/voluntaryexits/pool.go @@ -4,13 +4,13 @@ import ( "math" "sync" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - doublylinkedlist "github.com/prysmaticlabs/prysm/v3/container/doubly-linked-list" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + types "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + doublylinkedlist "github.com/prysmaticlabs/prysm/v4/container/doubly-linked-list" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/operations/voluntaryexits/pool_test.go b/beacon-chain/operations/voluntaryexits/pool_test.go index 4d9ef7966e9e..1374fe7d461e 100644 --- a/beacon-chain/operations/voluntaryexits/pool_test.go +++ b/beacon-chain/operations/voluntaryexits/pool_test.go @@ -3,17 +3,17 @@ package voluntaryexits import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + types "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestPendingExits(t *testing.T) { diff --git a/beacon-chain/p2p/BUILD.bazel b/beacon-chain/p2p/BUILD.bazel index 1c3f0c5e5c91..ef1525a33948 100644 --- a/beacon-chain/p2p/BUILD.bazel +++ b/beacon-chain/p2p/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "utils.go", "watch_peers.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/beacon-chain/p2p/addr_factory_test.go b/beacon-chain/p2p/addr_factory_test.go index 002d91633d8a..e362a9bc49fb 100644 --- a/beacon-chain/p2p/addr_factory_test.go +++ b/beacon-chain/p2p/addr_factory_test.go @@ -4,8 +4,8 @@ import ( "testing" ma "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestRelayAddrs_OnlyFactory(t *testing.T) { diff --git a/beacon-chain/p2p/broadcaster.go b/beacon-chain/p2p/broadcaster.go index a2d739d93e8e..07334876d447 100644 --- a/beacon-chain/p2p/broadcaster.go +++ b/beacon-chain/p2p/broadcaster.go @@ -9,12 +9,12 @@ import ( "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/broadcaster_test.go b/beacon-chain/p2p/broadcaster_test.go index 548c7cec53b6..0426ce8b0d58 100644 --- a/beacon-chain/p2p/broadcaster_test.go +++ b/beacon-chain/p2p/broadcaster_test.go @@ -13,17 +13,17 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/host" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - testpb "github.com/prysmaticlabs/prysm/v3/proto/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + testpb "github.com/prysmaticlabs/prysm/v4/proto/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/config.go b/beacon-chain/p2p/config.go index 65526d733eff..33e9b95775e1 100644 --- a/beacon-chain/p2p/config.go +++ b/beacon-chain/p2p/config.go @@ -1,8 +1,8 @@ package p2p import ( - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" ) // Config for the p2p service. These parameters are set from application level flags diff --git a/beacon-chain/p2p/connection_gater_test.go b/beacon-chain/p2p/connection_gater_test.go index f2ae97713a9e..2ea712b287d7 100644 --- a/beacon-chain/p2p/connection_gater_test.go +++ b/beacon-chain/p2p/connection_gater_test.go @@ -9,14 +9,14 @@ import ( "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPeer_AtMaxLimit(t *testing.T) { diff --git a/beacon-chain/p2p/dial_relay_node_test.go b/beacon-chain/p2p/dial_relay_node_test.go index f51506f3d70e..db8e484014be 100644 --- a/beacon-chain/p2p/dial_relay_node_test.go +++ b/beacon-chain/p2p/dial_relay_node_test.go @@ -7,8 +7,8 @@ import ( bh "github.com/libp2p/go-libp2p/p2p/host/blank" swarmt "github.com/libp2p/go-libp2p/p2p/net/swarm/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestMakePeer_InvalidMultiaddress(t *testing.T) { diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index b6ed3acebbec..9df654b713dd 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -14,11 +14,11 @@ import ( ma "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/config/params" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/config/params" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // Listener defines the discovery V5 network interface that is used diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index ee07c7fb5f19..598f5d86d527 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -20,23 +20,23 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - testp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - prysmNetwork "github.com/prysmaticlabs/prysm/v3/network" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + testp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + prysmNetwork "github.com/prysmaticlabs/prysm/v4/network" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/p2p/encoder/BUILD.bazel b/beacon-chain/p2p/encoder/BUILD.bazel index b22c33872986..ac6fe4237302 100644 --- a/beacon-chain/p2p/encoder/BUILD.bazel +++ b/beacon-chain/p2p/encoder/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "ssz.go", "varint.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/beacon-chain/p2p/encoder/snappy_test.go b/beacon-chain/p2p/encoder/snappy_test.go index fe152c8e3e51..1b48bac0a9ef 100644 --- a/beacon-chain/p2p/encoder/snappy_test.go +++ b/beacon-chain/p2p/encoder/snappy_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestSszNetworkEncoder_BufferedReader(t *testing.T) { diff --git a/beacon-chain/p2p/encoder/ssz.go b/beacon-chain/p2p/encoder/ssz.go index cae73161e6f6..a6acfa7f773e 100644 --- a/beacon-chain/p2p/encoder/ssz.go +++ b/beacon-chain/p2p/encoder/ssz.go @@ -9,8 +9,8 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" fastssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/math" ) var _ NetworkEncoding = (*SszNetworkEncoder)(nil) diff --git a/beacon-chain/p2p/encoder/ssz_test.go b/beacon-chain/p2p/encoder/ssz_test.go index 8a191f1f0ba8..398645e3cc6a 100644 --- a/beacon-chain/p2p/encoder/ssz_test.go +++ b/beacon-chain/p2p/encoder/ssz_test.go @@ -9,12 +9,12 @@ import ( "testing" gogo "github.com/gogo/protobuf/proto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/encoder/varint_test.go b/beacon-chain/p2p/encoder/varint_test.go index 8331affc3e76..098972016b4b 100644 --- a/beacon-chain/p2p/encoder/varint_test.go +++ b/beacon-chain/p2p/encoder/varint_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/gogo/protobuf/proto" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestReadVarint(t *testing.T) { diff --git a/beacon-chain/p2p/fork.go b/beacon-chain/p2p/fork.go index 07755826240c..4a5744c125a3 100644 --- a/beacon-chain/p2p/fork.go +++ b/beacon-chain/p2p/fork.go @@ -8,11 +8,11 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/network/forks" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/network/forks" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/fork_test.go b/beacon-chain/p2p/fork_test.go index 4d28cf63e628..f628c6b62a13 100644 --- a/beacon-chain/p2p/fork_test.go +++ b/beacon-chain/p2p/fork_test.go @@ -13,16 +13,16 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" ma "github.com/multiformats/go-multiaddr" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/p2p/fork_watcher.go b/beacon-chain/p2p/fork_watcher.go index 6db6c02f1692..16148a0c4fd6 100644 --- a/beacon-chain/p2p/fork_watcher.go +++ b/beacon-chain/p2p/fork_watcher.go @@ -1,9 +1,9 @@ package p2p import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // A background routine which listens for new and upcoming forks and diff --git a/beacon-chain/p2p/gossip_scoring_params.go b/beacon-chain/p2p/gossip_scoring_params.go index 83a78a6f60ad..a83b5c13eb35 100644 --- a/beacon-chain/p2p/gossip_scoring_params.go +++ b/beacon-chain/p2p/gossip_scoring_params.go @@ -10,9 +10,9 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/gossip_scoring_params_test.go b/beacon-chain/p2p/gossip_scoring_params_test.go index 6870a7927503..4db6edd96092 100644 --- a/beacon-chain/p2p/gossip_scoring_params_test.go +++ b/beacon-chain/p2p/gossip_scoring_params_test.go @@ -5,12 +5,12 @@ import ( "testing" pubsub "github.com/libp2p/go-libp2p-pubsub" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestCorrect_ActiveValidatorsCount(t *testing.T) { diff --git a/beacon-chain/p2p/gossip_topic_mappings.go b/beacon-chain/p2p/gossip_topic_mappings.go index 8d3d69b865d6..354530efbaaa 100644 --- a/beacon-chain/p2p/gossip_topic_mappings.go +++ b/beacon-chain/p2p/gossip_topic_mappings.go @@ -3,9 +3,9 @@ package p2p import ( "reflect" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/gossip_topic_mappings_test.go b/beacon-chain/p2p/gossip_topic_mappings_test.go index 530271cd53c9..1e9d9a5e955c 100644 --- a/beacon-chain/p2p/gossip_topic_mappings_test.go +++ b/beacon-chain/p2p/gossip_topic_mappings_test.go @@ -4,11 +4,11 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestMappingHasNoDuplicates(t *testing.T) { diff --git a/beacon-chain/p2p/handshake.go b/beacon-chain/p2p/handshake.go index 5a07093a3974..b9a8329b77a9 100644 --- a/beacon-chain/p2p/handshake.go +++ b/beacon-chain/p2p/handshake.go @@ -10,9 +10,9 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/interfaces.go b/beacon-chain/p2p/interfaces.go index a51cbc6434b4..1bbd65363678 100644 --- a/beacon-chain/p2p/interfaces.go +++ b/beacon-chain/p2p/interfaces.go @@ -10,10 +10,10 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/message_id.go b/beacon-chain/p2p/message_id.go index f23e6990e4e4..554df8d837f8 100644 --- a/beacon-chain/p2p/message_id.go +++ b/beacon-chain/p2p/message_id.go @@ -2,13 +2,13 @@ package p2p import ( pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/network/forks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/network/forks" ) // MsgID is a content addressable ID function. diff --git a/beacon-chain/p2p/message_id_test.go b/beacon-chain/p2p/message_id_test.go index a06557f61af5..fe7ed7e44a00 100644 --- a/beacon-chain/p2p/message_id_test.go +++ b/beacon-chain/p2p/message_id_test.go @@ -7,13 +7,13 @@ import ( "github.com/golang/snappy" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestMsgID_HashesCorrectly(t *testing.T) { diff --git a/beacon-chain/p2p/options.go b/beacon-chain/p2p/options.go index 8222946d4a1d..8301f5c340d1 100644 --- a/beacon-chain/p2p/options.go +++ b/beacon-chain/p2p/options.go @@ -12,8 +12,8 @@ import ( "github.com/libp2p/go-libp2p/p2p/transport/tcp" ma "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // MultiAddressBuilder takes in an ip address string and port to produce a go multiaddr format. diff --git a/beacon-chain/p2p/options_test.go b/beacon-chain/p2p/options_test.go index 8f83d72b804f..7a6c07a4989a 100644 --- a/beacon-chain/p2p/options_test.go +++ b/beacon-chain/p2p/options_test.go @@ -13,12 +13,12 @@ import ( "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/protocol" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPrivateKeyLoading(t *testing.T) { diff --git a/beacon-chain/p2p/parameter_test.go b/beacon-chain/p2p/parameter_test.go index 41cfef8d3bc1..facc31c8f867 100644 --- a/beacon-chain/p2p/parameter_test.go +++ b/beacon-chain/p2p/parameter_test.go @@ -4,8 +4,8 @@ import ( "testing" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestOverlayParameters(t *testing.T) { diff --git a/beacon-chain/p2p/peers/BUILD.bazel b/beacon-chain/p2p/peers/BUILD.bazel index a3d4e8bcf286..c2d1fcde3465 100644 --- a/beacon-chain/p2p/peers/BUILD.bazel +++ b/beacon-chain/p2p/peers/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "status.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/beacon-chain/p2p/peers/peerdata/BUILD.bazel b/beacon-chain/p2p/peers/peerdata/BUILD.bazel index 711b32d720b9..c740d0c36a06 100644 --- a/beacon-chain/p2p/peers/peerdata/BUILD.bazel +++ b/beacon-chain/p2p/peers/peerdata/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["store.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//proto/prysm/v1alpha1:go_default_library", diff --git a/beacon-chain/p2p/peers/peerdata/store.go b/beacon-chain/p2p/peers/peerdata/store.go index 357a962bbec2..277b872ca343 100644 --- a/beacon-chain/p2p/peers/peerdata/store.go +++ b/beacon-chain/p2p/peers/peerdata/store.go @@ -10,8 +10,8 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" ) var ( diff --git a/beacon-chain/p2p/peers/peerdata/store_test.go b/beacon-chain/p2p/peers/peerdata/store_test.go index a190adac56e6..ce144392e89e 100644 --- a/beacon-chain/p2p/peers/peerdata/store_test.go +++ b/beacon-chain/p2p/peers/peerdata/store_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_GetSetDelete(t *testing.T) { diff --git a/beacon-chain/p2p/peers/peers_test.go b/beacon-chain/p2p/peers/peers_test.go index 0d9ea4c7b6eb..af27648818d2 100644 --- a/beacon-chain/p2p/peers/peers_test.go +++ b/beacon-chain/p2p/peers/peers_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/peers/scorers/BUILD.bazel b/beacon-chain/p2p/peers/scorers/BUILD.bazel index 13ae12327132..4ca89a91a390 100644 --- a/beacon-chain/p2p/peers/scorers/BUILD.bazel +++ b/beacon-chain/p2p/peers/scorers/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "peer_status.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/p2p/peers/peerdata:go_default_library", diff --git a/beacon-chain/p2p/peers/scorers/bad_responses.go b/beacon-chain/p2p/peers/scorers/bad_responses.go index b8a6d6425d45..25df8143083e 100644 --- a/beacon-chain/p2p/peers/scorers/bad_responses.go +++ b/beacon-chain/p2p/peers/scorers/bad_responses.go @@ -4,7 +4,7 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" ) var _ Scorer = (*BadResponsesScorer)(nil) diff --git a/beacon-chain/p2p/peers/scorers/bad_responses_test.go b/beacon-chain/p2p/peers/scorers/bad_responses_test.go index e2fcdf817d91..a82f3a25e649 100644 --- a/beacon-chain/p2p/peers/scorers/bad_responses_test.go +++ b/beacon-chain/p2p/peers/scorers/bad_responses_test.go @@ -7,11 +7,11 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestScorers_BadResponses_Score(t *testing.T) { diff --git a/beacon-chain/p2p/peers/scorers/block_providers.go b/beacon-chain/p2p/peers/scorers/block_providers.go index 674a23698cb7..4c93c2348fca 100644 --- a/beacon-chain/p2p/peers/scorers/block_providers.go +++ b/beacon-chain/p2p/peers/scorers/block_providers.go @@ -7,10 +7,10 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) var _ Scorer = (*BlockProviderScorer)(nil) diff --git a/beacon-chain/p2p/peers/scorers/block_providers_test.go b/beacon-chain/p2p/peers/scorers/block_providers_test.go index 9f5a3a14d636..c993fbd04fe2 100644 --- a/beacon-chain/p2p/peers/scorers/block_providers_test.go +++ b/beacon-chain/p2p/peers/scorers/block_providers_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/time" ) func TestScorers_BlockProvider_Score(t *testing.T) { diff --git a/beacon-chain/p2p/peers/scorers/gossip_scorer.go b/beacon-chain/p2p/peers/scorers/gossip_scorer.go index da32a9987cdb..cdabe52b49b9 100644 --- a/beacon-chain/p2p/peers/scorers/gossip_scorer.go +++ b/beacon-chain/p2p/peers/scorers/gossip_scorer.go @@ -2,8 +2,8 @@ package scorers import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var _ Scorer = (*GossipScorer)(nil) diff --git a/beacon-chain/p2p/peers/scorers/gossip_scorer_test.go b/beacon-chain/p2p/peers/scorers/gossip_scorer_test.go index 004a00ae4074..f64e6d1752cc 100644 --- a/beacon-chain/p2p/peers/scorers/gossip_scorer_test.go +++ b/beacon-chain/p2p/peers/scorers/gossip_scorer_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestScorers_Gossip_Score(t *testing.T) { diff --git a/beacon-chain/p2p/peers/scorers/peer_status.go b/beacon-chain/p2p/peers/scorers/peer_status.go index 522385025a5c..4bac2d8d3f81 100644 --- a/beacon-chain/p2p/peers/scorers/peer_status.go +++ b/beacon-chain/p2p/peers/scorers/peer_status.go @@ -5,11 +5,11 @@ import ( "math" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time" ) var _ Scorer = (*PeerStatusScorer)(nil) diff --git a/beacon-chain/p2p/peers/scorers/peer_status_test.go b/beacon-chain/p2p/peers/scorers/peer_status_test.go index 2ab1d5b02494..ce862f68ff81 100644 --- a/beacon-chain/p2p/peers/scorers/peer_status_test.go +++ b/beacon-chain/p2p/peers/scorers/peer_status_test.go @@ -5,14 +5,14 @@ import ( "testing" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestScorers_PeerStatus_Score(t *testing.T) { diff --git a/beacon-chain/p2p/peers/scorers/scorers_test.go b/beacon-chain/p2p/peers/scorers/scorers_test.go index 95e9df5c58db..f2a74650c4c0 100644 --- a/beacon-chain/p2p/peers/scorers/scorers_test.go +++ b/beacon-chain/p2p/peers/scorers/scorers_test.go @@ -5,8 +5,8 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/peers/scorers/service.go b/beacon-chain/p2p/peers/scorers/service.go index f593f85398a6..d826803051af 100644 --- a/beacon-chain/p2p/peers/scorers/service.go +++ b/beacon-chain/p2p/peers/scorers/service.go @@ -6,7 +6,7 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" ) var _ Scorer = (*Service)(nil) diff --git a/beacon-chain/p2p/peers/scorers/service_test.go b/beacon-chain/p2p/peers/scorers/service_test.go index 438b65939e71..970a6fc6bb24 100644 --- a/beacon-chain/p2p/peers/scorers/service_test.go +++ b/beacon-chain/p2p/peers/scorers/service_test.go @@ -7,10 +7,10 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestScorers_Service_Init(t *testing.T) { diff --git a/beacon-chain/p2p/peers/status.go b/beacon-chain/p2p/peers/status.go index 9b80c5878892..de58f401f33a 100644 --- a/beacon-chain/p2p/peers/status.go +++ b/beacon-chain/p2p/peers/status.go @@ -34,16 +34,16 @@ import ( ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - pmath "github.com/prysmaticlabs/prysm/v3/math" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + pmath "github.com/prysmaticlabs/prysm/v4/math" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) const ( diff --git a/beacon-chain/p2p/peers/status_test.go b/beacon-chain/p2p/peers/status_test.go index 51842963de66..ce69ebbf058e 100644 --- a/beacon-chain/p2p/peers/status_test.go +++ b/beacon-chain/p2p/peers/status_test.go @@ -12,16 +12,16 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStatus(t *testing.T) { diff --git a/beacon-chain/p2p/pubsub.go b/beacon-chain/p2p/pubsub.go index 38473c177b49..09d0ad2a3d90 100644 --- a/beacon-chain/p2p/pubsub.go +++ b/beacon-chain/p2p/pubsub.go @@ -10,10 +10,10 @@ import ( pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) const ( diff --git a/beacon-chain/p2p/pubsub_filter.go b/beacon-chain/p2p/pubsub_filter.go index e819e27c6da9..b9f42c1e3b13 100644 --- a/beacon-chain/p2p/pubsub_filter.go +++ b/beacon-chain/p2p/pubsub_filter.go @@ -7,9 +7,9 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/network/forks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/network/forks" ) var _ pubsub.SubscriptionFilter = (*Service)(nil) diff --git a/beacon-chain/p2p/pubsub_filter_test.go b/beacon-chain/p2p/pubsub_filter_test.go index 178bc9c0f43a..b5eea447300e 100644 --- a/beacon-chain/p2p/pubsub_filter_test.go +++ b/beacon-chain/p2p/pubsub_filter_test.go @@ -9,16 +9,16 @@ import ( pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) func TestService_CanSubscribe(t *testing.T) { diff --git a/beacon-chain/p2p/pubsub_fuzz_test.go b/beacon-chain/p2p/pubsub_fuzz_test.go index 6d94081147fc..d9e91276a7c9 100644 --- a/beacon-chain/p2p/pubsub_fuzz_test.go +++ b/beacon-chain/p2p/pubsub_fuzz_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" ) func FuzzMsgID(f *testing.F) { diff --git a/beacon-chain/p2p/pubsub_test.go b/beacon-chain/p2p/pubsub_test.go index cc74612cd7d7..0c0a3a32d965 100644 --- a/beacon-chain/p2p/pubsub_test.go +++ b/beacon-chain/p2p/pubsub_test.go @@ -8,11 +8,11 @@ import ( "time" "github.com/pkg/errors" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - testp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + testp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestService_PublishToTopicConcurrentMapWrite(t *testing.T) { diff --git a/beacon-chain/p2p/rpc_topic_mappings.go b/beacon-chain/p2p/rpc_topic_mappings.go index 15849b528977..346be8973bfb 100644 --- a/beacon-chain/p2p/rpc_topic_mappings.go +++ b/beacon-chain/p2p/rpc_topic_mappings.go @@ -4,10 +4,10 @@ import ( "reflect" "github.com/pkg/errors" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SchemaVersionV1 specifies the schema version for our rpc protocol ID. diff --git a/beacon-chain/p2p/rpc_topic_mappings_test.go b/beacon-chain/p2p/rpc_topic_mappings_test.go index ef15d370fede..5e6bcac22d1c 100644 --- a/beacon-chain/p2p/rpc_topic_mappings_test.go +++ b/beacon-chain/p2p/rpc_topic_mappings_test.go @@ -5,13 +5,13 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestVerifyRPCMappings(t *testing.T) { diff --git a/beacon-chain/p2p/sender.go b/beacon-chain/p2p/sender.go index ff27009a9b17..ae73b6ed1ba6 100644 --- a/beacon-chain/p2p/sender.go +++ b/beacon-chain/p2p/sender.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/p2p/sender_test.go b/beacon-chain/p2p/sender_test.go index d48c5f918cb6..7299d1874825 100644 --- a/beacon-chain/p2p/sender_test.go +++ b/beacon-chain/p2p/sender_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/libp2p/go-libp2p/core/network" - testp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/service.go b/beacon-chain/p2p/service.go index 6ca566ce59a2..63e61f782a9c 100644 --- a/beacon-chain/p2p/service.go +++ b/beacon-chain/p2p/service.go @@ -19,19 +19,19 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - prysmnetwork "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + prysmnetwork "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/p2p/service_test.go b/beacon-chain/p2p/service_test.go index a02d99dbd897..00d2d7c339c0 100644 --- a/beacon-chain/p2p/service_test.go +++ b/beacon-chain/p2p/service_test.go @@ -15,19 +15,19 @@ import ( "github.com/libp2p/go-libp2p/core/peer" noise "github.com/libp2p/go-libp2p/p2p/security/noise" "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/prysm/v3/async/event" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/async/event" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/p2p/subnets.go b/beacon-chain/p2p/subnets.go index 486d5b407d1f..1be5b758822e 100644 --- a/beacon-chain/p2p/subnets.go +++ b/beacon-chain/p2p/subnets.go @@ -9,13 +9,13 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - mathutil "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + mathutil "github.com/prysmaticlabs/prysm/v4/math" "go.opencensus.io/trace" - "github.com/prysmaticlabs/prysm/v3/config/params" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var attestationSubnetCount = params.BeaconNetworkConfig().AttestationSubnetCount diff --git a/beacon-chain/p2p/subnets_test.go b/beacon-chain/p2p/subnets_test.go index ee772e582587..8d0f594e18c7 100644 --- a/beacon-chain/p2p/subnets_test.go +++ b/beacon-chain/p2p/subnets_test.go @@ -12,17 +12,17 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/crypto" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStartDiscV5_DiscoverPeersWithSubnets(t *testing.T) { diff --git a/beacon-chain/p2p/testing/BUILD.bazel b/beacon-chain/p2p/testing/BUILD.bazel index a61a4c78ca9e..20bf1439c23e 100644 --- a/beacon-chain/p2p/testing/BUILD.bazel +++ b/beacon-chain/p2p/testing/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "mock_peersprovider.go", "p2p.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing", visibility = [ "//beacon-chain:__subpackages__", ], diff --git a/beacon-chain/p2p/testing/fuzz_p2p.go b/beacon-chain/p2p/testing/fuzz_p2p.go index f2809ed7dba8..e9a6e1afeb31 100644 --- a/beacon-chain/p2p/testing/fuzz_p2p.go +++ b/beacon-chain/p2p/testing/fuzz_p2p.go @@ -10,10 +10,10 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/testing/mock_broadcaster.go b/beacon-chain/p2p/testing/mock_broadcaster.go index a9cb87d45f37..b5f88097dcb0 100644 --- a/beacon-chain/p2p/testing/mock_broadcaster.go +++ b/beacon-chain/p2p/testing/mock_broadcaster.go @@ -3,7 +3,7 @@ package testing import ( "context" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/testing/mock_metadataprovider.go b/beacon-chain/p2p/testing/mock_metadataprovider.go index 4278e945d29c..9ad900335975 100644 --- a/beacon-chain/p2p/testing/mock_metadataprovider.go +++ b/beacon-chain/p2p/testing/mock_metadataprovider.go @@ -1,7 +1,7 @@ package testing import ( - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" ) // MockMetadataProvider is a fake implementation of the MetadataProvider interface. diff --git a/beacon-chain/p2p/testing/mock_peersprovider.go b/beacon-chain/p2p/testing/mock_peersprovider.go index dd54c7fd9db5..05e7835a77c9 100644 --- a/beacon-chain/p2p/testing/mock_peersprovider.go +++ b/beacon-chain/p2p/testing/mock_peersprovider.go @@ -10,9 +10,9 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/testing/p2p.go b/beacon-chain/p2p/testing/p2p.go index 79e99fc9d3df..861423c707e5 100644 --- a/beacon-chain/p2p/testing/p2p.go +++ b/beacon-chain/p2p/testing/p2p.go @@ -21,11 +21,11 @@ import ( swarmt "github.com/libp2p/go-libp2p/p2p/net/swarm/testing" "github.com/multiformats/go-multiaddr" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/types/BUILD.bazel b/beacon-chain/p2p/types/BUILD.bazel index 822eb8a5e398..719714ecc34a 100644 --- a/beacon-chain/p2p/types/BUILD.bazel +++ b/beacon-chain/p2p/types/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "rpc_goodbye_codes.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/beacon-chain/p2p/types/object_mapping.go b/beacon-chain/p2p/types/object_mapping.go index 186294c3d65b..f866a00057f8 100644 --- a/beacon-chain/p2p/types/object_mapping.go +++ b/beacon-chain/p2p/types/object_mapping.go @@ -1,13 +1,13 @@ package types import ( - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" ) func init() { diff --git a/beacon-chain/p2p/types/object_mapping_test.go b/beacon-chain/p2p/types/object_mapping_test.go index 500dd2c5b060..680b73d03afa 100644 --- a/beacon-chain/p2p/types/object_mapping_test.go +++ b/beacon-chain/p2p/types/object_mapping_test.go @@ -3,9 +3,9 @@ package types import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestInitializeDataMaps(t *testing.T) { diff --git a/beacon-chain/p2p/types/rpc_goodbye_codes.go b/beacon-chain/p2p/types/rpc_goodbye_codes.go index 9ca25a0a7688..29e80d2c02d2 100644 --- a/beacon-chain/p2p/types/rpc_goodbye_codes.go +++ b/beacon-chain/p2p/types/rpc_goodbye_codes.go @@ -1,7 +1,7 @@ package types import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // RPCGoodbyeCode represents goodbye code, used in sync package. diff --git a/beacon-chain/p2p/types/types.go b/beacon-chain/p2p/types/types.go index bf2e6976c62d..44def488a17b 100644 --- a/beacon-chain/p2p/types/types.go +++ b/beacon-chain/p2p/types/types.go @@ -6,7 +6,7 @@ package types import ( "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) const rootLength = 32 diff --git a/beacon-chain/p2p/types/types_test.go b/beacon-chain/p2p/types/types_test.go index 13037f971a0c..0e2ff8f40c50 100644 --- a/beacon-chain/p2p/types/types_test.go +++ b/beacon-chain/p2p/types/types_test.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBeaconBlockByRootsReq_Limit(t *testing.T) { diff --git a/beacon-chain/p2p/utils.go b/beacon-chain/p2p/utils.go index 4f0cfd6f7c17..95a84935e3c9 100644 --- a/beacon-chain/p2p/utils.go +++ b/beacon-chain/p2p/utils.go @@ -16,11 +16,11 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/io/file" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/io/file" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/utils_test.go b/beacon-chain/p2p/utils_test.go index b637af504eb0..5040f33874d9 100644 --- a/beacon-chain/p2p/utils_test.go +++ b/beacon-chain/p2p/utils_test.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/rpc/BUILD.bazel b/beacon-chain/rpc/BUILD.bazel index 4ef5ac853d59..0f0d79f4e2f5 100644 --- a/beacon-chain/rpc/BUILD.bazel +++ b/beacon-chain/rpc/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/apimiddleware/BUILD.bazel b/beacon-chain/rpc/apimiddleware/BUILD.bazel index 2e4439cfb33f..af07e5fa6a18 100644 --- a/beacon-chain/rpc/apimiddleware/BUILD.bazel +++ b/beacon-chain/rpc/apimiddleware/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "structs.go", "structs_marshalling.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware", visibility = ["//visibility:public"], deps = [ "//api/gateway/apimiddleware:go_default_library", diff --git a/beacon-chain/rpc/apimiddleware/custom_handlers.go b/beacon-chain/rpc/apimiddleware/custom_handlers.go index f6f47466b390..1e12e54188e1 100644 --- a/beacon-chain/rpc/apimiddleware/custom_handlers.go +++ b/beacon-chain/rpc/apimiddleware/custom_handlers.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/events" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/events" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/r3labs/sse" ) diff --git a/beacon-chain/rpc/apimiddleware/custom_handlers_test.go b/beacon-chain/rpc/apimiddleware/custom_handlers_test.go index f01aabb5c1c6..c0c09758bbd0 100644 --- a/beacon-chain/rpc/apimiddleware/custom_handlers_test.go +++ b/beacon-chain/rpc/apimiddleware/custom_handlers_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/events" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/events" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/r3labs/sse" ) diff --git a/beacon-chain/rpc/apimiddleware/custom_hooks.go b/beacon-chain/rpc/apimiddleware/custom_hooks.go index 032b61b92e32..8bdbd470d783 100644 --- a/beacon-chain/rpc/apimiddleware/custom_hooks.go +++ b/beacon-chain/rpc/apimiddleware/custom_hooks.go @@ -10,11 +10,11 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Beacon/submitPoolBLSToExecutionChange diff --git a/beacon-chain/rpc/apimiddleware/custom_hooks_test.go b/beacon-chain/rpc/apimiddleware/custom_hooks_test.go index f9db80bb6e74..555d081b24e4 100644 --- a/beacon-chain/rpc/apimiddleware/custom_hooks_test.go +++ b/beacon-chain/rpc/apimiddleware/custom_hooks_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/gogo/protobuf/types" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestWrapAttestationArray(t *testing.T) { diff --git a/beacon-chain/rpc/apimiddleware/endpoint_factory.go b/beacon-chain/rpc/apimiddleware/endpoint_factory.go index 8a9583810d25..becf529af650 100644 --- a/beacon-chain/rpc/apimiddleware/endpoint_factory.go +++ b/beacon-chain/rpc/apimiddleware/endpoint_factory.go @@ -2,7 +2,7 @@ package apimiddleware import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" ) // BeaconEndpointFactory creates endpoints used for running beacon chain API calls through the API Middleware. diff --git a/beacon-chain/rpc/apimiddleware/structs.go b/beacon-chain/rpc/apimiddleware/structs.go index 07be83b6ccfb..3e8bb3cf38e3 100644 --- a/beacon-chain/rpc/apimiddleware/structs.go +++ b/beacon-chain/rpc/apimiddleware/structs.go @@ -3,9 +3,9 @@ package apimiddleware import ( "strings" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" ) //---------------- diff --git a/beacon-chain/rpc/apimiddleware/structs_marshalling_test.go b/beacon-chain/rpc/apimiddleware/structs_marshalling_test.go index 250fc0cc4195..cbb79cc52976 100644 --- a/beacon-chain/rpc/apimiddleware/structs_marshalling_test.go +++ b/beacon-chain/rpc/apimiddleware/structs_marshalling_test.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestUnmarshalEpochParticipation(t *testing.T) { diff --git a/beacon-chain/rpc/eth/beacon/BUILD.bazel b/beacon-chain/rpc/eth/beacon/BUILD.bazel index 046b676ba01c..382b56891040 100644 --- a/beacon-chain/rpc/eth/beacon/BUILD.bazel +++ b/beacon-chain/rpc/eth/beacon/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "sync_committee.go", "validator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/beacon", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/beacon", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//api/grpc:go_default_library", diff --git a/beacon-chain/rpc/eth/beacon/blinded_blocks.go b/beacon-chain/rpc/eth/beacon/blinded_blocks.go index b25e1e050275..8ed7d886365b 100644 --- a/beacon-chain/rpc/eth/beacon/blinded_blocks.go +++ b/beacon-chain/rpc/eth/beacon/blinded_blocks.go @@ -4,15 +4,15 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go b/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go index df7016188dff..ec264da421eb 100644 --- a/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go +++ b/beacon-chain/rpc/eth/beacon/blinded_blocks_test.go @@ -6,25 +6,25 @@ import ( "reflect" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - builderTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - executionTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + builderTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + executionTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc/metadata" ) diff --git a/beacon-chain/rpc/eth/beacon/blocks.go b/beacon-chain/rpc/eth/beacon/blocks.go index 7fb19abb926e..9a83b495dec1 100644 --- a/beacon-chain/rpc/eth/beacon/blocks.go +++ b/beacon-chain/rpc/eth/beacon/blocks.go @@ -7,23 +7,23 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - rpchelpers "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + rpchelpers "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/beacon-chain/rpc/eth/beacon/blocks_test.go b/beacon-chain/rpc/eth/beacon/blocks_test.go index c7015f758753..762fe8477f23 100644 --- a/beacon-chain/rpc/eth/beacon/blocks_test.go +++ b/beacon-chain/rpc/eth/beacon/blocks_test.go @@ -7,25 +7,25 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - executionTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + executionTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc/metadata" ) diff --git a/beacon-chain/rpc/eth/beacon/config.go b/beacon-chain/rpc/eth/beacon/config.go index cb994d4ddc26..ea4b8dfe1b87 100644 --- a/beacon-chain/rpc/eth/beacon/config.go +++ b/beacon-chain/rpc/eth/beacon/config.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/beacon/config_test.go b/beacon-chain/rpc/eth/beacon/config_test.go index c428fa70ddc9..75b616d04609 100644 --- a/beacon-chain/rpc/eth/beacon/config_test.go +++ b/beacon-chain/rpc/eth/beacon/config_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/eth/beacon/init_test.go b/beacon-chain/rpc/eth/beacon/init_test.go index 774fa6d059f3..d1125a6fc2e7 100644 --- a/beacon-chain/rpc/eth/beacon/init_test.go +++ b/beacon-chain/rpc/eth/beacon/init_test.go @@ -1,7 +1,7 @@ package beacon import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func init() { diff --git a/beacon-chain/rpc/eth/beacon/pool.go b/beacon-chain/rpc/eth/beacon/pool.go index 5c06eff89e71..3b14f060c219 100644 --- a/beacon-chain/rpc/eth/beacon/pool.go +++ b/beacon-chain/rpc/eth/beacon/pool.go @@ -4,21 +4,21 @@ import ( "context" "time" - "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - corehelpers "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + corehelpers "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/beacon/pool_test.go b/beacon-chain/rpc/eth/beacon/pool_test.go index 89fc006ffbf8..71cd1abd0245 100644 --- a/beacon-chain/rpc/eth/beacon/pool_test.go +++ b/beacon-chain/rpc/eth/beacon/pool_test.go @@ -9,33 +9,33 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/prysmaticlabs/go-bitfield" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - blockchainmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - prysmtime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - blstoexecmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec/mock" - slashingsmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits/mock" - p2pMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpbv1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + blockchainmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + prysmtime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + blstoexecmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec/mock" + slashingsmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits/mock" + p2pMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpbv1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/eth/beacon/server.go b/beacon-chain/rpc/eth/beacon/server.go index 0db2060a7651..93636131ba50 100644 --- a/beacon-chain/rpc/eth/beacon/server.go +++ b/beacon-chain/rpc/eth/beacon/server.go @@ -4,20 +4,20 @@ package beacon import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - v1alpha1validator "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + v1alpha1validator "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" ) // Server defines a server implementation of the gRPC Beacon Chain service, diff --git a/beacon-chain/rpc/eth/beacon/server_test.go b/beacon-chain/rpc/eth/beacon/server_test.go index eb36b20c7aba..16ea39286088 100644 --- a/beacon-chain/rpc/eth/beacon/server_test.go +++ b/beacon-chain/rpc/eth/beacon/server_test.go @@ -1,5 +1,5 @@ package beacon -import ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" +import ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" var _ ethpbservice.BeaconChainServer = (*Server)(nil) diff --git a/beacon-chain/rpc/eth/beacon/state.go b/beacon-chain/rpc/eth/beacon/state.go index 87492e84c036..43dd921da57f 100644 --- a/beacon-chain/rpc/eth/beacon/state.go +++ b/beacon-chain/rpc/eth/beacon/state.go @@ -5,15 +5,15 @@ import ( "context" "strconv" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - eth2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + eth2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/beacon/state_test.go b/beacon-chain/rpc/eth/beacon/state_test.go index 5c60b3d040f3..7c9a061fe583 100644 --- a/beacon-chain/rpc/eth/beacon/state_test.go +++ b/beacon-chain/rpc/eth/beacon/state_test.go @@ -5,18 +5,18 @@ import ( "testing" "time" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - eth2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + eth2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/eth/beacon/sync_committee.go b/beacon-chain/rpc/eth/beacon/sync_committee.go index 0d7e8b4f17fe..f21ee41240b2 100644 --- a/beacon-chain/rpc/eth/beacon/sync_committee.go +++ b/beacon-chain/rpc/eth/beacon/sync_committee.go @@ -6,16 +6,16 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/beacon/sync_committee_test.go b/beacon-chain/rpc/eth/beacon/sync_committee_test.go index ff2302e37ef2..a6fa571e6b28 100644 --- a/beacon-chain/rpc/eth/beacon/sync_committee_test.go +++ b/beacon-chain/rpc/eth/beacon/sync_committee_test.go @@ -9,22 +9,22 @@ import ( "time" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" bytesutil2 "github.com/wealdtech/go-bytesutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/beacon/validator.go b/beacon-chain/rpc/eth/beacon/validator.go index 2e9c5ef280cc..2585ee04eee5 100644 --- a/beacon-chain/rpc/eth/beacon/validator.go +++ b/beacon-chain/rpc/eth/beacon/validator.go @@ -5,16 +5,16 @@ import ( "strconv" "github.com/pkg/errors" - corehelpers "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - "github.com/prysmaticlabs/prysm/v3/time/slots" + corehelpers "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/beacon/validator_test.go b/beacon-chain/rpc/eth/beacon/validator_test.go index 7e84532bd8c2..7081ab0eddc3 100644 --- a/beacon-chain/rpc/eth/beacon/validator_test.go +++ b/beacon-chain/rpc/eth/beacon/validator_test.go @@ -6,22 +6,22 @@ import ( "strings" "testing" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - rpchelpers "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + rpchelpers "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestGetValidator(t *testing.T) { diff --git a/beacon-chain/rpc/eth/debug/BUILD.bazel b/beacon-chain/rpc/eth/debug/BUILD.bazel index 4beb7e60f7f4..7de47ffe5204 100644 --- a/beacon-chain/rpc/eth/debug/BUILD.bazel +++ b/beacon-chain/rpc/eth/debug/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "debug.go", "server.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/debug", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/debug", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/eth/debug/debug.go b/beacon-chain/rpc/eth/debug/debug.go index 16f2b09638d6..7bbcb8a7881a 100644 --- a/beacon-chain/rpc/eth/debug/debug.go +++ b/beacon-chain/rpc/eth/debug/debug.go @@ -3,11 +3,11 @@ package debug import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/debug/debug_test.go b/beacon-chain/rpc/eth/debug/debug_test.go index 8985c9cac3ce..dddbe56cb042 100644 --- a/beacon-chain/rpc/eth/debug/debug_test.go +++ b/beacon-chain/rpc/eth/debug/debug_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/golang/protobuf/ptypes/empty" - blockchainmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - forkchoicetypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + blockchainmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + forkchoicetypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/eth/debug/server.go b/beacon-chain/rpc/eth/debug/server.go index 5e36f63b70be..d77a807f910a 100644 --- a/beacon-chain/rpc/eth/debug/server.go +++ b/beacon-chain/rpc/eth/debug/server.go @@ -4,9 +4,9 @@ package debug import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" ) // Server defines a server implementation of the gRPC Beacon Chain service, diff --git a/beacon-chain/rpc/eth/events/BUILD.bazel b/beacon-chain/rpc/eth/events/BUILD.bazel index 8bcd1550dd09..2d21b6b17095 100644 --- a/beacon-chain/rpc/eth/events/BUILD.bazel +++ b/beacon-chain/rpc/eth/events/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "events.go", "server.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/events", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/events", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/eth/events/events.go b/beacon-chain/rpc/eth/events/events.go index 3fb37a4aca7e..c17636bc552f 100644 --- a/beacon-chain/rpc/eth/events/events.go +++ b/beacon-chain/rpc/eth/events/events.go @@ -5,18 +5,18 @@ import ( gwpb "github.com/grpc-ecosystem/grpc-gateway/v2/proto/gateway" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/eth/events/events_test.go b/beacon-chain/rpc/eth/events/events_test.go index 7c77825548d4..2842a2ec7dfb 100644 --- a/beacon-chain/rpc/eth/events/events_test.go +++ b/beacon-chain/rpc/eth/events/events_test.go @@ -9,26 +9,26 @@ import ( "github.com/golang/mock/gomock" "github.com/grpc-ecosystem/grpc-gateway/v2/proto/gateway" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/async/event" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - prysmtime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async/event" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + prysmtime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/beacon-chain/rpc/eth/events/server.go b/beacon-chain/rpc/eth/events/server.go index dfa809c530bd..1be71c3eb6df 100644 --- a/beacon-chain/rpc/eth/events/server.go +++ b/beacon-chain/rpc/eth/events/server.go @@ -6,10 +6,10 @@ package events import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" ) // Server defines a server implementation of the gRPC events service, diff --git a/beacon-chain/rpc/eth/helpers/BUILD.bazel b/beacon-chain/rpc/eth/helpers/BUILD.bazel index aae2dfa73a19..2d33ed66ffff 100644 --- a/beacon-chain/rpc/eth/helpers/BUILD.bazel +++ b/beacon-chain/rpc/eth/helpers/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "sync.go", "validator_status.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers", visibility = ["//visibility:public"], deps = [ "//api/grpc:go_default_library", diff --git a/beacon-chain/rpc/eth/helpers/error_handling.go b/beacon-chain/rpc/eth/helpers/error_handling.go index 9915d3c94d3d..73ccd8e93ee9 100644 --- a/beacon-chain/rpc/eth/helpers/error_handling.go +++ b/beacon-chain/rpc/eth/helpers/error_handling.go @@ -3,8 +3,8 @@ package helpers import ( "errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/eth/helpers/sync.go b/beacon-chain/rpc/eth/helpers/sync.go index 8a18063ced62..68f2568e2abf 100644 --- a/beacon-chain/rpc/eth/helpers/sync.go +++ b/beacon-chain/rpc/eth/helpers/sync.go @@ -6,11 +6,11 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/config/params" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/eth/helpers/sync_test.go b/beacon-chain/rpc/eth/helpers/sync_test.go index d90e761c2cea..ab0c0ec3e749 100644 --- a/beacon-chain/rpc/eth/helpers/sync_test.go +++ b/beacon-chain/rpc/eth/helpers/sync_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - chainmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - syncmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + chainmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + syncmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc" ) diff --git a/beacon-chain/rpc/eth/helpers/validator_status.go b/beacon-chain/rpc/eth/helpers/validator_status.go index 8b525a2ae83d..93791ee727ba 100644 --- a/beacon-chain/rpc/eth/helpers/validator_status.go +++ b/beacon-chain/rpc/eth/helpers/validator_status.go @@ -2,10 +2,10 @@ package helpers import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" ) // ValidatorStatus returns a validator's status at the given epoch. diff --git a/beacon-chain/rpc/eth/helpers/validator_status_test.go b/beacon-chain/rpc/eth/helpers/validator_status_test.go index 1f35f2dc0da4..92b866561221 100644 --- a/beacon-chain/rpc/eth/helpers/validator_status_test.go +++ b/beacon-chain/rpc/eth/helpers/validator_status_test.go @@ -4,13 +4,13 @@ import ( "strconv" "testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_ValidatorStatus(t *testing.T) { diff --git a/beacon-chain/rpc/eth/node/BUILD.bazel b/beacon-chain/rpc/eth/node/BUILD.bazel index 80ddfc6ef601..dbf27a506b86 100644 --- a/beacon-chain/rpc/eth/node/BUILD.bazel +++ b/beacon-chain/rpc/eth/node/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "node.go", "server.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/node", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/node", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//api/grpc:go_default_library", diff --git a/beacon-chain/rpc/eth/node/node.go b/beacon-chain/rpc/eth/node/node.go index a9162cb2e3ae..b64038bee02c 100644 --- a/beacon-chain/rpc/eth/node/node.go +++ b/beacon-chain/rpc/eth/node/node.go @@ -10,14 +10,14 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/peerdata" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/peerdata" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/node/node_test.go b/beacon-chain/rpc/eth/node/node_test.go index 7a4915a90a6c..4df865988fa6 100644 --- a/beacon-chain/rpc/eth/node/node_test.go +++ b/beacon-chain/rpc/eth/node/node_test.go @@ -17,21 +17,21 @@ import ( libp2ptest "github.com/libp2p/go-libp2p/p2p/host/peerstore/test" ma "github.com/multiformats/go-multiaddr" "github.com/prysmaticlabs/go-bitfield" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - syncmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + syncmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/eth/node/server.go b/beacon-chain/rpc/eth/node/server.go index 5abf8913d62c..dfb39941046e 100644 --- a/beacon-chain/rpc/eth/node/server.go +++ b/beacon-chain/rpc/eth/node/server.go @@ -4,11 +4,11 @@ package node import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" "google.golang.org/grpc" ) diff --git a/beacon-chain/rpc/eth/node/server_test.go b/beacon-chain/rpc/eth/node/server_test.go index a5e96d4986d0..27478cb9ba44 100644 --- a/beacon-chain/rpc/eth/node/server_test.go +++ b/beacon-chain/rpc/eth/node/server_test.go @@ -1,7 +1,7 @@ package node import ( - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" ) var _ ethpbservice.BeaconNodeServer = (*Server)(nil) diff --git a/beacon-chain/rpc/eth/validator/BUILD.bazel b/beacon-chain/rpc/eth/validator/BUILD.bazel index ae7df678b945..d8c06519c1d2 100644 --- a/beacon-chain/rpc/eth/validator/BUILD.bazel +++ b/beacon-chain/rpc/eth/validator/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "server.go", "validator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/validator", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/validator", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/eth/validator/server.go b/beacon-chain/rpc/eth/validator/server.go index ee1b2917ddea..a3eff7132dc6 100644 --- a/beacon-chain/rpc/eth/validator/server.go +++ b/beacon-chain/rpc/eth/validator/server.go @@ -1,14 +1,14 @@ package validator import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - v1alpha1validator "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + v1alpha1validator "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" ) // Server defines a server implementation of the gRPC Validator service, diff --git a/beacon-chain/rpc/eth/validator/validator.go b/beacon-chain/rpc/eth/validator/validator.go index 9bc4a289aec5..2a37c5701cf2 100644 --- a/beacon-chain/rpc/eth/validator/validator.go +++ b/beacon-chain/rpc/eth/validator/validator.go @@ -12,22 +12,22 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - rpchelpers "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + rpchelpers "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/validator/validator_test.go b/beacon-chain/rpc/eth/validator/validator_test.go index 654f0aeb2d98..a5620a7a99c6 100644 --- a/beacon-chain/rpc/eth/validator/validator_test.go +++ b/beacon-chain/rpc/eth/validator/validator_test.go @@ -10,46 +10,46 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prysmaticlabs/go-bitfield" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - builderTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - p2pmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2pType "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - v1alpha1validator "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/proto/migration" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + builderTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + p2pmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2pType "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + v1alpha1validator "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/proto/migration" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel index 690055a2c75d..9829f220867b 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "validators.go", "validators_stream.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/beacon", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/beacon", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//api/pagination:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go index bf370f5d4e81..6da2b790e088 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - "github.com/prysmaticlabs/prysm/v3/api/pagination" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/pagination" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go index f132091d5386..1f8a56a4e25a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments_test.go @@ -7,20 +7,20 @@ import ( "strconv" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go index 7fdf09cba8e9..f2fcc33c4d7a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go @@ -6,19 +6,19 @@ import ( "strconv" "strings" - "github.com/prysmaticlabs/prysm/v3/api/pagination" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/pagination" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go index 14d089817270..98196e94b492 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go @@ -10,31 +10,31 @@ import ( "github.com/golang/mock/gomock" "github.com/prysmaticlabs/go-bitfield" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/cmd" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/cmd" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/beacon_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/beacon_test.go index 5c432b7424f8..53a14549a4fb 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/beacon_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/beacon_test.go @@ -3,8 +3,8 @@ package beacon import ( "testing" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func TestMain(m *testing.M) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go index 02036aad1078..479a1d62b0ac 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go @@ -5,21 +5,21 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/pagination" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/pagination" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go index eb051201e546..8b9758a91cae 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go @@ -7,25 +7,25 @@ import ( "testing" "github.com/golang/mock/gomock" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go index 239606ee5956..61274c8dd8c1 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go index a7fe0d92ce8c..ff102d28a6db 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/committees_test.go @@ -7,23 +7,23 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - blocktest "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + blocktest "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go index 59ed3945f32f..541aadebd469 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/config.go @@ -5,8 +5,8 @@ import ( "fmt" "reflect" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/config_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/config_test.go index 8a81f3b96ae5..ba5f5b4559ff 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/config_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/config_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/init_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/init_test.go index 774fa6d059f3..d1125a6fc2e7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/init_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/init_test.go @@ -1,7 +1,7 @@ package beacon import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func init() { diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go index 9c5522341bef..d09d74c3d220 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/server.go @@ -7,19 +7,19 @@ import ( "context" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Server defines a server implementation of the gRPC Beacon Chain service, diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go index b9d1d3372a42..f24cb58b6f0f 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings.go @@ -3,10 +3,10 @@ package beacon import ( "context" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go index 0e3ae1cbdd35..1e1857097233 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/slashings_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestServer_SubmitProposerSlashing(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go index eebc355c77a3..058010356aa8 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go @@ -6,21 +6,21 @@ import ( "sort" "strconv" - "github.com/prysmaticlabs/prysm/v3/api/pagination" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/pagination" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go index 6c7ef9e042f3..ac371c49c748 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream.go @@ -13,21 +13,21 @@ import ( "github.com/patrickmn/go-cache" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream_test.go index 614bffcd8019..6eda672f2897 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_stream_test.go @@ -4,12 +4,12 @@ import ( "sync" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestInfostream_EpochToTimestamp(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go index 4bd36876ddd1..0f4e40acf3bf 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go @@ -10,34 +10,34 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - blocktest "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/cmd" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + blocktest "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel index 623c86539d26..3ea4d36b2f8d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "server.go", "state.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/debug", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/debug", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/block.go b/beacon-chain/rpc/prysm/v1alpha1/debug/block.go index 28468c41142b..3253c02ae3a8 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/block.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/block.go @@ -5,14 +5,14 @@ import ( "fmt" "math" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go index 4f7b2ca971d5..8e0324445ccb 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go @@ -6,17 +6,17 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestServer_GetBlock(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go index b9deeb896289..1ac61df0d367 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p.go @@ -7,8 +7,8 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/protocol" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go index fc06d324aa52..ac96447f9e9d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/p2p_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/golang/protobuf/ptypes/empty" - mockP2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mockP2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDebugServer_GetPeer(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/server.go b/beacon-chain/rpc/prysm/v1alpha1/debug/server.go index a5c25c88d3ba..8fb7eef64f80 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/server.go @@ -10,11 +10,11 @@ import ( gethlog "github.com/ethereum/go-ethereum/log" "github.com/golang/protobuf/ptypes/empty" golog "github.com/ipfs/go-log/v2" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/state.go b/beacon-chain/rpc/prysm/v1alpha1/debug/state.go index b40c280f7ef5..76f9ee9eaa9b 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/state.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/state.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go index 4facf516e3c7..44b67e64adde 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/state_test.go @@ -5,16 +5,16 @@ import ( "math" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pbrpc "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pbrpc "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func addDefaultReplayerBuilder(s *Server, h stategen.HistoryAccessor) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel index ad17c831f5c8..64e7d6a4756d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/node/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["server.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/node", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/node", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server.go b/beacon-chain/rpc/prysm/v1alpha1/node/server.go index 2055d53755ac..eff0ff796cf9 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/node/server.go @@ -13,14 +13,14 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/io/logs" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/io/logs" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go index dfb55f1ac1b5..76d27b63178b 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/node/server_test.go @@ -9,18 +9,18 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p/enode" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - mockP2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + mockP2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc" "google.golang.org/grpc/reflection" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/slasher/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/slasher/BUILD.bazel index c61bcdf14106..735d896ad3c4 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/slasher/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/slasher/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "blocks.go", "server.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/slasher", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/slasher", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/slasher:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations.go b/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations.go index 1a64c850bfc2..a6f54764fe1c 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations.go @@ -3,8 +3,8 @@ package slasher import ( "context" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations_test.go b/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations_test.go index dc22f4c1eecd..1722e68ebd06 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/slasher/attestations_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/mock" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/mock" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestServer_HighestAttestations(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/slasher/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/slasher/blocks.go index 30defff27b95..f002c5fd572d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/slasher/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/slasher/blocks.go @@ -3,7 +3,7 @@ package slasher import ( "context" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/slasher/server.go b/beacon-chain/rpc/prysm/v1alpha1/slasher/server.go index 0d8e4ee3b12c..2c8bf6ca0379 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/slasher/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/slasher/server.go @@ -3,7 +3,7 @@ package slasher import ( - slasherservice "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher" + slasherservice "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher" ) // Server defines a server implementation of the gRPC slasher service. diff --git a/beacon-chain/rpc/prysm/v1alpha1/slasher/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/slasher/server_test.go index d593719df230..c351a4e26477 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/slasher/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/slasher/server_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/mock" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/mock" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestServer_IsSlashableAttestation_SlashingFound(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index 244f1e2e2273..2038803ccb7a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "status.go", "sync_committee.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//api/client/builder:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go index 503ff705d9aa..cd99da418828 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator.go @@ -4,12 +4,12 @@ import ( "bytes" "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go index cc864e1d8fea..d79e4ff83df7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go @@ -7,24 +7,24 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSubmitAggregateAndProof_Syncing(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go index 2f88397d0eb6..1e41e8c8a914 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go @@ -5,21 +5,21 @@ import ( "context" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - beaconState "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + beaconState "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go index e2e8a01a5524..06db32adc792 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go @@ -7,27 +7,27 @@ import ( "time" "github.com/golang/mock/gomock" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // pubKey is a helper to generate a well-formed public key. diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go index 27807fa8e5b1..01540027a13a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go @@ -5,18 +5,18 @@ import ( "errors" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_mainnet_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_mainnet_test.go index 5c417fde3624..7be9f6fbea97 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_mainnet_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_mainnet_test.go @@ -5,16 +5,16 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go index d80a7e8219a1..49fc66d0b210 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go @@ -7,24 +7,24 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go index 0ebc8d2f7032..f20407632f53 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/blocks.go @@ -2,13 +2,13 @@ package validator import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/blocks_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/blocks_test.go index b7d3338aeb9d..c69b9c347f52 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/blocks_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/blocks_test.go @@ -5,19 +5,19 @@ import ( "testing" "github.com/golang/mock/gomock" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestServer_StreamAltairBlocksVerified_ContextCanceled(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go b/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go index b97081a3b2fe..1e2b224e127b 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/exit.go @@ -3,11 +3,11 @@ package validator import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go index 693ab638fd98..52fabccd70ba 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go @@ -5,22 +5,22 @@ import ( "testing" "time" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProposeExit_Notification(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go index f23d44d3cb81..2d08b9e998a3 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go @@ -11,20 +11,20 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go index 51bd1d00fb6b..e1c19feea4db 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go @@ -4,14 +4,14 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - synccontribution "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + synccontribution "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go index e5fd7a0b8b83..4627d1670b8d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestServer_SetSyncAggregate_EmptyCase(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go index 8d4cf46d1ba9..2677b54041e2 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go @@ -6,16 +6,16 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go index 04b2902e0b34..dcebb56d9031 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestProposer_ProposerAtts_sortByProfitability(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go index b0cd06b2590f..9ac94c117dd2 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go @@ -9,20 +9,20 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/api/client/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/client/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go index 45981ba400ec..ee99ee88adec 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go @@ -8,27 +8,27 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/client/builder" - blockchainTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - builderTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - powtesting "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/api/client/builder" + blockchainTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + builderTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + powtesting "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestServer_setExecutionData(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder.go index d3348a84dc49..2a472958448d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder_test.go index 23919ff30419..4295ea651f5a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_builder_test.go @@ -5,18 +5,18 @@ import ( "testing" "time" - blockchainTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + blockchainTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella.go index 139a4d84b3af..47a1386f5868 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go index 7ef7db81d975..70e48c3fb999 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_capella_test.go @@ -5,14 +5,14 @@ import ( "testing" "github.com/pkg/errors" - builderTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + builderTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestServer_unblindBuilderCapellaBlock(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_deposits.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_deposits.go index 08c8100cb110..9dad9c9bae86 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_deposits.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_deposits.go @@ -6,10 +6,10 @@ import ( "math/big" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "go.opencensus.io/trace" "golang.org/x/sync/errgroup" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block.go index 1629302317a3..8ea22601459f 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block.go @@ -1,12 +1,12 @@ package validator import ( - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block_test.go index ead7dcd47590..f2e1eb7502f0 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_empty_block_test.go @@ -3,12 +3,12 @@ package validator import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_getEmptyBlock(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go index a4a2d2ab84ad..cc5b8efc291d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go @@ -6,16 +6,16 @@ import ( "github.com/pkg/errors" fastssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // eth1DataMajorityVote determines the appropriate eth1data for a block proposal using diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go index 05c00b8eb7e6..ed9851280891 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go @@ -9,21 +9,21 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - payloadattribute "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + payloadattribute "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go index 622d23bf39e4..001d203f4d40 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go @@ -8,19 +8,19 @@ import ( "github.com/ethereum/go-ethereum/common" gethtypes "github.com/ethereum/go-ethereum/core/types" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - powtesting "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + powtesting "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits.go index e621e54d99cb..42874a6579a0 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits.go @@ -1,9 +1,9 @@ package validator import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (vs *Server) getExits(head state.BeaconState, slot primitives.Slot) []*ethpb.SignedVoluntaryExit { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits_test.go index bd5848a1c2fe..b41104116310 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_exits_test.go @@ -3,12 +3,12 @@ package validator import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestServer_getExits(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings.go index 474babf89140..58c2b8762982 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings.go @@ -3,10 +3,10 @@ package validator import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (vs *Server) getSlashings(ctx context.Context, head state.BeaconState) ([]*ethpb.ProposerSlashing, []*ethpb.AttesterSlashing) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings_test.go index c5c43486ad72..2e6d8a053876 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_slashings_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestServer_getSlashings(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate.go index 73fe3e44f20c..6b3f98376d73 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate.go @@ -3,7 +3,7 @@ package validator import ( "bytes" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type proposerSyncContributions []*eth.SyncCommitteeContribution diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate_test.go index 343e79667faa..25d646f534fc 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_sync_aggregate_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestProposerSyncContributions_FilterByBlockRoot(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go index 6f251fee2833..00d7fac6bd96 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go @@ -10,46 +10,46 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - builderTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - coretime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - dbutil "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - attaggregation "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + builderTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + coretime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + dbutil "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + attaggregation "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go index 7e88ca00cedd..d1955b85b856 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_utils_bench_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - aggtesting "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + aggtesting "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/testing" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func BenchmarkProposerAtts_sortByProfitability(b *testing.B) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server.go index 1477bbf680c4..ddcaa4eed9c4 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/server.go @@ -8,29 +8,29 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server_mainnet_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server_mainnet_test.go index cfda88fcc308..fdbfa6711a49 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/server_mainnet_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/server_mainnet_test.go @@ -5,20 +5,20 @@ import ( "testing" "github.com/golang/mock/gomock" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestWaitForActivation_ValidatorOriginallyExists(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go index 3359032ec77a..1c3f802a277a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go @@ -7,21 +7,21 @@ import ( "time" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/async/event" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async/event" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status.go index ae7a5e003929..26868c2cb5fa 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status.go @@ -4,19 +4,19 @@ import ( "context" "errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status_mainnet_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status_mainnet_test.go index 6941e8386df0..107053c5ba86 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status_mainnet_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status_mainnet_test.go @@ -6,18 +6,18 @@ import ( "testing" "time" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go index a8aa443b0559..dbdd69e4ecc4 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go @@ -7,24 +7,24 @@ import ( "time" "github.com/d4l3k/messagediff" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go index 7250e295ea7b..45d5d5a60062 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go @@ -5,13 +5,13 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go index a7964e6bd8b8..61f342fb108f 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go @@ -5,20 +5,20 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/validator_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/validator_test.go index d714ae52d2fc..dfd0b05bf069 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/validator_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/validator_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/service.go b/beacon-chain/rpc/service.go index 07a45b780af9..41b953e57307 100644 --- a/beacon-chain/rpc/service.go +++ b/beacon-chain/rpc/service.go @@ -13,40 +13,40 @@ import ( grpcopentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/beacon" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/debug" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/events" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/node" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/validator" - beaconv1alpha1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/beacon" - debugv1alpha1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/debug" - nodev1alpha1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/node" - validatorv1alpha1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/prysm/v1alpha1/validator" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher" - slasherservice "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - chainSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - ethpbv1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/beacon" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/debug" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/events" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/node" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/validator" + beaconv1alpha1 "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/beacon" + debugv1alpha1 "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/debug" + nodev1alpha1 "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/node" + validatorv1alpha1 "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/prysm/v1alpha1/validator" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher" + slasherservice "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + chainSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + ethpbv1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "go.opencensus.io/plugin/ocgrpc" "google.golang.org/grpc" diff --git a/beacon-chain/rpc/service_test.go b/beacon-chain/rpc/service_test.go index f2cfe1dfc128..39fa40207240 100644 --- a/beacon-chain/rpc/service_test.go +++ b/beacon-chain/rpc/service_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/rpc/statefetcher/BUILD.bazel b/beacon-chain/rpc/statefetcher/BUILD.bazel index 03f90b1ef6fd..84490038468e 100644 --- a/beacon-chain/rpc/statefetcher/BUILD.bazel +++ b/beacon-chain/rpc/statefetcher/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["fetcher.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/statefetcher", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/statefetcher", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/rpc/statefetcher/fetcher.go b/beacon-chain/rpc/statefetcher/fetcher.go index 6d730d93b3a0..0a4019dee3bf 100644 --- a/beacon-chain/rpc/statefetcher/fetcher.go +++ b/beacon-chain/rpc/statefetcher/fetcher.go @@ -8,15 +8,15 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/rpc/statefetcher/fetcher_test.go b/beacon-chain/rpc/statefetcher/fetcher_test.go index 77d321ded1c8..93eeca3ddc06 100644 --- a/beacon-chain/rpc/statefetcher/fetcher_test.go +++ b/beacon-chain/rpc/statefetcher/fetcher_test.go @@ -7,21 +7,21 @@ import ( "testing" "time" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" "github.com/ethereum/go-ethereum/common/hexutil" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestGetState(t *testing.T) { diff --git a/beacon-chain/rpc/testutil/BUILD.bazel b/beacon-chain/rpc/testutil/BUILD.bazel index 3210cc7fa0ff..b21ed3b928f1 100644 --- a/beacon-chain/rpc/testutil/BUILD.bazel +++ b/beacon-chain/rpc/testutil/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "mock_genesis_timefetcher.go", "mock_state_fetcher.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/testutil", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/testutil", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/rpc/testutil/mock_genesis_timefetcher.go b/beacon-chain/rpc/testutil/mock_genesis_timefetcher.go index 312a3dd4be49..7520b8da1ab3 100644 --- a/beacon-chain/rpc/testutil/mock_genesis_timefetcher.go +++ b/beacon-chain/rpc/testutil/mock_genesis_timefetcher.go @@ -3,8 +3,8 @@ package testutil import ( "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // MockGenesisTimeFetcher is a fake implementation of the blockchain.TimeFetcher diff --git a/beacon-chain/rpc/testutil/mock_state_fetcher.go b/beacon-chain/rpc/testutil/mock_state_fetcher.go index 644b0054c756..e0e59225cf7a 100644 --- a/beacon-chain/rpc/testutil/mock_state_fetcher.go +++ b/beacon-chain/rpc/testutil/mock_state_fetcher.go @@ -3,8 +3,8 @@ package testutil import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // MockFetcher is a fake implementation of statefetcher.Fetcher. diff --git a/beacon-chain/server/BUILD.bazel b/beacon-chain/server/BUILD.bazel index 7705b8972ba2..70fe1117cbb6 100644 --- a/beacon-chain/server/BUILD.bazel +++ b/beacon-chain/server/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "log.go", "main.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/server", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/server", visibility = ["//visibility:private"], deps = [ "//api/gateway:go_default_library", diff --git a/beacon-chain/server/main.go b/beacon-chain/server/main.go index ff3a4e967715..ff3c951d0a58 100644 --- a/beacon-chain/server/main.go +++ b/beacon-chain/server/main.go @@ -12,11 +12,11 @@ import ( "github.com/gorilla/mux" joonix "github.com/joonix/log" - "github.com/prysmaticlabs/prysm/v3/api/gateway" - beaconGateway "github.com/prysmaticlabs/prysm/v3/beacon-chain/gateway" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" + "github.com/prysmaticlabs/prysm/v4/api/gateway" + beaconGateway "github.com/prysmaticlabs/prysm/v4/beacon-chain/gateway" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/slasher/BUILD.bazel b/beacon-chain/slasher/BUILD.bazel index 0f34c0df49d8..900331f177e5 100644 --- a/beacon-chain/slasher/BUILD.bazel +++ b/beacon-chain/slasher/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "rpc.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher", visibility = [ "//beacon-chain:__subpackages__", "//testing/slasher/simulator:__subpackages__", diff --git a/beacon-chain/slasher/chunks.go b/beacon-chain/slasher/chunks.go index f4e161edff31..5e3d81d1dae7 100644 --- a/beacon-chain/slasher/chunks.go +++ b/beacon-chain/slasher/chunks.go @@ -6,10 +6,10 @@ import ( "math" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // A struct encapsulating input arguments to diff --git a/beacon-chain/slasher/chunks_test.go b/beacon-chain/slasher/chunks_test.go index 214d35db681e..9963edb94704 100644 --- a/beacon-chain/slasher/chunks_test.go +++ b/beacon-chain/slasher/chunks_test.go @@ -5,12 +5,12 @@ import ( "math" "testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) var ( diff --git a/beacon-chain/slasher/detect_attestations.go b/beacon-chain/slasher/detect_attestations.go index dc7a9956cf17..d00e465b6c8a 100644 --- a/beacon-chain/slasher/detect_attestations.go +++ b/beacon-chain/slasher/detect_attestations.go @@ -6,9 +6,9 @@ import ( "time" "github.com/pkg/errors" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/slasher/detect_attestations_test.go b/beacon-chain/slasher/detect_attestations_test.go index e35318912b66..3c7b165f4424 100644 --- a/beacon-chain/slasher/detect_attestations_test.go +++ b/beacon-chain/slasher/detect_attestations_test.go @@ -6,20 +6,20 @@ import ( "testing" "time" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - slashingsmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + slashingsmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/slasher/detect_blocks.go b/beacon-chain/slasher/detect_blocks.go index 584b7218ad4e..da6d6283d3f2 100644 --- a/beacon-chain/slasher/detect_blocks.go +++ b/beacon-chain/slasher/detect_blocks.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/slasher/detect_blocks_test.go b/beacon-chain/slasher/detect_blocks_test.go index 2ef9f59b1bfb..3fdb52b4e972 100644 --- a/beacon-chain/slasher/detect_blocks_test.go +++ b/beacon-chain/slasher/detect_blocks_test.go @@ -4,20 +4,20 @@ import ( "context" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - slashingsmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + slashingsmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/slasher/helpers.go b/beacon-chain/slasher/helpers.go index afd2d8eb82d6..6ee6bcb94112 100644 --- a/beacon-chain/slasher/helpers.go +++ b/beacon-chain/slasher/helpers.go @@ -4,12 +4,12 @@ import ( "bytes" "strconv" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/slasher/helpers_test.go b/beacon-chain/slasher/helpers_test.go index 4481c5ba4d75..97e26b084d04 100644 --- a/beacon-chain/slasher/helpers_test.go +++ b/beacon-chain/slasher/helpers_test.go @@ -4,12 +4,12 @@ import ( "reflect" "testing" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/slasher/mock/BUILD.bazel b/beacon-chain/slasher/mock/BUILD.bazel index b2feb93f5641..2f3d7a193b10 100644 --- a/beacon-chain/slasher/mock/BUILD.bazel +++ b/beacon-chain/slasher/mock/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["mock_slashing_checker.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/mock", visibility = ["//visibility:public"], deps = [ "//config/params:go_default_library", diff --git a/beacon-chain/slasher/mock/mock_slashing_checker.go b/beacon-chain/slasher/mock/mock_slashing_checker.go index 991f47e4999f..061cd7c397e1 100644 --- a/beacon-chain/slasher/mock/mock_slashing_checker.go +++ b/beacon-chain/slasher/mock/mock_slashing_checker.go @@ -3,9 +3,9 @@ package mock import ( "context" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type MockSlashingChecker struct { diff --git a/beacon-chain/slasher/params.go b/beacon-chain/slasher/params.go index c5ce489218d0..3b5fe12ec324 100644 --- a/beacon-chain/slasher/params.go +++ b/beacon-chain/slasher/params.go @@ -2,7 +2,7 @@ package slasher import ( ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // Parameters for slashing detection. diff --git a/beacon-chain/slasher/params_test.go b/beacon-chain/slasher/params_test.go index 99c6b4e1238a..56232c2652a2 100644 --- a/beacon-chain/slasher/params_test.go +++ b/beacon-chain/slasher/params_test.go @@ -5,8 +5,8 @@ import ( "testing" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestDefaultParams(t *testing.T) { diff --git a/beacon-chain/slasher/process_slashings.go b/beacon-chain/slasher/process_slashings.go index 380f91a8fdbf..9e7f02fb168a 100644 --- a/beacon-chain/slasher/process_slashings.go +++ b/beacon-chain/slasher/process_slashings.go @@ -3,10 +3,10 @@ package slasher import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Verifies attester slashings, logs them, and submits them to the slashing operations pool diff --git a/beacon-chain/slasher/process_slashings_test.go b/beacon-chain/slasher/process_slashings_test.go index bc1d23437e4e..5afda6f1df98 100644 --- a/beacon-chain/slasher/process_slashings_test.go +++ b/beacon-chain/slasher/process_slashings_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - slashingsmock "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + slashingsmock "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/slasher/queue.go b/beacon-chain/slasher/queue.go index b6ec95500d2e..bac0f2760325 100644 --- a/beacon-chain/slasher/queue.go +++ b/beacon-chain/slasher/queue.go @@ -3,7 +3,7 @@ package slasher import ( "sync" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" ) // Struct for handling a thread-safe list of indexed attestation wrappers. diff --git a/beacon-chain/slasher/queue_test.go b/beacon-chain/slasher/queue_test.go index 8f40a8e2a46d..98b9b4eb2f11 100644 --- a/beacon-chain/slasher/queue_test.go +++ b/beacon-chain/slasher/queue_test.go @@ -3,9 +3,9 @@ package slasher import ( "testing" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_attestationsQueue(t *testing.T) { diff --git a/beacon-chain/slasher/receive.go b/beacon-chain/slasher/receive.go index 5e4e0c1449a7..228354e3a688 100644 --- a/beacon-chain/slasher/receive.go +++ b/beacon-chain/slasher/receive.go @@ -5,10 +5,10 @@ import ( "time" "github.com/pkg/errors" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/slasher/receive_test.go b/beacon-chain/slasher/receive_test.go index a18e4d63676f..e7c498d9985a 100644 --- a/beacon-chain/slasher/receive_test.go +++ b/beacon-chain/slasher/receive_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/async/event" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - params2 "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async/event" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + params2 "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/slasher/rpc.go b/beacon-chain/slasher/rpc.go index 933979f5340a..12620efc4af9 100644 --- a/beacon-chain/slasher/rpc.go +++ b/beacon-chain/slasher/rpc.go @@ -4,10 +4,10 @@ import ( "context" "github.com/pkg/errors" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/slasher/rpc_test.go b/beacon-chain/slasher/rpc_test.go index 5460ec3fbe4c..922a17ce895f 100644 --- a/beacon-chain/slasher/rpc_test.go +++ b/beacon-chain/slasher/rpc_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - slashertypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + slashertypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestIsSlashableBlock(t *testing.T) { diff --git a/beacon-chain/slasher/service.go b/beacon-chain/slasher/service.go index fe0986658faf..b50823fdcbd3 100644 --- a/beacon-chain/slasher/service.go +++ b/beacon-chain/slasher/service.go @@ -8,18 +8,18 @@ import ( "context" "time" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) const ( diff --git a/beacon-chain/slasher/service_test.go b/beacon-chain/slasher/service_test.go index d53bd34471aa..5ceb0ec29c90 100644 --- a/beacon-chain/slasher/service_test.go +++ b/beacon-chain/slasher/service_test.go @@ -6,17 +6,17 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/async/event" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockslasher "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/mock" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockslasher "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/mock" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/slasher/types/BUILD.bazel b/beacon-chain/slasher/types/BUILD.bazel index 95279ef442be..08670ffc3fd5 100644 --- a/beacon-chain/slasher/types/BUILD.bazel +++ b/beacon-chain/slasher/types/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["types.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher/types", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher/types", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/beacon-chain/slasher/types/types.go b/beacon-chain/slasher/types/types.go index 20dd25c2b67c..a622676eb6f4 100644 --- a/beacon-chain/slasher/types/types.go +++ b/beacon-chain/slasher/types/types.go @@ -1,8 +1,8 @@ package types import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ChunkKind to differentiate what kind of span we are working diff --git a/beacon-chain/state/BUILD.bazel b/beacon-chain/state/BUILD.bazel index 298a1adbb7f9..c5fce6c3cadd 100644 --- a/beacon-chain/state/BUILD.bazel +++ b/beacon-chain/state/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "interfaces.go", "prometheus.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/beacon-chain/state/fieldtrie/BUILD.bazel b/beacon-chain/state/fieldtrie/BUILD.bazel index 842cedb48e4c..cf26f510f2fb 100644 --- a/beacon-chain/state/fieldtrie/BUILD.bazel +++ b/beacon-chain/state/fieldtrie/BUILD.bazel @@ -6,12 +6,13 @@ go_library( "field_trie.go", "field_trie_helpers.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/fieldtrie", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/fieldtrie", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/state/state-native/custom-types:go_default_library", "//beacon-chain/state/state-native/types:go_default_library", "//beacon-chain/state/stateutil:go_default_library", + "//crypto/hash:go_default_library", "//encoding/bytesutil:go_default_library", "//math:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/beacon-chain/state/fieldtrie/field_trie.go b/beacon-chain/state/fieldtrie/field_trie.go index ea6dadadf275..05f1b74157ea 100644 --- a/beacon-chain/state/fieldtrie/field_trie.go +++ b/beacon-chain/state/fieldtrie/field_trie.go @@ -5,9 +5,9 @@ import ( "sync" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - pmath "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + pmath "github.com/prysmaticlabs/prysm/v4/math" ) var ( diff --git a/beacon-chain/state/fieldtrie/field_trie_helpers.go b/beacon-chain/state/fieldtrie/field_trie_helpers.go index d13cb537aec2..a38c0c17015d 100644 --- a/beacon-chain/state/fieldtrie/field_trie_helpers.go +++ b/beacon-chain/state/fieldtrie/field_trie_helpers.go @@ -6,13 +6,14 @@ import ( "reflect" "github.com/pkg/errors" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pmath "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pmath "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // ProofFromMerkleLayers creates a proof starting at the leaf index of the state Merkle layers. @@ -249,8 +250,9 @@ func handleEth1DataSlice(val []*ethpb.Eth1Data, indices []uint64, convertAll boo length = len(val) } roots := make([][32]byte, 0, length) + hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.Eth1Data) error { - newRoot, err := stateutil.Eth1DataRootWithHasher(input) + newRoot, err := stateutil.Eth1DataRootWithHasher(hasher, input) if err != nil { return err } diff --git a/beacon-chain/state/fieldtrie/field_trie_test.go b/beacon-chain/state/fieldtrie/field_trie_test.go index 39ad973acfdb..7887984ad161 100644 --- a/beacon-chain/state/fieldtrie/field_trie_test.go +++ b/beacon-chain/state/fieldtrie/field_trie_test.go @@ -3,15 +3,15 @@ package fieldtrie_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/fieldtrie" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/fieldtrie" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestFieldTrie_NewTrie(t *testing.T) { diff --git a/beacon-chain/state/fieldtrie/helpers_test.go b/beacon-chain/state/fieldtrie/helpers_test.go index 0044e586f7e1..4b232865a426 100644 --- a/beacon-chain/state/fieldtrie/helpers_test.go +++ b/beacon-chain/state/fieldtrie/helpers_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_handlePendingAttestation_OutOfRange(t *testing.T) { diff --git a/beacon-chain/state/genesis/BUILD.bazel b/beacon-chain/state/genesis/BUILD.bazel index 9679ecb43abb..1301e2a1f51d 100644 --- a/beacon-chain/state/genesis/BUILD.bazel +++ b/beacon-chain/state/genesis/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", srcs = ["genesis.go"], embedsrcs = ["mainnet.ssz.snappy"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/genesis", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/genesis", visibility = ["//beacon-chain/db:__subpackages__"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/state/genesis/genesis.go b/beacon-chain/state/genesis/genesis.go index ff64e5f340ce..34353dc9ebb8 100644 --- a/beacon-chain/state/genesis/genesis.go +++ b/beacon-chain/state/genesis/genesis.go @@ -4,10 +4,10 @@ import ( _ "embed" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var ( diff --git a/beacon-chain/state/genesis/genesis_test.go b/beacon-chain/state/genesis/genesis_test.go index b34d2b89b068..5377ac84e902 100644 --- a/beacon-chain/state/genesis/genesis_test.go +++ b/beacon-chain/state/genesis/genesis_test.go @@ -3,8 +3,8 @@ package genesis_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/genesis" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/genesis" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func TestGenesisState(t *testing.T) { diff --git a/beacon-chain/state/interfaces.go b/beacon-chain/state/interfaces.go index 0bcd6f072af2..f866ce7df7ec 100644 --- a/beacon-chain/state/interfaces.go +++ b/beacon-chain/state/interfaces.go @@ -7,11 +7,11 @@ import ( "context" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // BeaconState has read and write access to beacon state methods. diff --git a/beacon-chain/state/state-native/BUILD.bazel b/beacon-chain/state/state-native/BUILD.bazel index daf72b134ae7..dde4bfe0e892 100644 --- a/beacon-chain/state/state-native/BUILD.bazel +++ b/beacon-chain/state/state-native/BUILD.bazel @@ -40,7 +40,7 @@ go_library( "//config:mainnet": ["beacon_state_mainnet.go"], "//config:minimal": ["beacon_state_minimal.go"], }), - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/time:go_default_library", diff --git a/beacon-chain/state/state-native/beacon_state_mainnet.go b/beacon-chain/state/state-native/beacon_state_mainnet.go index c27131484d9b..5b2371948d27 100644 --- a/beacon-chain/state/state-native/beacon_state_mainnet.go +++ b/beacon-chain/state/state-native/beacon_state_mainnet.go @@ -6,13 +6,13 @@ import ( "sync" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/fieldtrie" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/fieldtrie" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // BeaconState defines a struct containing utilities for the Ethereum Beacon Chain state, defining diff --git a/beacon-chain/state/state-native/beacon_state_minimal.go b/beacon-chain/state/state-native/beacon_state_minimal.go index 045305961ef3..b5ac9331b1c9 100644 --- a/beacon-chain/state/state-native/beacon_state_minimal.go +++ b/beacon-chain/state/state-native/beacon_state_minimal.go @@ -6,13 +6,13 @@ import ( "sync" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/fieldtrie" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/fieldtrie" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // BeaconState defines a struct containing utilities for the Ethereum Beacon Chain state, defining diff --git a/beacon-chain/state/state-native/custom-types/BUILD.bazel b/beacon-chain/state/state-native/custom-types/BUILD.bazel index c2fdb8ed9306..e19223c0b0e4 100644 --- a/beacon-chain/state/state-native/custom-types/BUILD.bazel +++ b/beacon-chain/state/state-native/custom-types/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "randao_mixes.go", "state_roots.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/beacon-chain/state/state-native/custom-types/block_roots.go b/beacon-chain/state/state-native/custom-types/block_roots.go index 74b2fda3ecd8..34d81d78aec7 100644 --- a/beacon-chain/state/state-native/custom-types/block_roots.go +++ b/beacon-chain/state/state-native/custom-types/block_roots.go @@ -4,7 +4,7 @@ import ( "fmt" fssz "github.com/prysmaticlabs/fastssz" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" ) var _ fssz.HashRoot = (BlockRoots)([fieldparams.BlockRootsLength][32]byte{}) diff --git a/beacon-chain/state/state-native/custom-types/block_roots_test.go b/beacon-chain/state/state-native/custom-types/block_roots_test.go index a37b08b9f704..9320f14aca1e 100644 --- a/beacon-chain/state/state-native/custom-types/block_roots_test.go +++ b/beacon-chain/state/state-native/custom-types/block_roots_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestBlockRoots_Casting(t *testing.T) { diff --git a/beacon-chain/state/state-native/custom-types/historical_roots_test.go b/beacon-chain/state/state-native/custom-types/historical_roots_test.go index 5443ec0aac03..5dd131aab4ea 100644 --- a/beacon-chain/state/state-native/custom-types/historical_roots_test.go +++ b/beacon-chain/state/state-native/custom-types/historical_roots_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestHistoricalRoots_Casting(t *testing.T) { diff --git a/beacon-chain/state/state-native/custom-types/randao_mixes.go b/beacon-chain/state/state-native/custom-types/randao_mixes.go index 43dd7dfeed04..324b0839299c 100644 --- a/beacon-chain/state/state-native/custom-types/randao_mixes.go +++ b/beacon-chain/state/state-native/custom-types/randao_mixes.go @@ -4,7 +4,7 @@ import ( "fmt" fssz "github.com/prysmaticlabs/fastssz" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" ) var _ fssz.HashRoot = (RandaoMixes)([fieldparams.RandaoMixesLength][32]byte{}) diff --git a/beacon-chain/state/state-native/custom-types/randao_mixes_test.go b/beacon-chain/state/state-native/custom-types/randao_mixes_test.go index b162145d8a67..73732e3f936a 100644 --- a/beacon-chain/state/state-native/custom-types/randao_mixes_test.go +++ b/beacon-chain/state/state-native/custom-types/randao_mixes_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestRandaoMixes_Casting(t *testing.T) { diff --git a/beacon-chain/state/state-native/custom-types/state_roots.go b/beacon-chain/state/state-native/custom-types/state_roots.go index deb053549949..134b271f6c3e 100644 --- a/beacon-chain/state/state-native/custom-types/state_roots.go +++ b/beacon-chain/state/state-native/custom-types/state_roots.go @@ -4,7 +4,7 @@ import ( "fmt" fssz "github.com/prysmaticlabs/fastssz" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" ) var _ fssz.HashRoot = (StateRoots)([fieldparams.StateRootsLength][32]byte{}) diff --git a/beacon-chain/state/state-native/custom-types/state_roots_test.go b/beacon-chain/state/state-native/custom-types/state_roots_test.go index 05a5192d6ff4..51d7f582c7bd 100644 --- a/beacon-chain/state/state-native/custom-types/state_roots_test.go +++ b/beacon-chain/state/state-native/custom-types/state_roots_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestStateRoots_Casting(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_attestation.go b/beacon-chain/state/state-native/getters_attestation.go index 16af607564e8..55fcb0dd2258 100644 --- a/beacon-chain/state/state-native/getters_attestation.go +++ b/beacon-chain/state/state-native/getters_attestation.go @@ -1,8 +1,8 @@ package state_native import ( - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // PreviousEpochAttestations corresponding to blocks on the beacon chain. diff --git a/beacon-chain/state/state-native/getters_attestation_test.go b/beacon-chain/state/state-native/getters_attestation_test.go index ff1e56db4927..a0c12e1ad606 100644 --- a/beacon-chain/state/state-native/getters_attestation_test.go +++ b/beacon-chain/state/state-native/getters_attestation_test.go @@ -3,8 +3,8 @@ package state_native import ( "testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBeaconState_PreviousEpochAttestations(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_block.go b/beacon-chain/state/state-native/getters_block.go index efa8c2a79355..5d1c6388c175 100644 --- a/beacon-chain/state/state-native/getters_block.go +++ b/beacon-chain/state/state-native/getters_block.go @@ -3,7 +3,7 @@ package state_native import ( "fmt" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // LatestBlockHeader stored within the beacon state. diff --git a/beacon-chain/state/state-native/getters_block_test.go b/beacon-chain/state/state-native/getters_block_test.go index 8b33b0d208ee..4a20e4848a21 100644 --- a/beacon-chain/state/state-native/getters_block_test.go +++ b/beacon-chain/state/state-native/getters_block_test.go @@ -3,9 +3,9 @@ package state_native import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - testtmpl "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + testtmpl "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func TestBeaconState_LatestBlockHeader_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_checkpoint.go b/beacon-chain/state/state-native/getters_checkpoint.go index d84a462d50e1..1807ee76b3c0 100644 --- a/beacon-chain/state/state-native/getters_checkpoint.go +++ b/beacon-chain/state/state-native/getters_checkpoint.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // JustificationBits marking which epochs have been justified in the beacon chain. diff --git a/beacon-chain/state/state-native/getters_checkpoint_test.go b/beacon-chain/state/state-native/getters_checkpoint_test.go index 542c45d79c2a..f835ec0cfac8 100644 --- a/beacon-chain/state/state-native/getters_checkpoint_test.go +++ b/beacon-chain/state/state-native/getters_checkpoint_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - testtmpl "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + testtmpl "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func TestBeaconState_PreviousJustifiedCheckpointNil_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_eth1.go b/beacon-chain/state/state-native/getters_eth1.go index 41f73279f4d5..ba14971db65d 100644 --- a/beacon-chain/state/state-native/getters_eth1.go +++ b/beacon-chain/state/state-native/getters_eth1.go @@ -1,7 +1,7 @@ package state_native import ( - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Eth1Data corresponding to the proof-of-work chain information stored in the beacon state. diff --git a/beacon-chain/state/state-native/getters_misc.go b/beacon-chain/state/state-native/getters_misc.go index 49901fc2c7bf..5ae1d68b61d1 100644 --- a/beacon-chain/state/state-native/getters_misc.go +++ b/beacon-chain/state/state-native/getters_misc.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // GenesisTime of the beacon state as a uint64. diff --git a/beacon-chain/state/state-native/getters_participation.go b/beacon-chain/state/state-native/getters_participation.go index ff0c3b536d06..bb7742a22e66 100644 --- a/beacon-chain/state/state-native/getters_participation.go +++ b/beacon-chain/state/state-native/getters_participation.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // CurrentEpochParticipation corresponding to participation bits on the beacon chain. diff --git a/beacon-chain/state/state-native/getters_participation_test.go b/beacon-chain/state/state-native/getters_participation_test.go index fb413ffba59f..732b4ccb659c 100644 --- a/beacon-chain/state/state-native/getters_participation_test.go +++ b/beacon-chain/state/state-native/getters_participation_test.go @@ -3,9 +3,9 @@ package state_native import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestState_UnrealizedCheckpointBalances(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_payload_header.go b/beacon-chain/state/state-native/getters_payload_header.go index 2a19b8bc9e93..4ce86a42ce7b 100644 --- a/beacon-chain/state/state-native/getters_payload_header.go +++ b/beacon-chain/state/state-native/getters_payload_header.go @@ -3,11 +3,11 @@ package state_native import ( "math/big" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // LatestExecutionPayloadHeader of the beacon state. diff --git a/beacon-chain/state/state-native/getters_state.go b/beacon-chain/state/state-native/getters_state.go index 9aa0adf5ff2f..63b5c0dc8931 100644 --- a/beacon-chain/state/state-native/getters_state.go +++ b/beacon-chain/state/state-native/getters_state.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // ToProtoUnsafe returns the pointer value of the underlying diff --git a/beacon-chain/state/state-native/getters_sync_committee.go b/beacon-chain/state/state-native/getters_sync_committee.go index 28e1f87d9730..f828323ebe35 100644 --- a/beacon-chain/state/state-native/getters_sync_committee.go +++ b/beacon-chain/state/state-native/getters_sync_committee.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // CurrentSyncCommittee of the current sync committee in beacon chain state. diff --git a/beacon-chain/state/state-native/getters_test.go b/beacon-chain/state/state-native/getters_test.go index 41ecd9edd80f..600606cb24f3 100644 --- a/beacon-chain/state/state-native/getters_test.go +++ b/beacon-chain/state/state-native/getters_test.go @@ -3,9 +3,9 @@ package state_native import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - testtmpl "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + testtmpl "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func TestBeaconState_SlotDataRace_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_validator.go b/beacon-chain/state/state-native/getters_validator.go index bf65a62ad53d..9e777b0bb572 100644 --- a/beacon-chain/state/state-native/getters_validator.go +++ b/beacon-chain/state/state-native/getters_validator.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // ValidatorIndexOutOfRangeError represents an error scenario where a validator does not exist diff --git a/beacon-chain/state/state-native/getters_validator_test.go b/beacon-chain/state/state-native/getters_validator_test.go index def7362affba..4d09835e69a8 100644 --- a/beacon-chain/state/state-native/getters_validator_test.go +++ b/beacon-chain/state/state-native/getters_validator_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - testtmpl "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + testtmpl "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestBeaconState_ValidatorAtIndexReadOnly_HandlesNilSlice_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/getters_withdrawal.go b/beacon-chain/state/state-native/getters_withdrawal.go index c072ebb194d0..5bbed241973d 100644 --- a/beacon-chain/state/state-native/getters_withdrawal.go +++ b/beacon-chain/state/state-native/getters_withdrawal.go @@ -1,14 +1,14 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) const ETH1AddressOffset = 12 diff --git a/beacon-chain/state/state-native/getters_withdrawal_test.go b/beacon-chain/state/state-native/getters_withdrawal_test.go index 510872ac3783..47d7eb560d5d 100644 --- a/beacon-chain/state/state-native/getters_withdrawal_test.go +++ b/beacon-chain/state/state-native/getters_withdrawal_test.go @@ -3,13 +3,13 @@ package state_native import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestNextWithdrawalIndex(t *testing.T) { diff --git a/beacon-chain/state/state-native/hasher.go b/beacon-chain/state/state-native/hasher.go index 5e155257b3b5..53533349ad1e 100644 --- a/beacon-chain/state/state-native/hasher.go +++ b/beacon-chain/state/state-native/hasher.go @@ -5,13 +5,14 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" ) @@ -23,6 +24,7 @@ func ComputeFieldRootsWithHasher(ctx context.Context, state *BeaconState) ([][]b if state == nil { return nil, errors.New("nil state") } + hasher := hash.CustomSHA256Hasher() var fieldRoots [][]byte switch state.version { case version.Phase0: @@ -96,7 +98,7 @@ func ComputeFieldRootsWithHasher(ctx context.Context, state *BeaconState) ([][]b fieldRoots[types.HistoricalRoots.RealPosition()] = historicalRootsRt[:] // Eth1Data data structure root. - eth1HashTreeRoot, err := stateutil.Eth1Root(state.eth1Data) + eth1HashTreeRoot, err := stateutil.Eth1Root(hasher, state.eth1Data) if err != nil { return nil, errors.Wrap(err, "could not compute eth1data merkleization") } diff --git a/beacon-chain/state/state-native/hasher_test.go b/beacon-chain/state/state-native/hasher_test.go index ecfecbfeb917..193615e6dfbb 100644 --- a/beacon-chain/state/state-native/hasher_test.go +++ b/beacon-chain/state/state-native/hasher_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestComputeFieldRootsWithHasher_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/proofs.go b/beacon-chain/state/state-native/proofs.go index d5e2a9546bf7..cbdcfcb8eef3 100644 --- a/beacon-chain/state/state-native/proofs.go +++ b/beacon-chain/state/state-native/proofs.go @@ -4,10 +4,10 @@ import ( "context" "encoding/binary" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/fieldtrie" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/fieldtrie" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) const ( diff --git a/beacon-chain/state/state-native/proofs_test.go b/beacon-chain/state/state-native/proofs_test.go index 3ebfb51af354..c1db2126c3b5 100644 --- a/beacon-chain/state/state-native/proofs_test.go +++ b/beacon-chain/state/state-native/proofs_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestBeaconStateMerkleProofs_phase0_notsupported(t *testing.T) { diff --git a/beacon-chain/state/state-native/readonly_validator.go b/beacon-chain/state/state-native/readonly_validator.go index 035fa735ff92..87e3952169cb 100644 --- a/beacon-chain/state/state-native/readonly_validator.go +++ b/beacon-chain/state/state-native/readonly_validator.go @@ -2,11 +2,11 @@ package state_native import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var ( diff --git a/beacon-chain/state/state-native/readonly_validator_test.go b/beacon-chain/state/state-native/readonly_validator_test.go index 77f44c8c2d44..a2629cca4218 100644 --- a/beacon-chain/state/state-native/readonly_validator_test.go +++ b/beacon-chain/state/state-native/readonly_validator_test.go @@ -3,13 +3,13 @@ package state_native_test import ( "testing" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestReadOnlyValidator_ReturnsErrorOnNil(t *testing.T) { diff --git a/beacon-chain/state/state-native/references_test.go b/beacon-chain/state/state-native/references_test.go index c5d797b3f202..5d90da6ba19b 100644 --- a/beacon-chain/state/state-native/references_test.go +++ b/beacon-chain/state/state-native/references_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStateReferenceSharing_Finalizer_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/setters_attestation.go b/beacon-chain/state/state-native/setters_attestation.go index 697b23a91302..fe6c994fa335 100644 --- a/beacon-chain/state/state-native/setters_attestation.go +++ b/beacon-chain/state/state-native/setters_attestation.go @@ -3,11 +3,11 @@ package state_native import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // RotateAttestations sets the previous epoch attestations to the current epoch attestations and diff --git a/beacon-chain/state/state-native/setters_attestation_test.go b/beacon-chain/state/state-native/setters_attestation_test.go index 7fa604211dc9..5422d30c8d8b 100644 --- a/beacon-chain/state/state-native/setters_attestation_test.go +++ b/beacon-chain/state/state-native/setters_attestation_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBeaconState_RotateAttestations(t *testing.T) { diff --git a/beacon-chain/state/state-native/setters_block.go b/beacon-chain/state/state-native/setters_block.go index b667eda49633..fca9a71732c5 100644 --- a/beacon-chain/state/state-native/setters_block.go +++ b/beacon-chain/state/state-native/setters_block.go @@ -3,11 +3,11 @@ package state_native import ( "fmt" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SetLatestBlockHeader in the beacon state. diff --git a/beacon-chain/state/state-native/setters_checkpoint.go b/beacon-chain/state/state-native/setters_checkpoint.go index 21a382f041f2..93ca65803663 100644 --- a/beacon-chain/state/state-native/setters_checkpoint.go +++ b/beacon-chain/state/state-native/setters_checkpoint.go @@ -2,8 +2,8 @@ package state_native import ( "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SetJustificationBits for the beacon state. diff --git a/beacon-chain/state/state-native/setters_eth1.go b/beacon-chain/state/state-native/setters_eth1.go index 4e19f9a32109..697a3af732b5 100644 --- a/beacon-chain/state/state-native/setters_eth1.go +++ b/beacon-chain/state/state-native/setters_eth1.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SetEth1Data for the beacon state. diff --git a/beacon-chain/state/state-native/setters_misc.go b/beacon-chain/state/state-native/setters_misc.go index 9e9c4c71d480..f64179f525b6 100644 --- a/beacon-chain/state/state-native/setters_misc.go +++ b/beacon-chain/state/state-native/setters_misc.go @@ -2,14 +2,14 @@ package state_native import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/state/state-native/setters_participation.go b/beacon-chain/state/state-native/setters_participation.go index 0cc2a44273e2..044329943f97 100644 --- a/beacon-chain/state/state-native/setters_participation.go +++ b/beacon-chain/state/state-native/setters_participation.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SetPreviousParticipationBits for the beacon state. Updates the entire diff --git a/beacon-chain/state/state-native/setters_payload_header.go b/beacon-chain/state/state-native/setters_payload_header.go index ccced2e7d44a..2c355c798862 100644 --- a/beacon-chain/state/state-native/setters_payload_header.go +++ b/beacon-chain/state/state-native/setters_payload_header.go @@ -2,12 +2,12 @@ package state_native import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SetLatestExecutionPayloadHeader for the beacon state. diff --git a/beacon-chain/state/state-native/setters_randao.go b/beacon-chain/state/state-native/setters_randao.go index 743d23fb0357..9f023d8f8c56 100644 --- a/beacon-chain/state/state-native/setters_randao.go +++ b/beacon-chain/state/state-native/setters_randao.go @@ -2,11 +2,11 @@ package state_native import ( "github.com/pkg/errors" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // SetRandaoMixes for the beacon state. Updates the entire diff --git a/beacon-chain/state/state-native/setters_state.go b/beacon-chain/state/state-native/setters_state.go index ff056f9293a8..7df12abdd7d6 100644 --- a/beacon-chain/state/state-native/setters_state.go +++ b/beacon-chain/state/state-native/setters_state.go @@ -2,10 +2,10 @@ package state_native import ( "github.com/pkg/errors" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" ) // SetStateRoots for the beacon state. Updates the state roots diff --git a/beacon-chain/state/state-native/setters_sync_committee.go b/beacon-chain/state/state-native/setters_sync_committee.go index 186513206242..83a54f1cb25b 100644 --- a/beacon-chain/state/state-native/setters_sync_committee.go +++ b/beacon-chain/state/state-native/setters_sync_committee.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SetCurrentSyncCommittee for the beacon state. diff --git a/beacon-chain/state/state-native/setters_validator.go b/beacon-chain/state/state-native/setters_validator.go index 8f4a6beb526e..efd144406399 100644 --- a/beacon-chain/state/state-native/setters_validator.go +++ b/beacon-chain/state/state-native/setters_validator.go @@ -2,12 +2,12 @@ package state_native import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SetValidators for the beacon state. Updates the entire diff --git a/beacon-chain/state/state-native/setters_withdrawal.go b/beacon-chain/state/state-native/setters_withdrawal.go index 5ccb035b1e4d..9e1020fcbec0 100644 --- a/beacon-chain/state/state-native/setters_withdrawal.go +++ b/beacon-chain/state/state-native/setters_withdrawal.go @@ -1,9 +1,9 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SetNextWithdrawalIndex sets the index that will be assigned to the next withdrawal. diff --git a/beacon-chain/state/state-native/setters_withdrawal_test.go b/beacon-chain/state/state-native/setters_withdrawal_test.go index 6b6e7138ce06..9035f47073e9 100644 --- a/beacon-chain/state/state-native/setters_withdrawal_test.go +++ b/beacon-chain/state/state-native/setters_withdrawal_test.go @@ -3,10 +3,10 @@ package state_native import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSetNextWithdrawalIndex(t *testing.T) { diff --git a/beacon-chain/state/state-native/spec_parameters.go b/beacon-chain/state/state-native/spec_parameters.go index ca10fb6b58df..35c612d1e9da 100644 --- a/beacon-chain/state/state-native/spec_parameters.go +++ b/beacon-chain/state/state-native/spec_parameters.go @@ -1,8 +1,8 @@ package state_native import ( - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) func (b *BeaconState) ProportionalSlashingMultiplier() (uint64, error) { diff --git a/beacon-chain/state/state-native/state_fuzz_test.go b/beacon-chain/state/state-native/state_fuzz_test.go index 98e21ae200bc..5e57273c1f24 100644 --- a/beacon-chain/state/state-native/state_fuzz_test.go +++ b/beacon-chain/state/state-native/state_fuzz_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - coreState "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/util" + coreState "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func FuzzPhase0StateHashTreeRoot(f *testing.F) { diff --git a/beacon-chain/state/state-native/state_test.go b/beacon-chain/state/state-native/state_test.go index 8dfb7aeb452b..3542f4c880b9 100644 --- a/beacon-chain/state/state-native/state_test.go +++ b/beacon-chain/state/state-native/state_test.go @@ -7,15 +7,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestValidatorMap_DistinctCopy(t *testing.T) { diff --git a/beacon-chain/state/state-native/state_trie.go b/beacon-chain/state/state-native/state_trie.go index 088eeac04f33..fe9ace7fa41a 100644 --- a/beacon-chain/state/state-native/state_trie.go +++ b/beacon-chain/state/state-native/state_trie.go @@ -6,18 +6,19 @@ import ( "sort" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/fieldtrie" - customtypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/custom-types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/fieldtrie" + customtypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/custom-types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" ) @@ -693,6 +694,7 @@ func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) defer span.End() span.AddAttributes(trace.StringAttribute("field", field.String(b.version))) + hasher := hash.CustomSHA256Hasher() switch field { case types.GenesisTime: return ssz.Uint64Root(b.genesisTime), nil @@ -733,7 +735,7 @@ func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) } return ssz.ByteArrayRootWithLimit(hRoots, fieldparams.HistoricalRootsLength) case types.Eth1Data: - return stateutil.Eth1Root(b.eth1Data) + return stateutil.Eth1Root(hasher, b.eth1Data) case types.Eth1DataVotes: if b.rebuildTrie[field] { err := b.resetFieldTrie( diff --git a/beacon-chain/state/state-native/state_trie_test.go b/beacon-chain/state/state-native/state_trie_test.go index 6e18d1c06642..adb1a09bd66c 100644 --- a/beacon-chain/state/state-native/state_trie_test.go +++ b/beacon-chain/state/state-native/state_trie_test.go @@ -5,14 +5,14 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestInitializeFromProto_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/types.go b/beacon-chain/state/state-native/types.go index d49be0b88873..05399b31610b 100644 --- a/beacon-chain/state/state-native/types.go +++ b/beacon-chain/state/state-native/types.go @@ -3,9 +3,9 @@ package state_native import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // Ensure type BeaconState below implements BeaconState interface. diff --git a/beacon-chain/state/state-native/types/BUILD.bazel b/beacon-chain/state/state-native/types/BUILD.bazel index c548fa043883..cc86d5b0ca20 100644 --- a/beacon-chain/state/state-native/types/BUILD.bazel +++ b/beacon-chain/state/state-native/types/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["types.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native/types", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native/types", visibility = ["//visibility:public"], deps = ["@com_github_pkg_errors//:go_default_library"], ) diff --git a/beacon-chain/state/state-native/types_test.go b/beacon-chain/state/state-native/types_test.go index 779ae0734e90..4f442a135aa6 100644 --- a/beacon-chain/state/state-native/types_test.go +++ b/beacon-chain/state/state-native/types_test.go @@ -6,14 +6,14 @@ import ( "strconv" "testing" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" log "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/state/stategen/BUILD.bazel b/beacon-chain/state/stategen/BUILD.bazel index a07e5d437a22..3bcb428a4916 100644 --- a/beacon-chain/state/stategen/BUILD.bazel +++ b/beacon-chain/state/stategen/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "service.go", "setter.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/beacon-chain/state/stategen/cacher.go b/beacon-chain/state/stategen/cacher.go index 5180e9b343bb..dba2fe754d10 100644 --- a/beacon-chain/state/stategen/cacher.go +++ b/beacon-chain/state/stategen/cacher.go @@ -2,7 +2,7 @@ package stategen import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" ) var ErrNotInCache = errors.New("state not found in cache") diff --git a/beacon-chain/state/stategen/epoch_boundary_state_cache.go b/beacon-chain/state/stategen/epoch_boundary_state_cache.go index 1538f20c6128..90bfb82129df 100644 --- a/beacon-chain/state/stategen/epoch_boundary_state_cache.go +++ b/beacon-chain/state/stategen/epoch_boundary_state_cache.go @@ -5,8 +5,8 @@ import ( "strconv" "sync" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "k8s.io/client-go/tools/cache" ) diff --git a/beacon-chain/state/stategen/epoch_boundary_state_cache_test.go b/beacon-chain/state/stategen/epoch_boundary_state_cache_test.go index 4f3eeeea9745..1b5ac3b25fae 100644 --- a/beacon-chain/state/stategen/epoch_boundary_state_cache_test.go +++ b/beacon-chain/state/stategen/epoch_boundary_state_cache_test.go @@ -3,10 +3,10 @@ package stategen import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestEpochBoundaryStateCache_BadSlotKey(t *testing.T) { diff --git a/beacon-chain/state/stategen/getter.go b/beacon-chain/state/stategen/getter.go index f04f3c3cc485..baa269a0ef2e 100644 --- a/beacon-chain/state/stategen/getter.go +++ b/beacon-chain/state/stategen/getter.go @@ -4,14 +4,14 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/getter_test.go b/beacon-chain/state/stategen/getter_test.go index ccb2c27f81ff..520249c98604 100644 --- a/beacon-chain/state/stategen/getter_test.go +++ b/beacon-chain/state/stategen/getter_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestStateByRoot_GenesisState(t *testing.T) { diff --git a/beacon-chain/state/stategen/history.go b/beacon-chain/state/stategen/history.go index 9dedaaa80fd4..a8cd33685870 100644 --- a/beacon-chain/state/stategen/history.go +++ b/beacon-chain/state/stategen/history.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/history_test.go b/beacon-chain/state/stategen/history_test.go index 72e129fbc715..6add1555d8a2 100644 --- a/beacon-chain/state/stategen/history_test.go +++ b/beacon-chain/state/stategen/history_test.go @@ -6,13 +6,13 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/mock" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/mock" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBlockForSlotFuture(t *testing.T) { diff --git a/beacon-chain/state/stategen/hot_state_cache.go b/beacon-chain/state/stategen/hot_state_cache.go index 4df6f2d2827f..9d1cc3fb4a3b 100644 --- a/beacon-chain/state/stategen/hot_state_cache.go +++ b/beacon-chain/state/stategen/hot_state_cache.go @@ -6,8 +6,8 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" ) var ( diff --git a/beacon-chain/state/stategen/hot_state_cache_test.go b/beacon-chain/state/stategen/hot_state_cache_test.go index 54fdd7ca89f4..2bb956d9fd15 100644 --- a/beacon-chain/state/stategen/hot_state_cache_test.go +++ b/beacon-chain/state/stategen/hot_state_cache_test.go @@ -3,11 +3,11 @@ package stategen import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestHotStateCache_RoundTrip(t *testing.T) { diff --git a/beacon-chain/state/stategen/init_test.go b/beacon-chain/state/stategen/init_test.go index 17f6b99b1b06..ed6bbcb3d4d0 100644 --- a/beacon-chain/state/stategen/init_test.go +++ b/beacon-chain/state/stategen/init_test.go @@ -1,7 +1,7 @@ package stategen import ( - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func init() { diff --git a/beacon-chain/state/stategen/migrate.go b/beacon-chain/state/stategen/migrate.go index 98c3005683d5..107aa11837e6 100644 --- a/beacon-chain/state/stategen/migrate.go +++ b/beacon-chain/state/stategen/migrate.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/migrate_test.go b/beacon-chain/state/stategen/migrate_test.go index 725ab7bfe7c4..ed0a59d634cf 100644 --- a/beacon-chain/state/stategen/migrate_test.go +++ b/beacon-chain/state/stategen/migrate_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/state/stategen/mock/BUILD.bazel b/beacon-chain/state/stategen/mock/BUILD.bazel index 7e0763b1b4d9..678d6f041a46 100644 --- a/beacon-chain/state/stategen/mock/BUILD.bazel +++ b/beacon-chain/state/stategen/mock/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "mock.go", "replayer.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/state/stategen/mock/mock.go b/beacon-chain/state/stategen/mock/mock.go index a5ffa6c1833b..e4c7b097ea80 100644 --- a/beacon-chain/state/stategen/mock/mock.go +++ b/beacon-chain/state/stategen/mock/mock.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // MockStateManager is a fake implementation of StateManager. diff --git a/beacon-chain/state/stategen/mock/replayer.go b/beacon-chain/state/stategen/mock/replayer.go index fc347c3add2f..51b8fdb67760 100644 --- a/beacon-chain/state/stategen/mock/replayer.go +++ b/beacon-chain/state/stategen/mock/replayer.go @@ -3,9 +3,9 @@ package mock import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) func NewMockReplayerBuilder(opt ...MockReplayerBuilderOption) *MockReplayerBuilder { diff --git a/beacon-chain/state/stategen/mock_test.go b/beacon-chain/state/stategen/mock_test.go index 6a5b52e8ec91..f273ec252afb 100644 --- a/beacon-chain/state/stategen/mock_test.go +++ b/beacon-chain/state/stategen/mock_test.go @@ -7,17 +7,17 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - blocktest "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + blocktest "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestMockHistoryStates(t *testing.T) { diff --git a/beacon-chain/state/stategen/replay.go b/beacon-chain/state/stategen/replay.go index 4e54f02704d7..09ee478d3bfb 100644 --- a/beacon-chain/state/stategen/replay.go +++ b/beacon-chain/state/stategen/replay.go @@ -6,18 +6,18 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution" - prysmtime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution" + prysmtime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/replay_test.go b/beacon-chain/state/stategen/replay_test.go index 2c7bd85d9625..1bb2d1f78813 100644 --- a/beacon-chain/state/stategen/replay_test.go +++ b/beacon-chain/state/stategen/replay_test.go @@ -4,19 +4,19 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/state/stategen/replayer.go b/beacon-chain/state/stategen/replayer.go index 8772c9b9017e..532ccdb5b6d5 100644 --- a/beacon-chain/state/stategen/replayer.go +++ b/beacon-chain/state/stategen/replayer.go @@ -6,9 +6,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/replayer_test.go b/beacon-chain/state/stategen/replayer_test.go index 8089235c9c3b..4744b9bb7edb 100644 --- a/beacon-chain/state/stategen/replayer_test.go +++ b/beacon-chain/state/stategen/replayer_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func headerFromBlock(b interfaces.ReadOnlySignedBeaconBlock) (*ethpb.BeaconBlockHeader, error) { diff --git a/beacon-chain/state/stategen/service.go b/beacon-chain/state/stategen/service.go index e48930eece33..614324478af2 100644 --- a/beacon-chain/state/stategen/service.go +++ b/beacon-chain/state/stategen/service.go @@ -8,13 +8,13 @@ import ( "sync" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/backfill" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/backfill" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/service_test.go b/beacon-chain/state/stategen/service_test.go index 9777ad778675..d952fc0714b0 100644 --- a/beacon-chain/state/stategen/service_test.go +++ b/beacon-chain/state/stategen/service_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestResume(t *testing.T) { diff --git a/beacon-chain/state/stategen/setter.go b/beacon-chain/state/stategen/setter.go index 2e5cbe492e3c..5d2b1c4edbf4 100644 --- a/beacon-chain/state/stategen/setter.go +++ b/beacon-chain/state/stategen/setter.go @@ -4,11 +4,11 @@ import ( "context" "math" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/state/stategen/setter_test.go b/beacon-chain/state/stategen/setter_test.go index 3f99bc62f2d5..ed5a0e902bf6 100644 --- a/beacon-chain/state/stategen/setter_test.go +++ b/beacon-chain/state/stategen/setter_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/state/stateutil/BUILD.bazel b/beacon-chain/state/stateutil/BUILD.bazel index e237821984fb..7e71c6cbac6c 100644 --- a/beacon-chain/state/stateutil/BUILD.bazel +++ b/beacon-chain/state/stateutil/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "validator_map_handler.go", "validator_root.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil", visibility = [ "//beacon-chain:__subpackages__", "//proto/migration:__subpackages__", diff --git a/beacon-chain/state/stateutil/benchmark_test.go b/beacon-chain/state/stateutil/benchmark_test.go index f1ddd01c3edf..d24349a46b1c 100644 --- a/beacon-chain/state/stateutil/benchmark_test.go +++ b/beacon-chain/state/stateutil/benchmark_test.go @@ -3,9 +3,9 @@ package stateutil_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func BenchmarkMerkleize_Buffered(b *testing.B) { diff --git a/beacon-chain/state/stateutil/block_header_root.go b/beacon-chain/state/stateutil/block_header_root.go index 708f387c016d..6c7d73b45415 100644 --- a/beacon-chain/state/stateutil/block_header_root.go +++ b/beacon-chain/state/stateutil/block_header_root.go @@ -3,9 +3,9 @@ package stateutil import ( "encoding/binary" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // BlockHeaderRoot computes the HashTreeRoot Merkleization of diff --git a/beacon-chain/state/stateutil/eth1_root.go b/beacon-chain/state/stateutil/eth1_root.go index 2bd16677db97..907992807ce1 100644 --- a/beacon-chain/state/stateutil/eth1_root.go +++ b/beacon-chain/state/stateutil/eth1_root.go @@ -5,14 +5,15 @@ import ( "encoding/binary" "github.com/pkg/errors" - params "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + params "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Eth1DataRootWithHasher returns the hash tree root of input `eth1Data`. -func Eth1DataRootWithHasher(eth1Data *ethpb.Eth1Data) ([32]byte, error) { +func Eth1DataRootWithHasher(hasher ssz.HashFn, eth1Data *ethpb.Eth1Data) ([32]byte, error) { if eth1Data == nil { return [32]byte{}, errors.New("nil eth1 data") } @@ -41,16 +42,21 @@ func Eth1DataRootWithHasher(eth1Data *ethpb.Eth1Data) ([32]byte, error) { // Eth1DatasRoot returns the hash tree root of input `eth1Datas`. func Eth1DatasRoot(eth1Datas []*ethpb.Eth1Data) ([32]byte, error) { + hasher := hash.CustomSHA256Hasher() eth1VotesRoots := make([][32]byte, 0, len(eth1Datas)) for i := 0; i < len(eth1Datas); i++ { - eth1, err := Eth1DataRootWithHasher(eth1Datas[i]) + eth1, err := Eth1DataRootWithHasher(hasher, eth1Datas[i]) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute eth1data merkleization") } eth1VotesRoots = append(eth1VotesRoots, eth1) } - eth1VotesRootsRoot, err := ssz.BitwiseMerkleize(eth1VotesRoots, uint64(len(eth1VotesRoots)), params.BeaconConfig().Eth1DataVotesLength()) + eth1VotesRootsRoot, err := ssz.BitwiseMerkleize( + eth1VotesRoots, + uint64(len(eth1VotesRoots)), + params.BeaconConfig().Eth1DataVotesLength(), + ) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute eth1data votes merkleization") } diff --git a/beacon-chain/state/stateutil/field_root_attestation.go b/beacon-chain/state/stateutil/field_root_attestation.go index f47ff88b15bf..0dfbf40688b3 100644 --- a/beacon-chain/state/stateutil/field_root_attestation.go +++ b/beacon-chain/state/stateutil/field_root_attestation.go @@ -6,9 +6,10 @@ import ( "fmt" "github.com/pkg/errors" - params "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + params "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // RootsArrayHashTreeRoot computes the Merkle root of arrays of 32-byte hashes, such as [64][32]byte @@ -23,16 +24,21 @@ func EpochAttestationsRoot(atts []*ethpb.PendingAttestation) ([32]byte, error) { return [32]byte{}, fmt.Errorf("epoch attestation exceeds max length %d", max) } + hasher := hash.CustomSHA256Hasher() roots := make([][32]byte, len(atts)) for i := 0; i < len(atts); i++ { - pendingRoot, err := pendingAttestationRoot(atts[i]) + pendingRoot, err := pendingAttestationRoot(hasher, atts[i]) if err != nil { return [32]byte{}, errors.Wrap(err, "could not attestation merkleization") } roots[i] = pendingRoot } - attsRootsRoot, err := ssz.BitwiseMerkleize(roots, uint64(len(roots)), params.BeaconConfig().CurrentEpochAttestationsLength()) + attsRootsRoot, err := ssz.BitwiseMerkleize( + roots, + uint64(len(roots)), + params.BeaconConfig().CurrentEpochAttestationsLength(), + ) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute epoch attestations merkleization") } @@ -47,7 +53,7 @@ func EpochAttestationsRoot(atts []*ethpb.PendingAttestation) ([32]byte, error) { return res, nil } -func pendingAttestationRoot(att *ethpb.PendingAttestation) ([32]byte, error) { +func pendingAttestationRoot(hasher ssz.HashFn, att *ethpb.PendingAttestation) ([32]byte, error) { if att == nil { return [32]byte{}, errors.New("nil pending attestation") } diff --git a/beacon-chain/state/stateutil/field_root_eth1.go b/beacon-chain/state/stateutil/field_root_eth1.go index 15d3da0d7d75..05a1ba0a3c2e 100644 --- a/beacon-chain/state/stateutil/field_root_eth1.go +++ b/beacon-chain/state/stateutil/field_root_eth1.go @@ -2,17 +2,18 @@ package stateutil import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Eth1Root computes the HashTreeRoot Merkleization of // a BeaconBlockHeader struct according to the eth2 // Simple Serialize specification. -func Eth1Root(eth1Data *ethpb.Eth1Data) ([32]byte, error) { +func Eth1Root(hasher ssz.HashFn, eth1Data *ethpb.Eth1Data) ([32]byte, error) { if eth1Data == nil { return [32]byte{}, errors.New("nil eth1 data") } - return Eth1DataRootWithHasher(eth1Data) + return Eth1DataRootWithHasher(hasher, eth1Data) } // Eth1DataVotesRoot computes the HashTreeRoot Merkleization of diff --git a/beacon-chain/state/stateutil/field_root_test.go b/beacon-chain/state/stateutil/field_root_test.go index 42f2aaa2e0a7..a45cdaa9e60c 100644 --- a/beacon-chain/state/stateutil/field_root_test.go +++ b/beacon-chain/state/stateutil/field_root_test.go @@ -3,7 +3,7 @@ package stateutil import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestArraysTreeRoot_OnlyPowerOf2(t *testing.T) { diff --git a/beacon-chain/state/stateutil/field_root_validator.go b/beacon-chain/state/stateutil/field_root_validator.go index c41fa8bdce29..a3c5d3e44af9 100644 --- a/beacon-chain/state/stateutil/field_root_validator.go +++ b/beacon-chain/state/stateutil/field_root_validator.go @@ -5,10 +5,10 @@ import ( "encoding/binary" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/hash/htr" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) const ( diff --git a/beacon-chain/state/stateutil/field_root_validator_test.go b/beacon-chain/state/stateutil/field_root_validator_test.go index c07b94470943..b261cd03704c 100644 --- a/beacon-chain/state/stateutil/field_root_validator_test.go +++ b/beacon-chain/state/stateutil/field_root_validator_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestValidatorConstants(t *testing.T) { diff --git a/beacon-chain/state/stateutil/field_root_vector.go b/beacon-chain/state/stateutil/field_root_vector.go index 538d6f0b857a..8b265fc0022c 100644 --- a/beacon-chain/state/stateutil/field_root_vector.go +++ b/beacon-chain/state/stateutil/field_root_vector.go @@ -2,7 +2,7 @@ package stateutil import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" ) func ArraysRoot(input [][]byte, length uint64) ([32]byte, error) { diff --git a/beacon-chain/state/stateutil/historical_summaries_root.go b/beacon-chain/state/stateutil/historical_summaries_root.go index 666b45d73467..e2fc53794445 100644 --- a/beacon-chain/state/stateutil/historical_summaries_root.go +++ b/beacon-chain/state/stateutil/historical_summaries_root.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func HistoricalSummariesRoot(summaries []*ethpb.HistoricalSummary) ([32]byte, error) { @@ -26,7 +26,11 @@ func HistoricalSummariesRoot(summaries []*ethpb.HistoricalSummary) ([32]byte, er roots[i] = r } - summariesRoot, err := ssz.BitwiseMerkleize(roots, uint64(len(roots)), fieldparams.HistoricalRootsLength) + summariesRoot, err := ssz.BitwiseMerkleize( + roots, + uint64(len(roots)), + fieldparams.HistoricalRootsLength, + ) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute historical summaries merkleization") } diff --git a/beacon-chain/state/stateutil/participation_bit_root.go b/beacon-chain/state/stateutil/participation_bit_root.go index ccf15b357c93..3f89d2472c35 100644 --- a/beacon-chain/state/stateutil/participation_bit_root.go +++ b/beacon-chain/state/stateutil/participation_bit_root.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" ) // ParticipationBitsRoot computes the HashTreeRoot merkleization of diff --git a/beacon-chain/state/stateutil/pending_attestation_root.go b/beacon-chain/state/stateutil/pending_attestation_root.go index 4a20c0b18335..22e72d5b121e 100644 --- a/beacon-chain/state/stateutil/pending_attestation_root.go +++ b/beacon-chain/state/stateutil/pending_attestation_root.go @@ -4,10 +4,10 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // PendingAttRootWithHasher describes a method from which the hash tree root diff --git a/beacon-chain/state/stateutil/state_root_test.go b/beacon-chain/state/stateutil/state_root_test.go index 41beb4832196..cf7c7fee16f4 100644 --- a/beacon-chain/state/stateutil/state_root_test.go +++ b/beacon-chain/state/stateutil/state_root_test.go @@ -6,12 +6,12 @@ import ( "strconv" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestState_FieldCount(t *testing.T) { diff --git a/beacon-chain/state/stateutil/sync_committee.root.go b/beacon-chain/state/stateutil/sync_committee.root.go index 9031f5e16da3..8384295137dc 100644 --- a/beacon-chain/state/stateutil/sync_committee.root.go +++ b/beacon-chain/state/stateutil/sync_committee.root.go @@ -2,9 +2,9 @@ package stateutil import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/crypto/hash/htr" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SyncCommitteeRoot computes the HashTreeRoot Merkleization of a committee root. diff --git a/beacon-chain/state/stateutil/trie_helpers.go b/beacon-chain/state/stateutil/trie_helpers.go index 416624cb6fa7..723fd0e893a2 100644 --- a/beacon-chain/state/stateutil/trie_helpers.go +++ b/beacon-chain/state/stateutil/trie_helpers.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/crypto/hash/htr" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/math" ) // ReturnTrieLayer returns the representation of a merkle trie when diff --git a/beacon-chain/state/stateutil/trie_helpers_test.go b/beacon-chain/state/stateutil/trie_helpers_test.go index 50aac7348194..2e18c37baad8 100644 --- a/beacon-chain/state/stateutil/trie_helpers_test.go +++ b/beacon-chain/state/stateutil/trie_helpers_test.go @@ -3,15 +3,15 @@ package stateutil_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestReturnTrieLayer_OK(t *testing.T) { diff --git a/beacon-chain/state/stateutil/unrealized_justification.go b/beacon-chain/state/stateutil/unrealized_justification.go index 0a867c5e0e18..c4c03236cabe 100644 --- a/beacon-chain/state/stateutil/unrealized_justification.go +++ b/beacon-chain/state/stateutil/unrealized_justification.go @@ -2,10 +2,10 @@ package stateutil import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // UnrealizedCheckpointBalances returns the total current active balance, the diff --git a/beacon-chain/state/stateutil/unrealized_justification_test.go b/beacon-chain/state/stateutil/unrealized_justification_test.go index 0847fc3e0550..66b5d30fb231 100644 --- a/beacon-chain/state/stateutil/unrealized_justification_test.go +++ b/beacon-chain/state/stateutil/unrealized_justification_test.go @@ -3,9 +3,9 @@ package stateutil import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestState_UnrealizedCheckpointBalances(t *testing.T) { diff --git a/beacon-chain/state/stateutil/validator_map_handler.go b/beacon-chain/state/stateutil/validator_map_handler.go index cb6839cf31fe..a0d300bcc99d 100644 --- a/beacon-chain/state/stateutil/validator_map_handler.go +++ b/beacon-chain/state/stateutil/validator_map_handler.go @@ -3,10 +3,10 @@ package stateutil import ( "sync" - coreutils "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/stateutils" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + coreutils "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/stateutils" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ValidatorMapHandler is a container to hold the map and a reference tracker for how many diff --git a/beacon-chain/state/stateutil/validator_root.go b/beacon-chain/state/stateutil/validator_root.go index e11050562015..1fef31d81095 100644 --- a/beacon-chain/state/stateutil/validator_root.go +++ b/beacon-chain/state/stateutil/validator_root.go @@ -4,10 +4,10 @@ import ( "encoding/binary" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ValidatorRootWithHasher describes a method from which the hash tree root diff --git a/beacon-chain/state/stateutil/validator_root_test.go b/beacon-chain/state/stateutil/validator_root_test.go index 798f21ea0085..e89eada21cf5 100644 --- a/beacon-chain/state/stateutil/validator_root_test.go +++ b/beacon-chain/state/stateutil/validator_root_test.go @@ -3,7 +3,7 @@ package stateutil_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" ) func BenchmarkUint64ListRootWithRegistryLimit(b *testing.B) { diff --git a/beacon-chain/state/testing/BUILD.bazel b/beacon-chain/state/testing/BUILD.bazel index 71425e8ea063..ad7443076685 100644 --- a/beacon-chain/state/testing/BUILD.bazel +++ b/beacon-chain/state/testing/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "getters_checkpoint.go", "getters_validator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/testing", visibility = ["//beacon-chain/state:__subpackages__"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/state/testing/getters.go b/beacon-chain/state/testing/getters.go index 7998015c1313..6b9dc55311bb 100644 --- a/beacon-chain/state/testing/getters.go +++ b/beacon-chain/state/testing/getters.go @@ -4,12 +4,12 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func VerifyBeaconStateSlotDataRace(t *testing.T, factory getState) { diff --git a/beacon-chain/state/testing/getters_block.go b/beacon-chain/state/testing/getters_block.go index 8c4a29ac4705..13a59b9e8885 100644 --- a/beacon-chain/state/testing/getters_block.go +++ b/beacon-chain/state/testing/getters_block.go @@ -3,11 +3,11 @@ package testing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type getStateWithLatestBlockHeader func(*ethpb.BeaconBlockHeader) (state.BeaconState, error) diff --git a/beacon-chain/state/testing/getters_checkpoint.go b/beacon-chain/state/testing/getters_checkpoint.go index 26b79990d3d8..f4ec8c94ca38 100644 --- a/beacon-chain/state/testing/getters_checkpoint.go +++ b/beacon-chain/state/testing/getters_checkpoint.go @@ -2,11 +2,11 @@ package testing import ( "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" "testing" ) diff --git a/beacon-chain/state/testing/getters_validator.go b/beacon-chain/state/testing/getters_validator.go index b2eacf70c75b..f752f88f5952 100644 --- a/beacon-chain/state/testing/getters_validator.go +++ b/beacon-chain/state/testing/getters_validator.go @@ -3,9 +3,9 @@ package testing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type getState func() (state.BeaconState, error) diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel index 0e7f48f87dde..f29c55ab52fb 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/sync/BUILD.bazel @@ -48,7 +48,7 @@ go_library( "validate_sync_contribution_proof.go", "validate_voluntary_exit.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/beacon-chain/sync/backfill/BUILD.bazel b/beacon-chain/sync/backfill/BUILD.bazel index 6934cf740811..05264ae2ca6f 100644 --- a/beacon-chain/sync/backfill/BUILD.bazel +++ b/beacon-chain/sync/backfill/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["status.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/backfill", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/backfill", visibility = ["//visibility:public"], deps = [ "//beacon-chain/db:go_default_library", diff --git a/beacon-chain/sync/backfill/status.go b/beacon-chain/sync/backfill/status.go index f933e44cae1b..7a295fef5cc4 100644 --- a/beacon-chain/sync/backfill/status.go +++ b/beacon-chain/sync/backfill/status.go @@ -4,10 +4,10 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // NewStatus correctly initializes a Status value with the required database value. diff --git a/beacon-chain/sync/backfill/status_test.go b/beacon-chain/sync/backfill/status_test.go index 828619ccc25d..4b33c48c961f 100644 --- a/beacon-chain/sync/backfill/status_test.go +++ b/beacon-chain/sync/backfill/status_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - blocktest "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + blocktest "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) var errEmptyMockDBMethod = errors.New("uninitialized mock db method called") diff --git a/beacon-chain/sync/batch_verifier.go b/beacon-chain/sync/batch_verifier.go index 412152e66285..30608ee0e81d 100644 --- a/beacon-chain/sync/batch_verifier.go +++ b/beacon-chain/sync/batch_verifier.go @@ -6,8 +6,8 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/batch_verifier_test.go b/beacon-chain/sync/batch_verifier_test.go index 75047f664271..83cbb304b819 100644 --- a/beacon-chain/sync/batch_verifier_test.go +++ b/beacon-chain/sync/batch_verifier_test.go @@ -5,10 +5,10 @@ import ( "testing" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestValidateWithBatchVerifier(t *testing.T) { diff --git a/beacon-chain/sync/broadcast_bls_changes.go b/beacon-chain/sync/broadcast_bls_changes.go index 374bc2c6d227..63f18260317f 100644 --- a/beacon-chain/sync/broadcast_bls_changes.go +++ b/beacon-chain/sync/broadcast_bls_changes.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/config/params" - types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/config/params" + types "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) const broadcastBLSChangesRateLimit = 128 diff --git a/beacon-chain/sync/broadcast_bls_changes_test.go b/beacon-chain/sync/broadcast_bls_changes_test.go index 756be51af037..27a6de5b8700 100644 --- a/beacon-chain/sync/broadcast_bls_changes_test.go +++ b/beacon-chain/sync/broadcast_bls_changes_test.go @@ -5,22 +5,22 @@ import ( "testing" "time" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - testingdb "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + testingdb "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/checkpoint/BUILD.bazel b/beacon-chain/sync/checkpoint/BUILD.bazel index ae8d9c9b3288..97b96302e9a4 100644 --- a/beacon-chain/sync/checkpoint/BUILD.bazel +++ b/beacon-chain/sync/checkpoint/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "api.go", "file.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/checkpoint", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/checkpoint", visibility = ["//visibility:public"], deps = [ "//api/client/beacon:go_default_library", diff --git a/beacon-chain/sync/checkpoint/api.go b/beacon-chain/sync/checkpoint/api.go index 3c7706fa56bf..67ccab9bf787 100644 --- a/beacon-chain/sync/checkpoint/api.go +++ b/beacon-chain/sync/checkpoint/api.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/client/beacon" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/api/client/beacon" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/config/params" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/checkpoint/file.go b/beacon-chain/sync/checkpoint/file.go index be4e6a8621ac..c8e37f7aa71a 100644 --- a/beacon-chain/sync/checkpoint/file.go +++ b/beacon-chain/sync/checkpoint/file.go @@ -6,9 +6,9 @@ import ( "os" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/context.go b/beacon-chain/sync/context.go index 03b5955e4f81..da0092fc36c9 100644 --- a/beacon-chain/sync/context.go +++ b/beacon-chain/sync/context.go @@ -4,9 +4,9 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" ) // Specifies the fixed size context length. diff --git a/beacon-chain/sync/context_test.go b/beacon-chain/sync/context_test.go index 73ad3598c408..883f5e223bd5 100644 --- a/beacon-chain/sync/context_test.go +++ b/beacon-chain/sync/context_test.go @@ -9,10 +9,10 @@ import ( core "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestContextWrite_NoWrites(t *testing.T) { diff --git a/beacon-chain/sync/deadlines.go b/beacon-chain/sync/deadlines.go index 400773a3a466..fe8a397f58bc 100644 --- a/beacon-chain/sync/deadlines.go +++ b/beacon-chain/sync/deadlines.go @@ -5,7 +5,7 @@ import ( "time" "github.com/libp2p/go-libp2p/core/network" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/decode_pubsub.go b/beacon-chain/sync/decode_pubsub.go index 2373eba54b4b..45b0b5792062 100644 --- a/beacon-chain/sync/decode_pubsub.go +++ b/beacon-chain/sync/decode_pubsub.go @@ -7,8 +7,8 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/decode_pubsub_test.go b/beacon-chain/sync/decode_pubsub_test.go index 3afeb5f6460b..feaf3b2187df 100644 --- a/beacon-chain/sync/decode_pubsub_test.go +++ b/beacon-chain/sync/decode_pubsub_test.go @@ -11,16 +11,16 @@ import ( "github.com/d4l3k/messagediff" pubsub "github.com/libp2p/go-libp2p-pubsub" pb "github.com/libp2p/go-libp2p-pubsub/pb" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptesting "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptesting "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestService_decodePubsubMessage(t *testing.T) { diff --git a/beacon-chain/sync/error.go b/beacon-chain/sync/error.go index a1458bf8d130..769ad05e941f 100644 --- a/beacon-chain/sync/error.go +++ b/beacon-chain/sync/error.go @@ -6,10 +6,10 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/network" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/error_test.go b/beacon-chain/sync/error_test.go index 152b80dc13f1..4c0b202a1d40 100644 --- a/beacon-chain/sync/error_test.go +++ b/beacon-chain/sync/error_test.go @@ -4,10 +4,10 @@ import ( "bytes" "testing" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestRegularSync_generateErrorResponse(t *testing.T) { diff --git a/beacon-chain/sync/fork_watcher.go b/beacon-chain/sync/fork_watcher.go index 4408b9958632..3b89d774aa5c 100644 --- a/beacon-chain/sync/fork_watcher.go +++ b/beacon-chain/sync/fork_watcher.go @@ -2,11 +2,11 @@ package sync import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // Is a background routine that observes for new incoming forks. Depending on the epoch diff --git a/beacon-chain/sync/fork_watcher_test.go b/beacon-chain/sync/fork_watcher_test.go index 4571bb1d179b..ec6d7ff8ef39 100644 --- a/beacon-chain/sync/fork_watcher_test.go +++ b/beacon-chain/sync/fork_watcher_test.go @@ -5,15 +5,15 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/async/abool" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/async/abool" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestService_CheckForNextEpochFork(t *testing.T) { diff --git a/beacon-chain/sync/fuzz_exports.go b/beacon-chain/sync/fuzz_exports.go index d07ba4de315d..5f62021afb12 100644 --- a/beacon-chain/sync/fuzz_exports.go +++ b/beacon-chain/sync/fuzz_exports.go @@ -9,7 +9,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" gcache "github.com/patrickmn/go-cache" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/genesis/BUILD.bazel b/beacon-chain/sync/genesis/BUILD.bazel index f3d8bfe2c0fa..7bc36435380d 100644 --- a/beacon-chain/sync/genesis/BUILD.bazel +++ b/beacon-chain/sync/genesis/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "api.go", "file.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/genesis", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/genesis", visibility = ["//visibility:public"], deps = [ "//api/client/beacon:go_default_library", diff --git a/beacon-chain/sync/genesis/api.go b/beacon-chain/sync/genesis/api.go index 1a52c473bd5a..5c7e7797da64 100644 --- a/beacon-chain/sync/genesis/api.go +++ b/beacon-chain/sync/genesis/api.go @@ -6,8 +6,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/client/beacon" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/api/client/beacon" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" ) // APIInitializer manages initializing the genesis state and block to prepare the beacon node for syncing. diff --git a/beacon-chain/sync/genesis/file.go b/beacon-chain/sync/genesis/file.go index 38d480c20831..e04a4292f591 100644 --- a/beacon-chain/sync/genesis/file.go +++ b/beacon-chain/sync/genesis/file.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/io/file" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" ) // Initializer describes a type that is able to obtain the checkpoint sync data (BeaconState and SignedBeaconBlock) diff --git a/beacon-chain/sync/initial-sync/BUILD.bazel b/beacon-chain/sync/initial-sync/BUILD.bazel index 4c07062acca3..36f3d1641c9d 100644 --- a/beacon-chain/sync/initial-sync/BUILD.bazel +++ b/beacon-chain/sync/initial-sync/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "round_robin.go", "service.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//async/abool:go_default_library", diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher.go b/beacon-chain/sync/initial-sync/blocks_fetcher.go index 9ea127bdb5cc..3b59eee444cb 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher.go @@ -8,18 +8,18 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2pTypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - prysmsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/math" - p2ppb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2pTypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + prysmsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/math" + p2ppb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_peers.go b/beacon-chain/sync/initial-sync/blocks_fetcher_peers.go index 2293735f2d10..9883629403cb 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_peers.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_peers.go @@ -7,12 +7,12 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_peers_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_peers_test.go index 833d6b4ccd2e..ba54545e5008 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_peers_test.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_peers_test.go @@ -9,13 +9,13 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers/scorers" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) func TestBlocksFetcher_selectFailOverPeer(t *testing.T) { diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go index 109fd32545f2..b51f8605cc3f 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go @@ -10,23 +10,23 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/network" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2pm "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2pt "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - beaconsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/container/slice" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2pm "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2pt "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + beaconsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/container/slice" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_utils.go b/beacon-chain/sync/initial-sync/blocks_fetcher_utils.go index 169d8498229a..93d3e360df6c 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_utils.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_utils.go @@ -7,13 +7,13 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - p2pTypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - p2ppb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + p2pTypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + p2ppb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go index 54ae0ec390b6..b58fb07339be 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_utils_test.go @@ -9,21 +9,21 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2pm "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2pt "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2pm "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2pt "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestBlocksFetcher_nonSkippedSlotAfter(t *testing.T) { diff --git a/beacon-chain/sync/initial-sync/blocks_queue.go b/beacon-chain/sync/initial-sync/blocks_queue.go index 5e5f7f30ac61..68e5d3286efb 100644 --- a/beacon-chain/sync/initial-sync/blocks_queue.go +++ b/beacon-chain/sync/initial-sync/blocks_queue.go @@ -6,12 +6,12 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - beaconsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + beaconsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/initial-sync/blocks_queue_test.go b/beacon-chain/sync/initial-sync/blocks_queue_test.go index d6312f9b4ef9..65e5cb86e221 100644 --- a/beacon-chain/sync/initial-sync/blocks_queue_test.go +++ b/beacon-chain/sync/initial-sync/blocks_queue_test.go @@ -7,24 +7,24 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - p2pt "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - beaconsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + p2pt "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + beaconsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/initial-sync/blocks_queue_utils.go b/beacon-chain/sync/initial-sync/blocks_queue_utils.go index ea39bf94bd79..9d5ce7ca1861 100644 --- a/beacon-chain/sync/initial-sync/blocks_queue_utils.go +++ b/beacon-chain/sync/initial-sync/blocks_queue_utils.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // resetWithBlocks removes all state machines, then re-adds enough machines to contain all provided diff --git a/beacon-chain/sync/initial-sync/fsm.go b/beacon-chain/sync/initial-sync/fsm.go index efba40328ede..1a2441a0f702 100644 --- a/beacon-chain/sync/initial-sync/fsm.go +++ b/beacon-chain/sync/initial-sync/fsm.go @@ -7,10 +7,10 @@ import ( "time" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) const ( diff --git a/beacon-chain/sync/initial-sync/fsm_benchmark_test.go b/beacon-chain/sync/initial-sync/fsm_benchmark_test.go index e6cd9f9892da..a93291c4c5f9 100644 --- a/beacon-chain/sync/initial-sync/fsm_benchmark_test.go +++ b/beacon-chain/sync/initial-sync/fsm_benchmark_test.go @@ -3,7 +3,7 @@ package initialsync import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func BenchmarkStateMachine_trigger(b *testing.B) { diff --git a/beacon-chain/sync/initial-sync/fsm_test.go b/beacon-chain/sync/initial-sync/fsm_test.go index 9f17d5aab4bc..9d7ce2baebff 100644 --- a/beacon-chain/sync/initial-sync/fsm_test.go +++ b/beacon-chain/sync/initial-sync/fsm_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStateMachineManager_String(t *testing.T) { diff --git a/beacon-chain/sync/initial-sync/initial_sync_test.go b/beacon-chain/sync/initial-sync/initial_sync_test.go index d718846ea5a3..30dba0262aae 100644 --- a/beacon-chain/sync/initial-sync/initial_sync_test.go +++ b/beacon-chain/sync/initial-sync/initial_sync_test.go @@ -11,26 +11,26 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - p2pt "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2pTypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - beaconsync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + p2pt "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2pTypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + beaconsync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/initial-sync/round_robin.go b/beacon-chain/sync/initial-sync/round_robin.go index 9ec3ab41d28b..71fb6160ced7 100644 --- a/beacon-chain/sync/initial-sync/round_robin.go +++ b/beacon-chain/sync/initial-sync/round_robin.go @@ -9,10 +9,10 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/paulbellamy/ratecounter" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/initial-sync/round_robin_test.go b/beacon-chain/sync/initial-sync/round_robin_test.go index 39a6d2b6a2f8..102a5ad50b94 100644 --- a/beacon-chain/sync/initial-sync/round_robin_test.go +++ b/beacon-chain/sync/initial-sync/round_robin_test.go @@ -6,18 +6,18 @@ import ( "time" "github.com/paulbellamy/ratecounter" - "github.com/prysmaticlabs/prysm/v3/async/abool" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2pt "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async/abool" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2pt "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/initial-sync/service.go b/beacon-chain/sync/initial-sync/service.go index bcc610791c9c..94f61ba16abc 100644 --- a/beacon-chain/sync/initial-sync/service.go +++ b/beacon-chain/sync/initial-sync/service.go @@ -9,18 +9,18 @@ import ( "github.com/paulbellamy/ratecounter" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/abool" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/runtime" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/abool" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/runtime" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/initial-sync/service_test.go b/beacon-chain/sync/initial-sync/service_test.go index ec17e2d44475..d861b72292ec 100644 --- a/beacon-chain/sync/initial-sync/service_test.go +++ b/beacon-chain/sync/initial-sync/service_test.go @@ -7,21 +7,21 @@ import ( "time" "github.com/paulbellamy/ratecounter" - "github.com/prysmaticlabs/prysm/v3/async/abool" - "github.com/prysmaticlabs/prysm/v3/async/event" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2pt "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/abool" + "github.com/prysmaticlabs/prysm/v4/async/event" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2pt "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/initial-sync/testing/BUILD.bazel b/beacon-chain/sync/initial-sync/testing/BUILD.bazel index d630ea110b38..afb8c109af63 100644 --- a/beacon-chain/sync/initial-sync/testing/BUILD.bazel +++ b/beacon-chain/sync/initial-sync/testing/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing", visibility = [ "//beacon-chain:__subpackages__", ], diff --git a/beacon-chain/sync/metrics.go b/beacon-chain/sync/metrics.go index b12331e15c06..5e8a50096b34 100644 --- a/beacon-chain/sync/metrics.go +++ b/beacon-chain/sync/metrics.go @@ -7,12 +7,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var ( diff --git a/beacon-chain/sync/options.go b/beacon-chain/sync/options.go index 4a4c088fa6cc..8c5a807be7cf 100644 --- a/beacon-chain/sync/options.go +++ b/beacon-chain/sync/options.go @@ -1,19 +1,19 @@ package sync import ( - "github.com/prysmaticlabs/prysm/v3/async/event" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/async/event" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" ) type Option func(s *Service) error diff --git a/beacon-chain/sync/pending_attestations_queue.go b/beacon-chain/sync/pending_attestations_queue.go index 628e023f695f..4a8eee38b059 100644 --- a/beacon-chain/sync/pending_attestations_queue.go +++ b/beacon-chain/sync/pending_attestations_queue.go @@ -6,15 +6,15 @@ import ( "sync" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/pending_attestations_queue_test.go b/beacon-chain/sync/pending_attestations_queue_test.go index 7e438105b254..13208ddec7d4 100644 --- a/beacon-chain/sync/pending_attestations_queue_test.go +++ b/beacon-chain/sync/pending_attestations_queue_test.go @@ -8,26 +8,26 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/network" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/async/abool" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/async/abool" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/pending_blocks_queue.go b/beacon-chain/sync/pending_blocks_queue.go index ba91408eed30..13437b635040 100644 --- a/beacon-chain/sync/pending_blocks_queue.go +++ b/beacon-chain/sync/pending_blocks_queue.go @@ -8,18 +8,18 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "github.com/trailofbits/go-mutexasserts" "go.opencensus.io/trace" diff --git a/beacon-chain/sync/pending_blocks_queue_test.go b/beacon-chain/sync/pending_blocks_queue_test.go index 3fe84a2ca8fa..7e417d5d5e0e 100644 --- a/beacon-chain/sync/pending_blocks_queue_test.go +++ b/beacon-chain/sync/pending_blocks_queue_test.go @@ -11,24 +11,24 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" gcache "github.com/patrickmn/go-cache" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // /- b1 - b2 diff --git a/beacon-chain/sync/rate_limiter.go b/beacon-chain/sync/rate_limiter.go index 5d71f5043674..b6099ea0c3fc 100644 --- a/beacon-chain/sync/rate_limiter.go +++ b/beacon-chain/sync/rate_limiter.go @@ -7,10 +7,10 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" "github.com/sirupsen/logrus" "github.com/trailofbits/go-mutexasserts" ) diff --git a/beacon-chain/sync/rate_limiter_test.go b/beacon-chain/sync/rate_limiter_test.go index 7054a787442f..dfa5aac656c3 100644 --- a/beacon-chain/sync/rate_limiter_test.go +++ b/beacon-chain/sync/rate_limiter_test.go @@ -8,12 +8,12 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestNewRateLimiter(t *testing.T) { diff --git a/beacon-chain/sync/rpc.go b/beacon-chain/sync/rpc.go index 5207049233c9..c69c7eaf5953 100644 --- a/beacon-chain/sync/rpc.go +++ b/beacon-chain/sync/rpc.go @@ -9,12 +9,12 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_range.go b/beacon-chain/sync/rpc_beacon_blocks_by_range.go index d2023d73b237..61381ef45139 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_range.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_range.go @@ -6,15 +6,15 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go b/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go index 25df0dcefeef..074034d551a3 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_range_test.go @@ -12,28 +12,28 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - db2 "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - db "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + db2 "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + db "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_root.go b/beacon-chain/sync/rpc_beacon_blocks_by_root.go index 16566bc75bd6..a7a5822188ab 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_root.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_root.go @@ -6,11 +6,11 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" ) // sendRecentBeaconBlocksRequest sends a recent beacon blocks request to a peer to get diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go b/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go index e3cf583b7043..b6b45732fa1d 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go @@ -12,24 +12,24 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" gcache "github.com/patrickmn/go-cache" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - db "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockExecution "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2pTypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + db "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockExecution "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2pTypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestRecentBeaconBlocksRPCHandler_ReturnsBlocks(t *testing.T) { diff --git a/beacon-chain/sync/rpc_chunked_response.go b/beacon-chain/sync/rpc_chunked_response.go index 4643b944d98e..51051bfdb68e 100644 --- a/beacon-chain/sync/rpc_chunked_response.go +++ b/beacon-chain/sync/rpc_chunked_response.go @@ -3,16 +3,16 @@ package sync import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // chunkBlockWriter writes the given message as a chunked response to the given network diff --git a/beacon-chain/sync/rpc_chunked_response_test.go b/beacon-chain/sync/rpc_chunked_response_test.go index 026b255f7060..2baf96e9ac37 100644 --- a/beacon-chain/sync/rpc_chunked_response_test.go +++ b/beacon-chain/sync/rpc_chunked_response_test.go @@ -4,14 +4,14 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestExtractBlockDataType(t *testing.T) { diff --git a/beacon-chain/sync/rpc_goodbye.go b/beacon-chain/sync/rpc_goodbye.go index c62017f863ee..7125f02c7516 100644 --- a/beacon-chain/sync/rpc_goodbye.go +++ b/beacon-chain/sync/rpc_goodbye.go @@ -8,11 +8,11 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/rpc_goodbye_test.go b/beacon-chain/sync/rpc_goodbye_test.go index 26d6a46aaaa1..ef464971b512 100644 --- a/beacon-chain/sync/rpc_goodbye_test.go +++ b/beacon-chain/sync/rpc_goodbye_test.go @@ -8,16 +8,16 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - db "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + db "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestGoodByeRPCHandler_Disconnects_With_Peer(t *testing.T) { diff --git a/beacon-chain/sync/rpc_metadata.go b/beacon-chain/sync/rpc_metadata.go index 05070e8b8e36..01954d19c04d 100644 --- a/beacon-chain/sync/rpc_metadata.go +++ b/beacon-chain/sync/rpc_metadata.go @@ -7,18 +7,18 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // metaDataHandler reads the incoming metadata rpc request from the peer. diff --git a/beacon-chain/sync/rpc_metadata_test.go b/beacon-chain/sync/rpc_metadata_test.go index cebcf1bb95a4..54e3945b9a31 100644 --- a/beacon-chain/sync/rpc_metadata_test.go +++ b/beacon-chain/sync/rpc_metadata_test.go @@ -9,21 +9,21 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - db "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + db "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestMetaDataRPCHandler_ReceivesMetadata(t *testing.T) { diff --git a/beacon-chain/sync/rpc_ping.go b/beacon-chain/sync/rpc_ping.go index 9cd1aec4fa02..2044acf228d6 100644 --- a/beacon-chain/sync/rpc_ping.go +++ b/beacon-chain/sync/rpc_ping.go @@ -8,11 +8,11 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // pingHandler reads the incoming ping rpc message from the peer. diff --git a/beacon-chain/sync/rpc_ping_test.go b/beacon-chain/sync/rpc_ping_test.go index a3770bff62c1..fa5bdac452e6 100644 --- a/beacon-chain/sync/rpc_ping_test.go +++ b/beacon-chain/sync/rpc_ping_test.go @@ -9,18 +9,18 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - db "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + db "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestPingRPCHandler_ReceivesPing(t *testing.T) { diff --git a/beacon-chain/sync/rpc_send_request.go b/beacon-chain/sync/rpc_send_request.go index a6528567e6f5..3361a8fb4e00 100644 --- a/beacon-chain/sync/rpc_send_request.go +++ b/beacon-chain/sync/rpc_send_request.go @@ -6,14 +6,14 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // ErrInvalidFetchedData is thrown if stream fails to provide requested blocks. diff --git a/beacon-chain/sync/rpc_send_request_test.go b/beacon-chain/sync/rpc_send_request_test.go index e0692e8abd17..3fad05de8c26 100644 --- a/beacon-chain/sync/rpc_send_request_test.go +++ b/beacon-chain/sync/rpc_send_request_test.go @@ -9,18 +9,18 @@ import ( "time" "github.com/libp2p/go-libp2p/core/network" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2pTypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2pTypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSendRequest_SendBeaconBlocksByRangeRequest(t *testing.T) { diff --git a/beacon-chain/sync/rpc_status.go b/beacon-chain/sync/rpc_status.go index d5b02ca657a3..92f1598c00da 100644 --- a/beacon-chain/sync/rpc_status.go +++ b/beacon-chain/sync/rpc_status.go @@ -11,17 +11,17 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/rpc_status_test.go b/beacon-chain/sync/rpc_status_test.go index 9eeca5e34920..37d86d2141b9 100644 --- a/beacon-chain/sync/rpc_status_test.go +++ b/beacon-chain/sync/rpc_status_test.go @@ -9,28 +9,28 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - testingDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - leakybucket "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + testingDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/rpc_test.go b/beacon-chain/sync/rpc_test.go index 1b947fda2e72..72657b8babd6 100644 --- a/beacon-chain/sync/rpc_test.go +++ b/beacon-chain/sync/rpc_test.go @@ -10,14 +10,14 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - prysmP2P "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + prysmP2P "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func init() { diff --git a/beacon-chain/sync/service.go b/beacon-chain/sync/service.go index a63541287d33..de9110fcb7b2 100644 --- a/beacon-chain/sync/service.go +++ b/beacon-chain/sync/service.go @@ -15,29 +15,29 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" gcache "github.com/patrickmn/go-cache" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/async/abool" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/synccommittee" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/voluntaryexits" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/async/abool" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/voluntaryexits" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var _ runtime.Service = (*Service)(nil) diff --git a/beacon-chain/sync/service_test.go b/beacon-chain/sync/service_test.go index 113749cf8a8e..009ea870f40a 100644 --- a/beacon-chain/sync/service_test.go +++ b/beacon-chain/sync/service_test.go @@ -6,20 +6,20 @@ import ( "time" gcache "github.com/patrickmn/go-cache" - "github.com/prysmaticlabs/prysm/v3/async/abool" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async/abool" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestService_StatusZeroEpoch(t *testing.T) { diff --git a/beacon-chain/sync/subscriber.go b/beacon-chain/sync/subscriber.go index 0185b2b4dade..3325525638d1 100644 --- a/beacon-chain/sync/subscriber.go +++ b/beacon-chain/sync/subscriber.go @@ -12,19 +12,19 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/peers" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/messagehandler" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/peers" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/messagehandler" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/sync/subscriber_beacon_aggregate_proof.go b/beacon-chain/sync/subscriber_beacon_aggregate_proof.go index f155a113e198..6b341c150610 100644 --- a/beacon-chain/sync/subscriber_beacon_aggregate_proof.go +++ b/beacon-chain/sync/subscriber_beacon_aggregate_proof.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go b/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go index d6d372ef058b..fee0e15474eb 100644 --- a/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go +++ b/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go @@ -5,14 +5,14 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestBeaconAggregateProofSubscriber_CanSaveAggregatedAttestation(t *testing.T) { diff --git a/beacon-chain/sync/subscriber_beacon_attestation.go b/beacon-chain/sync/subscriber_beacon_attestation.go index ee5cce822ffd..00c7adff4a70 100644 --- a/beacon-chain/sync/subscriber_beacon_attestation.go +++ b/beacon-chain/sync/subscriber_beacon_attestation.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_beacon_blocks.go b/beacon-chain/sync/subscriber_beacon_blocks.go index 6b127078c99d..5eb5931a2be6 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks.go +++ b/beacon-chain/sync/subscriber_beacon_blocks.go @@ -3,9 +3,9 @@ package sync import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/interop" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/interop" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_beacon_blocks_test.go b/beacon-chain/sync/subscriber_beacon_blocks_test.go index de5bb91e706f..9c7a807eef3e 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks_test.go +++ b/beacon-chain/sync/subscriber_beacon_blocks_test.go @@ -6,17 +6,17 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - chainMock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + chainMock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_bls_to_execution_change.go b/beacon-chain/sync/subscriber_bls_to_execution_change.go index 3224899dda55..d2d73d181022 100644 --- a/beacon-chain/sync/subscriber_bls_to_execution_change.go +++ b/beacon-chain/sync/subscriber_bls_to_execution_change.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_handlers.go b/beacon-chain/sync/subscriber_handlers.go index c523508453b2..eea2b2165ab5 100644 --- a/beacon-chain/sync/subscriber_handlers.go +++ b/beacon-chain/sync/subscriber_handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_sync_committee_message.go b/beacon-chain/sync/subscriber_sync_committee_message.go index 268f28b93836..60457be0fafb 100644 --- a/beacon-chain/sync/subscriber_sync_committee_message.go +++ b/beacon-chain/sync/subscriber_sync_committee_message.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_sync_contribution_proof.go b/beacon-chain/sync/subscriber_sync_contribution_proof.go index 8b7677658bc8..95486179d466 100644 --- a/beacon-chain/sync/subscriber_sync_contribution_proof.go +++ b/beacon-chain/sync/subscriber_sync_contribution_proof.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscriber_test.go b/beacon-chain/sync/subscriber_test.go index 8d693f576f26..9ab36bb5d479 100644 --- a/beacon-chain/sync/subscriber_test.go +++ b/beacon-chain/sync/subscriber_test.go @@ -11,28 +11,28 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/async/abool" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - db "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/abool" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + db "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/subscription_topic_handler.go b/beacon-chain/sync/subscription_topic_handler.go index 766871f0330f..1b6227076c45 100644 --- a/beacon-chain/sync/subscription_topic_handler.go +++ b/beacon-chain/sync/subscription_topic_handler.go @@ -4,7 +4,7 @@ import ( "sync" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" ) // This is a subscription topic handler that is used to handle basic diff --git a/beacon-chain/sync/subscription_topic_handler_test.go b/beacon-chain/sync/subscription_topic_handler_test.go index 3a590b05bc85..bfd33e396db2 100644 --- a/beacon-chain/sync/subscription_topic_handler_test.go +++ b/beacon-chain/sync/subscription_topic_handler_test.go @@ -6,10 +6,10 @@ import ( "time" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/network/forks" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/network/forks" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestSubTopicHandler_CRUD(t *testing.T) { diff --git a/beacon-chain/sync/sync_fuzz_test.go b/beacon-chain/sync/sync_fuzz_test.go index 00fdbaf72fe4..dcb06308b204 100644 --- a/beacon-chain/sync/sync_fuzz_test.go +++ b/beacon-chain/sync/sync_fuzz_test.go @@ -13,21 +13,21 @@ import ( pb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" gcache "github.com/patrickmn/go-cache" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func FuzzValidateBeaconBlockPubSub_Phase0(f *testing.F) { diff --git a/beacon-chain/sync/sync_test.go b/beacon-chain/sync/sync_test.go index 1076130e655c..982b7a7eb6f1 100644 --- a/beacon-chain/sync/sync_test.go +++ b/beacon-chain/sync/sync_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/sync/utils.go b/beacon-chain/sync/utils.go index 04c98d88b3ce..dcf77f252637 100644 --- a/beacon-chain/sync/utils.go +++ b/beacon-chain/sync/utils.go @@ -4,7 +4,7 @@ import ( "errors" "sort" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" ) // A type to represent beacon blocks and roots which have methods diff --git a/beacon-chain/sync/utils_test.go b/beacon-chain/sync/utils_test.go index 6e4fc0800b0f..919c0f9d2026 100644 --- a/beacon-chain/sync/utils_test.go +++ b/beacon-chain/sync/utils_test.go @@ -4,12 +4,12 @@ import ( "math/rand" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSortedObj_SortBlocksRoots(t *testing.T) { diff --git a/beacon-chain/sync/validate_aggregate_proof.go b/beacon-chain/sync/validate_aggregate_proof.go index 0242f48ca4f9..cdcedf5c0093 100644 --- a/beacon-chain/sync/validate_aggregate_proof.go +++ b/beacon-chain/sync/validate_aggregate_proof.go @@ -7,22 +7,22 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_aggregate_proof_test.go b/beacon-chain/sync/validate_aggregate_proof_test.go index f314f245a8e4..1c425729adf7 100644 --- a/beacon-chain/sync/validate_aggregate_proof_test.go +++ b/beacon-chain/sync/validate_aggregate_proof_test.go @@ -10,25 +10,25 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestVerifyIndexInCommittee_CanVerify(t *testing.T) { diff --git a/beacon-chain/sync/validate_attester_slashing.go b/beacon-chain/sync/validate_attester_slashing.go index b1f56706dfac..29f88e23463f 100644 --- a/beacon-chain/sync/validate_attester_slashing.go +++ b/beacon-chain/sync/validate_attester_slashing.go @@ -5,10 +5,10 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_attester_slashing_test.go b/beacon-chain/sync/validate_attester_slashing_test.go index 9c5dbd917862..f92bad4a5df0 100644 --- a/beacon-chain/sync/validate_attester_slashing_test.go +++ b/beacon-chain/sync/validate_attester_slashing_test.go @@ -10,19 +10,19 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func setupValidAttesterSlashing(t *testing.T) (*ethpb.AttesterSlashing, state.BeaconState) { diff --git a/beacon-chain/sync/validate_beacon_attestation.go b/beacon-chain/sync/validate_beacon_attestation.go index 1ec6fad1d6d1..c8849424b8d6 100644 --- a/beacon-chain/sync/validate_beacon_attestation.go +++ b/beacon-chain/sync/validate_beacon_attestation.go @@ -9,20 +9,20 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_beacon_attestation_test.go b/beacon-chain/sync/validate_beacon_attestation_test.go index 1e83d99f1640..57760e4ef9b5 100644 --- a/beacon-chain/sync/validate_beacon_attestation_test.go +++ b/beacon-chain/sync/validate_beacon_attestation_test.go @@ -10,19 +10,19 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/go-bitfield" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestService_validateCommitteeIndexBeaconAttestation(t *testing.T) { diff --git a/beacon-chain/sync/validate_beacon_blocks.go b/beacon-chain/sync/validate_beacon_blocks.go index ec2ef64ce6db..bcf532b2054c 100644 --- a/beacon-chain/sync/validate_beacon_blocks.go +++ b/beacon-chain/sync/validate_beacon_blocks.go @@ -8,22 +8,22 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + blockfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/block" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_beacon_blocks_test.go b/beacon-chain/sync/validate_beacon_blocks_test.go index 3479ebf0f5b5..5d07bb9ffde2 100644 --- a/beacon-chain/sync/validate_beacon_blocks_test.go +++ b/beacon-chain/sync/validate_beacon_blocks_test.go @@ -12,29 +12,29 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" gcache "github.com/patrickmn/go-cache" - "github.com/prysmaticlabs/prysm/v3/async/abool" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/async/abool" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/validate_bls_to_execution_change.go b/beacon-chain/sync/validate_bls_to_execution_change.go index 3ee10f3bad45..35e8824dce61 100644 --- a/beacon-chain/sync/validate_bls_to_execution_change.go +++ b/beacon-chain/sync/validate_bls_to_execution_change.go @@ -5,9 +5,9 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_bls_to_execution_change_test.go b/beacon-chain/sync/validate_bls_to_execution_change_test.go index 46c7e6e16b60..b844477c9441 100644 --- a/beacon-chain/sync/validate_bls_to_execution_change_test.go +++ b/beacon-chain/sync/validate_bls_to_execution_change_test.go @@ -10,21 +10,21 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - testingdb "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/blstoexec" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + testingdb "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/blstoexec" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestService_ValidateBlsToExecutionChange(t *testing.T) { diff --git a/beacon-chain/sync/validate_proposer_slashing.go b/beacon-chain/sync/validate_proposer_slashing.go index 6cadd3adf350..cdfb3ab21549 100644 --- a/beacon-chain/sync/validate_proposer_slashing.go +++ b/beacon-chain/sync/validate_proposer_slashing.go @@ -5,10 +5,10 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_proposer_slashing_test.go b/beacon-chain/sync/validate_proposer_slashing_test.go index 39f70a3e9cbd..9e644ce361b9 100644 --- a/beacon-chain/sync/validate_proposer_slashing_test.go +++ b/beacon-chain/sync/validate_proposer_slashing_test.go @@ -11,21 +11,21 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/go-bitfield" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func setupValidProposerSlashing(t *testing.T) (*ethpb.ProposerSlashing, state.BeaconState) { diff --git a/beacon-chain/sync/validate_sync_committee_message.go b/beacon-chain/sync/validate_sync_committee_message.go index 6cc28df9a89f..1e73ddf8ed99 100644 --- a/beacon-chain/sync/validate_sync_committee_message.go +++ b/beacon-chain/sync/validate_sync_committee_message.go @@ -9,16 +9,16 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_sync_committee_message_test.go b/beacon-chain/sync/validate_sync_committee_message_test.go index a9c36158e738..571527ac42ab 100644 --- a/beacon-chain/sync/validate_sync_committee_message_test.go +++ b/beacon-chain/sync/validate_sync_committee_message_test.go @@ -11,23 +11,23 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - testingdb "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + testingdb "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestService_ValidateSyncCommitteeMessage(t *testing.T) { diff --git a/beacon-chain/sync/validate_sync_contribution_proof.go b/beacon-chain/sync/validate_sync_contribution_proof.go index 63ddf366b6ec..bd72cee54d65 100644 --- a/beacon-chain/sync/validate_sync_contribution_proof.go +++ b/beacon-chain/sync/validate_sync_contribution_proof.go @@ -6,17 +6,17 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_sync_contribution_proof_test.go b/beacon-chain/sync/validate_sync_contribution_proof_test.go index 2a35787edb5b..5c2144b00b6b 100644 --- a/beacon-chain/sync/validate_sync_contribution_proof_test.go +++ b/beacon-chain/sync/validate_sync_contribution_proof_test.go @@ -11,32 +11,32 @@ import ( pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/peer" "github.com/prysmaticlabs/go-bitfield" - mockChain "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - testingdb "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - mockp2p "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + mockChain "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + testingdb "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestService_ValidateSyncContributionAndProof(t *testing.T) { diff --git a/beacon-chain/sync/validate_voluntary_exit.go b/beacon-chain/sync/validate_voluntary_exit.go index ca49d41486ef..b5732492f7b7 100644 --- a/beacon-chain/sync/validate_voluntary_exit.go +++ b/beacon-chain/sync/validate_voluntary_exit.go @@ -6,12 +6,12 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/validate_voluntary_exit_test.go b/beacon-chain/sync/validate_voluntary_exit_test.go index d06e8fd3543a..4233534248e5 100644 --- a/beacon-chain/sync/validate_voluntary_exit_test.go +++ b/beacon-chain/sync/validate_voluntary_exit_test.go @@ -10,22 +10,22 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - opfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/operation" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptest "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - mockSync "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/initial-sync/testing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + mockSync "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/initial-sync/testing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func setupValidExit(t *testing.T) (*ethpb.SignedVoluntaryExit, state.BeaconState) { diff --git a/build/bazel/BUILD.bazel b/build/bazel/BUILD.bazel index 5463012a25cc..31be278fbd53 100644 --- a/build/bazel/BUILD.bazel +++ b/build/bazel/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "data_path.go", "non_bazel.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/build/bazel", + importpath = "github.com/prysmaticlabs/prysm/v4/build/bazel", visibility = ["//visibility:public"], deps = [ "//testing/require:go_default_library", diff --git a/build/bazel/bazel_test.go b/build/bazel/bazel_test.go index 020e3936bac2..63c0c011cc27 100644 --- a/build/bazel/bazel_test.go +++ b/build/bazel/bazel_test.go @@ -3,7 +3,7 @@ package bazel_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" ) func TestBuildWithBazel(t *testing.T) { diff --git a/build/bazel/data_path.go b/build/bazel/data_path.go index c03ba88aa47f..3ac9e9a6d4dc 100644 --- a/build/bazel/data_path.go +++ b/build/bazel/data_path.go @@ -15,7 +15,7 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // TestDataPath returns a path to an asset in the testdata directory. It knows diff --git a/cache/lru/BUILD.bazel b/cache/lru/BUILD.bazel index a3e01e078b82..a2dca214ee3d 100644 --- a/cache/lru/BUILD.bazel +++ b/cache/lru/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["lru_wrpr.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cache/lru", + importpath = "github.com/prysmaticlabs/prysm/v4/cache/lru", visibility = ["//visibility:public"], deps = ["@com_github_hashicorp_golang_lru//:go_default_library"], ) diff --git a/cmd/BUILD.bazel b/cmd/BUILD.bazel index 860f0808dbfe..9fdd53f0c3a3 100644 --- a/cmd/BUILD.bazel +++ b/cmd/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "password_reader.go", "wrap_flags.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/cmd/beacon-chain/BUILD.bazel b/cmd/beacon-chain/BUILD.bazel index 3d446a749be1..f872bfec4efe 100644 --- a/cmd/beacon-chain/BUILD.bazel +++ b/cmd/beacon-chain/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "main.go", "usage.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/builder:go_default_library", diff --git a/cmd/beacon-chain/blockchain/BUILD.bazel b/cmd/beacon-chain/blockchain/BUILD.bazel index 6c88bf3f8d03..0a7295122ed7 100644 --- a/cmd/beacon-chain/blockchain/BUILD.bazel +++ b/cmd/beacon-chain/blockchain/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["options.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/blockchain", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/blockchain", visibility = ["//cmd:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/cmd/beacon-chain/blockchain/options.go b/cmd/beacon-chain/blockchain/options.go index ec16524fa9fa..7f5bad63a6e1 100644 --- a/cmd/beacon-chain/blockchain/options.go +++ b/cmd/beacon-chain/blockchain/options.go @@ -1,10 +1,10 @@ package blockchaincmd import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/db/BUILD.bazel b/cmd/beacon-chain/db/BUILD.bazel index c95b0be535f3..46666a907f5e 100644 --- a/cmd/beacon-chain/db/BUILD.bazel +++ b/cmd/beacon-chain/db/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["db.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/db", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/db", visibility = ["//visibility:public"], deps = [ "//beacon-chain/db:go_default_library", diff --git a/cmd/beacon-chain/db/db.go b/cmd/beacon-chain/db/db.go index 34384371aa40..679a4cf32858 100644 --- a/cmd/beacon-chain/db/db.go +++ b/cmd/beacon-chain/db/db.go @@ -1,9 +1,9 @@ package db import ( - beacondb "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" + beacondb "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/execution/BUILD.bazel b/cmd/beacon-chain/execution/BUILD.bazel index ea39e3767ad4..246aabb813a0 100644 --- a/cmd/beacon-chain/execution/BUILD.bazel +++ b/cmd/beacon-chain/execution/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["options.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/execution", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/execution", visibility = [ "//beacon-chain:__subpackages__", "//cmd:__subpackages__", diff --git a/cmd/beacon-chain/execution/options.go b/cmd/beacon-chain/execution/options.go index 30f44c9efc4c..cf12b235fd7e 100644 --- a/cmd/beacon-chain/execution/options.go +++ b/cmd/beacon-chain/execution/options.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/io/file" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/execution/options_test.go b/cmd/beacon-chain/execution/options_test.go index aa00adc74770..4548c7abf1dc 100644 --- a/cmd/beacon-chain/execution/options_test.go +++ b/cmd/beacon-chain/execution/options_test.go @@ -6,11 +6,11 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/flags/BUILD.bazel b/cmd/beacon-chain/flags/BUILD.bazel index 10f1719c8cf0..c9895e82f320 100644 --- a/cmd/beacon-chain/flags/BUILD.bazel +++ b/cmd/beacon-chain/flags/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "interop.go", "log.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags", visibility = [ "//api/gateway:__pkg__", "//beacon-chain:__subpackages__", diff --git a/cmd/beacon-chain/flags/api_module_test.go b/cmd/beacon-chain/flags/api_module_test.go index 5a0df5e7162b..065dbf108a1b 100644 --- a/cmd/beacon-chain/flags/api_module_test.go +++ b/cmd/beacon-chain/flags/api_module_test.go @@ -3,7 +3,7 @@ package flags import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestEnableHTTPPrysmAPI(t *testing.T) { diff --git a/cmd/beacon-chain/flags/base.go b/cmd/beacon-chain/flags/base.go index c82a27d22ef0..333994efbcb9 100644 --- a/cmd/beacon-chain/flags/base.go +++ b/cmd/beacon-chain/flags/base.go @@ -5,8 +5,8 @@ package flags import ( "strings" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/flags/config.go b/cmd/beacon-chain/flags/config.go index b4caca298942..d0e2fdef348d 100644 --- a/cmd/beacon-chain/flags/config.go +++ b/cmd/beacon-chain/flags/config.go @@ -1,7 +1,7 @@ package flags import ( - "github.com/prysmaticlabs/prysm/v3/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/jwt/BUILD.bazel b/cmd/beacon-chain/jwt/BUILD.bazel index 6e9c47a6d66c..27e381d2940d 100644 --- a/cmd/beacon-chain/jwt/BUILD.bazel +++ b/cmd/beacon-chain/jwt/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["jwt.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/jwt", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/jwt", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/cmd/beacon-chain/jwt/jwt.go b/cmd/beacon-chain/jwt/jwt.go index 7226b75778d1..6b558f33cc92 100644 --- a/cmd/beacon-chain/jwt/jwt.go +++ b/cmd/beacon-chain/jwt/jwt.go @@ -5,9 +5,9 @@ import ( "path/filepath" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/io/file" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/jwt/jwt_test.go b/cmd/beacon-chain/jwt/jwt_test.go index c44d4617035b..9447096703da 100644 --- a/cmd/beacon-chain/jwt/jwt_test.go +++ b/cmd/beacon-chain/jwt/jwt_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/main.go b/cmd/beacon-chain/main.go index 2b05be678cac..49216d0941a3 100644 --- a/cmd/beacon-chain/main.go +++ b/cmd/beacon-chain/main.go @@ -11,26 +11,26 @@ import ( gethlog "github.com/ethereum/go-ethereum/log" golog "github.com/ipfs/go-log/v2" joonix "github.com/joonix/log" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/node" - "github.com/prysmaticlabs/prysm/v3/cmd" - blockchaincmd "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/blockchain" - dbcommands "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - jwtcommands "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/jwt" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/checkpoint" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/genesis" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/monitoring/journald" - "github.com/prysmaticlabs/prysm/v3/runtime/debug" - "github.com/prysmaticlabs/prysm/v3/runtime/fdlimits" - prefixed "github.com/prysmaticlabs/prysm/v3/runtime/logging/logrus-prefixed-formatter" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/node" + "github.com/prysmaticlabs/prysm/v4/cmd" + blockchaincmd "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/blockchain" + dbcommands "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + jwtcommands "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/jwt" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/checkpoint" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/genesis" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/monitoring/journald" + "github.com/prysmaticlabs/prysm/v4/runtime/debug" + "github.com/prysmaticlabs/prysm/v4/runtime/fdlimits" + prefixed "github.com/prysmaticlabs/prysm/v4/runtime/logging/logrus-prefixed-formatter" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/sync/checkpoint/BUILD.bazel b/cmd/beacon-chain/sync/checkpoint/BUILD.bazel index fecac02ed878..5f01dfe39b48 100644 --- a/cmd/beacon-chain/sync/checkpoint/BUILD.bazel +++ b/cmd/beacon-chain/sync/checkpoint/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["options.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/checkpoint", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/checkpoint", visibility = ["//visibility:public"], deps = [ "//beacon-chain/node:go_default_library", diff --git a/cmd/beacon-chain/sync/checkpoint/options.go b/cmd/beacon-chain/sync/checkpoint/options.go index 4bd787882e84..819309801c54 100644 --- a/cmd/beacon-chain/sync/checkpoint/options.go +++ b/cmd/beacon-chain/sync/checkpoint/options.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/node" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/checkpoint" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/node" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/checkpoint" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/sync/genesis/BUILD.bazel b/cmd/beacon-chain/sync/genesis/BUILD.bazel index d6d300208c15..d653e9d322d0 100644 --- a/cmd/beacon-chain/sync/genesis/BUILD.bazel +++ b/cmd/beacon-chain/sync/genesis/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["options.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/genesis", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/genesis", visibility = ["//visibility:public"], deps = [ "//beacon-chain/node:go_default_library", diff --git a/cmd/beacon-chain/sync/genesis/options.go b/cmd/beacon-chain/sync/genesis/options.go index 9f36fa8f41be..46ebd0d64c5a 100644 --- a/cmd/beacon-chain/sync/genesis/options.go +++ b/cmd/beacon-chain/sync/genesis/options.go @@ -2,8 +2,8 @@ package genesis import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/node" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync/genesis" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/node" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync/genesis" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/usage.go b/cmd/beacon-chain/usage.go index ae58e9c3d21f..fd92c89f3a59 100644 --- a/cmd/beacon-chain/usage.go +++ b/cmd/beacon-chain/usage.go @@ -5,12 +5,12 @@ import ( "io" "sort" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/checkpoint" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/genesis" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/debug" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/checkpoint" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/genesis" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/debug" "github.com/urfave/cli/v2" ) diff --git a/cmd/beacon-chain/usage_test.go b/cmd/beacon-chain/usage_test.go index aae3dc0489ee..8a2134d917c4 100644 --- a/cmd/beacon-chain/usage_test.go +++ b/cmd/beacon-chain/usage_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" + "github.com/prysmaticlabs/prysm/v4/config/features" "github.com/urfave/cli/v2" ) diff --git a/cmd/client-stats/BUILD.bazel b/cmd/client-stats/BUILD.bazel index 68d4efdb5676..3bb131ca2cb6 100644 --- a/cmd/client-stats/BUILD.bazel +++ b/cmd/client-stats/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "main.go", "usage.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/client-stats", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/client-stats", visibility = ["//visibility:private"], deps = [ "//cmd:go_default_library", diff --git a/cmd/client-stats/flags/BUILD.bazel b/cmd/client-stats/flags/BUILD.bazel index f82208ea28e3..3ebd42e06e32 100644 --- a/cmd/client-stats/flags/BUILD.bazel +++ b/cmd/client-stats/flags/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["flags.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/client-stats/flags", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/client-stats/flags", visibility = ["//visibility:public"], deps = ["@com_github_urfave_cli_v2//:go_default_library"], ) diff --git a/cmd/client-stats/main.go b/cmd/client-stats/main.go index 15459904d902..40b15ee007d3 100644 --- a/cmd/client-stats/main.go +++ b/cmd/client-stats/main.go @@ -7,13 +7,13 @@ import ( "time" joonix "github.com/joonix/log" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/client-stats/flags" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/monitoring/clientstats" - "github.com/prysmaticlabs/prysm/v3/monitoring/journald" - prefixed "github.com/prysmaticlabs/prysm/v3/runtime/logging/logrus-prefixed-formatter" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/client-stats/flags" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/monitoring/clientstats" + "github.com/prysmaticlabs/prysm/v4/monitoring/journald" + prefixed "github.com/prysmaticlabs/prysm/v4/runtime/logging/logrus-prefixed-formatter" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/client-stats/usage.go b/cmd/client-stats/usage.go index 7a3096c802c5..3a0343559844 100644 --- a/cmd/client-stats/usage.go +++ b/cmd/client-stats/usage.go @@ -5,8 +5,8 @@ import ( "io" "sort" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/client-stats/flags" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/client-stats/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/config.go b/cmd/config.go index afd3372ec39c..af6b571b5fa1 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -1,8 +1,8 @@ package cmd import ( - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/config_test.go b/cmd/config_test.go index b068a247f72b..3f4bfd330f03 100644 --- a/cmd/config_test.go +++ b/cmd/config_test.go @@ -4,9 +4,9 @@ import ( "flag" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/cmd/defaults.go b/cmd/defaults.go index b2e06eb0fc2a..406c9060d93d 100644 --- a/cmd/defaults.go +++ b/cmd/defaults.go @@ -22,7 +22,7 @@ import ( "path/filepath" "runtime" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/io/file" ) // DefaultDataDir is the default data directory to use for the databases and other diff --git a/cmd/flags.go b/cmd/flags.go index 64c5efcc6e40..87d01acb1142 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -6,7 +6,7 @@ import ( "math" "strings" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" ) diff --git a/cmd/flags/BUILD.bazel b/cmd/flags/BUILD.bazel index bbc1a8c67621..a80459bf2535 100644 --- a/cmd/flags/BUILD.bazel +++ b/cmd/flags/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["enum.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/flags", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/flags", visibility = ["//visibility:public"], deps = ["@com_github_urfave_cli_v2//:go_default_library"], ) diff --git a/cmd/flags_test.go b/cmd/flags_test.go index 604b3a285ad6..2bf3cfc4d5be 100644 --- a/cmd/flags_test.go +++ b/cmd/flags_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/cmd/helpers.go b/cmd/helpers.go index c84f747b8b16..4f2d2732e990 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/io/file" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/helpers_test.go b/cmd/helpers_test.go index 6220ca6ad33e..79a12f7bf5e3 100644 --- a/cmd/helpers_test.go +++ b/cmd/helpers_test.go @@ -8,9 +8,9 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/mock" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd/mock" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/cmd/mock/BUILD.bazel b/cmd/mock/BUILD.bazel index 8fac4b931a53..d3c42b47758b 100644 --- a/cmd/mock/BUILD.bazel +++ b/cmd/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["password_reader_mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/mock", visibility = ["//visibility:public"], deps = ["@com_github_golang_mock//gomock:go_default_library"], ) diff --git a/cmd/prysmctl/BUILD.bazel b/cmd/prysmctl/BUILD.bazel index f0096e2f0b35..5726e6c47d42 100644 --- a/cmd/prysmctl/BUILD.bazel +++ b/cmd/prysmctl/BUILD.bazel @@ -8,7 +8,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl", visibility = ["//visibility:private"], deps = [ "//cmd/prysmctl/checkpointsync:go_default_library", diff --git a/cmd/prysmctl/checkpointsync/BUILD.bazel b/cmd/prysmctl/checkpointsync/BUILD.bazel index e8482a719af6..d7ec1470943c 100644 --- a/cmd/prysmctl/checkpointsync/BUILD.bazel +++ b/cmd/prysmctl/checkpointsync/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "cmd.go", "download.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/checkpointsync", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/checkpointsync", visibility = ["//visibility:public"], deps = [ "//api/client/beacon:go_default_library", diff --git a/cmd/prysmctl/checkpointsync/download.go b/cmd/prysmctl/checkpointsync/download.go index c508b6643a9c..611871a4aa54 100644 --- a/cmd/prysmctl/checkpointsync/download.go +++ b/cmd/prysmctl/checkpointsync/download.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/prysmaticlabs/prysm/v3/api/client/beacon" + "github.com/prysmaticlabs/prysm/v4/api/client/beacon" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/db/BUILD.bazel b/cmd/prysmctl/db/BUILD.bazel index 4d7275c9a91f..4edb8c67bc8a 100644 --- a/cmd/prysmctl/db/BUILD.bazel +++ b/cmd/prysmctl/db/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "cmd.go", "query.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/db", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/db", visibility = ["//visibility:public"], deps = [ "//beacon-chain/db/kv:go_default_library", diff --git a/cmd/prysmctl/db/buckets.go b/cmd/prysmctl/db/buckets.go index cf17dd96252d..acc717db69fc 100644 --- a/cmd/prysmctl/db/buckets.go +++ b/cmd/prysmctl/db/buckets.go @@ -3,7 +3,7 @@ package db import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/db/query.go b/cmd/prysmctl/db/query.go index 48d19a5f09bb..0a0f1d585cca 100644 --- a/cmd/prysmctl/db/query.go +++ b/cmd/prysmctl/db/query.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" bolt "go.etcd.io/bbolt" diff --git a/cmd/prysmctl/deprecated/BUILD.bazel b/cmd/prysmctl/deprecated/BUILD.bazel index cd4afe963d42..20274ce49157 100644 --- a/cmd/prysmctl/deprecated/BUILD.bazel +++ b/cmd/prysmctl/deprecated/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["cmd.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/deprecated", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/deprecated", visibility = ["//visibility:public"], deps = [ "//cmd/prysmctl/deprecated/checkpoint:go_default_library", diff --git a/cmd/prysmctl/deprecated/checkpoint/BUILD.bazel b/cmd/prysmctl/deprecated/checkpoint/BUILD.bazel index 46c036210ff3..73223e0b1f0c 100644 --- a/cmd/prysmctl/deprecated/checkpoint/BUILD.bazel +++ b/cmd/prysmctl/deprecated/checkpoint/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "latest.go", "save.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/deprecated/checkpoint", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/deprecated/checkpoint", visibility = ["//visibility:public"], deps = ["@com_github_urfave_cli_v2//:go_default_library"], ) diff --git a/cmd/prysmctl/deprecated/cmd.go b/cmd/prysmctl/deprecated/cmd.go index db0f16ea9325..11398d7e180e 100644 --- a/cmd/prysmctl/deprecated/cmd.go +++ b/cmd/prysmctl/deprecated/cmd.go @@ -1,7 +1,7 @@ package deprecated import ( - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/deprecated/checkpoint" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/deprecated/checkpoint" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/main.go b/cmd/prysmctl/main.go index 59c90946297a..e2600249a6fd 100644 --- a/cmd/prysmctl/main.go +++ b/cmd/prysmctl/main.go @@ -3,13 +3,13 @@ package main import ( "os" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/checkpointsync" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/db" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/deprecated" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/p2p" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/testnet" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/validator" - "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/weaksubjectivity" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/checkpointsync" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/db" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/deprecated" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/p2p" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/testnet" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/validator" + "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/weaksubjectivity" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/p2p/BUILD.bazel b/cmd/prysmctl/p2p/BUILD.bazel index c4bb9b4cb70f..021270fe1e54 100644 --- a/cmd/prysmctl/p2p/BUILD.bazel +++ b/cmd/prysmctl/p2p/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "peers.go", "request_blocks.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/p2p", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/p2p", visibility = ["//visibility:public"], deps = [ "//beacon-chain/forkchoice:go_default_library", diff --git a/cmd/prysmctl/p2p/client.go b/cmd/prysmctl/p2p/client.go index 93946bd2e239..7fbe65ad3026 100644 --- a/cmd/prysmctl/p2p/client.go +++ b/cmd/prysmctl/p2p/client.go @@ -18,18 +18,18 @@ import ( "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/encoder" - "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/network/forks" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/network/forks" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/cmd/prysmctl/p2p/handler.go b/cmd/prysmctl/p2p/handler.go index c2f3256f081f..926bb611c1fb 100644 --- a/cmd/prysmctl/p2p/handler.go +++ b/cmd/prysmctl/p2p/handler.go @@ -10,8 +10,8 @@ import ( corenet "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" ) type rpcHandler func(context.Context, interface{}, libp2pcore.Stream) error diff --git a/cmd/prysmctl/p2p/handshake.go b/cmd/prysmctl/p2p/handshake.go index 1403268e5efc..39954abeabd8 100644 --- a/cmd/prysmctl/p2p/handshake.go +++ b/cmd/prysmctl/p2p/handshake.go @@ -4,11 +4,11 @@ import ( "context" libp2pcore "github.com/libp2p/go-libp2p/core" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/network/forks" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/network/forks" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/cmd/prysmctl/p2p/mock_chain.go b/cmd/prysmctl/p2p/mock_chain.go index 33dab78a86ce..328f441cf582 100644 --- a/cmd/prysmctl/p2p/mock_chain.go +++ b/cmd/prysmctl/p2p/mock_chain.go @@ -3,10 +3,10 @@ package p2p import ( "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) type mockChain struct { diff --git a/cmd/prysmctl/p2p/peers.go b/cmd/prysmctl/p2p/peers.go index 795d347b84c7..356292c63e02 100644 --- a/cmd/prysmctl/p2p/peers.go +++ b/cmd/prysmctl/p2p/peers.go @@ -4,7 +4,7 @@ import ( "context" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" ) func (c *client) connectToPeers(ctx context.Context, peerMultiaddrs ...string) error { diff --git a/cmd/prysmctl/p2p/request_blocks.go b/cmd/prysmctl/p2p/request_blocks.go index f830f9e801f2..0757c5e7e304 100644 --- a/cmd/prysmctl/p2p/request_blocks.go +++ b/cmd/prysmctl/p2p/request_blocks.go @@ -8,15 +8,15 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" corenet "github.com/libp2p/go-libp2p/core/network" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - p2ptypes "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + p2ptypes "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "google.golang.org/protobuf/types/known/emptypb" diff --git a/cmd/prysmctl/testnet/BUILD.bazel b/cmd/prysmctl/testnet/BUILD.bazel index 70602d688f55..1e9a00646c84 100644 --- a/cmd/prysmctl/testnet/BUILD.bazel +++ b/cmd/prysmctl/testnet/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "generate_genesis.go", "testnet.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/testnet", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/testnet", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/cmd/prysmctl/testnet/generate_genesis.go b/cmd/prysmctl/testnet/generate_genesis.go index 796ba5595aa7..88a330eabab0 100644 --- a/cmd/prysmctl/testnet/generate_genesis.go +++ b/cmd/prysmctl/testnet/generate_genesis.go @@ -14,18 +14,18 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/ghodss/yaml" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/cmd/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/io/file" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/cmd/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/io/file" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/testnet/generate_genesis_test.go b/cmd/prysmctl/testnet/generate_genesis_test.go index baeff3fe2388..4e3cf4a79c3c 100644 --- a/cmd/prysmctl/testnet/generate_genesis_test.go +++ b/cmd/prysmctl/testnet/generate_genesis_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_genesisStateFromJSONValidators(t *testing.T) { diff --git a/cmd/prysmctl/validator/BUILD.bazel b/cmd/prysmctl/validator/BUILD.bazel index cacfd1e9d593..6a189a0e2c4c 100644 --- a/cmd/prysmctl/validator/BUILD.bazel +++ b/cmd/prysmctl/validator/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "cmd.go", "withdraw.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/validator", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/validator", visibility = ["//visibility:public"], deps = [ "//api/client/beacon:go_default_library", diff --git a/cmd/prysmctl/validator/cmd.go b/cmd/prysmctl/validator/cmd.go index 2e3c9ee068d3..b960cadd9074 100644 --- a/cmd/prysmctl/validator/cmd.go +++ b/cmd/prysmctl/validator/cmd.go @@ -5,11 +5,11 @@ import ( "os" "github.com/logrusorgru/aurora" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/validator/withdraw.go b/cmd/prysmctl/validator/withdraw.go index 0c106a4d4ed9..d7bd83a6c752 100644 --- a/cmd/prysmctl/validator/withdraw.go +++ b/cmd/prysmctl/validator/withdraw.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/client/beacon" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/api/client/beacon" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "go.opencensus.io/trace" diff --git a/cmd/prysmctl/validator/withdraw_test.go b/cmd/prysmctl/validator/withdraw_test.go index d40ff54cf2c6..6f64edca1e4d 100644 --- a/cmd/prysmctl/validator/withdraw_test.go +++ b/cmd/prysmctl/validator/withdraw_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logtest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/cmd/prysmctl/weaksubjectivity/BUILD.bazel b/cmd/prysmctl/weaksubjectivity/BUILD.bazel index 93cac118e2c1..80fc03ca4cda 100644 --- a/cmd/prysmctl/weaksubjectivity/BUILD.bazel +++ b/cmd/prysmctl/weaksubjectivity/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "checkpoint.go", "cmd.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/prysmctl/weaksubjectivity", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/prysmctl/weaksubjectivity", visibility = ["//visibility:public"], deps = [ "//api/client/beacon:go_default_library", diff --git a/cmd/prysmctl/weaksubjectivity/checkpoint.go b/cmd/prysmctl/weaksubjectivity/checkpoint.go index 0920dd262768..25959797c66a 100644 --- a/cmd/prysmctl/weaksubjectivity/checkpoint.go +++ b/cmd/prysmctl/weaksubjectivity/checkpoint.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/api/client/beacon" + "github.com/prysmaticlabs/prysm/v4/api/client/beacon" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/BUILD.bazel b/cmd/validator/BUILD.bazel index ffac8c848814..a76cfbb8bdfd 100644 --- a/cmd/validator/BUILD.bazel +++ b/cmd/validator/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "main.go", "usage.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator", visibility = ["//validator:__subpackages__"], deps = [ "//cmd:go_default_library", diff --git a/cmd/validator/accounts/BUILD.bazel b/cmd/validator/accounts/BUILD.bazel index 1309cf8b597f..30ce8e5fac16 100644 --- a/cmd/validator/accounts/BUILD.bazel +++ b/cmd/validator/accounts/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "list.go", "wallet_utils.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator/accounts", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator/accounts", visibility = ["//visibility:public"], deps = [ "//api/grpc:go_default_library", diff --git a/cmd/validator/accounts/accounts.go b/cmd/validator/accounts/accounts.go index 7c65c047958c..f7dfd84cf925 100644 --- a/cmd/validator/accounts/accounts.go +++ b/cmd/validator/accounts/accounts.go @@ -3,10 +3,10 @@ package accounts import ( "os" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/accounts/backup.go b/cmd/validator/accounts/backup.go index f228222e46cd..f2bca7bf3fec 100644 --- a/cmd/validator/accounts/backup.go +++ b/cmd/validator/accounts/backup.go @@ -4,12 +4,12 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/client" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/client" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/accounts/backup_test.go b/cmd/validator/accounts/backup_test.go index 2654e3f6bfa0..023da7969b7e 100644 --- a/cmd/validator/accounts/backup_test.go +++ b/cmd/validator/accounts/backup_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - constant "github.com/prysmaticlabs/prysm/v3/validator/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + constant "github.com/prysmaticlabs/prysm/v4/validator/testing" ) func TestBackupAccounts_Noninteractive_Derived(t *testing.T) { diff --git a/cmd/validator/accounts/delete.go b/cmd/validator/accounts/delete.go index 922c1f3797d8..e88dda9e358c 100644 --- a/cmd/validator/accounts/delete.go +++ b/cmd/validator/accounts/delete.go @@ -4,11 +4,11 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/client" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/client" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/accounts/delete_test.go b/cmd/validator/accounts/delete_test.go index b8f847a69b64..944d8367963a 100644 --- a/cmd/validator/accounts/delete_test.go +++ b/cmd/validator/accounts/delete_test.go @@ -13,16 +13,16 @@ import ( "time" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" "github.com/urfave/cli/v2" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/cmd/validator/accounts/exit.go b/cmd/validator/accounts/exit.go index c1884d3c0b42..39672b5b4397 100644 --- a/cmd/validator/accounts/exit.go +++ b/cmd/validator/accounts/exit.go @@ -6,16 +6,16 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - "github.com/prysmaticlabs/prysm/v3/validator/node" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/validator/node" "github.com/urfave/cli/v2" "google.golang.org/grpc" ) diff --git a/cmd/validator/accounts/exit_test.go b/cmd/validator/accounts/exit_test.go index 43bd3a7833b8..ebb97e9b52b4 100644 --- a/cmd/validator/accounts/exit_test.go +++ b/cmd/validator/accounts/exit_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/golang/mock/gomock" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - mock2 "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + mock2 "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/cmd/validator/accounts/import.go b/cmd/validator/accounts/import.go index 3b0db03061aa..4fbcad175df7 100644 --- a/cmd/validator/accounts/import.go +++ b/cmd/validator/accounts/import.go @@ -4,15 +4,15 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/accounts/import_test.go b/cmd/validator/accounts/import_test.go index afd8e4331977..51e174a0c1f4 100644 --- a/cmd/validator/accounts/import_test.go +++ b/cmd/validator/accounts/import_test.go @@ -11,14 +11,14 @@ import ( "time" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/cmd/validator/accounts/list.go b/cmd/validator/accounts/list.go index 93a21ab1cbbc..5eb22f113067 100644 --- a/cmd/validator/accounts/list.go +++ b/cmd/validator/accounts/list.go @@ -3,10 +3,10 @@ package accounts import ( "strings" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/client" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/client" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/accounts/wallet_utils.go b/cmd/validator/accounts/wallet_utils.go index 66a807f5334a..5551a3309ffb 100644 --- a/cmd/validator/accounts/wallet_utils.go +++ b/cmd/validator/accounts/wallet_utils.go @@ -4,11 +4,11 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - remote_web3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + remote_web3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/accounts/wallet_utils_test.go b/cmd/validator/accounts/wallet_utils_test.go index 2e2fae5ada2d..d2407a1c582a 100644 --- a/cmd/validator/accounts/wallet_utils_test.go +++ b/cmd/validator/accounts/wallet_utils_test.go @@ -8,12 +8,12 @@ import ( "time" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - "github.com/prysmaticlabs/prysm/v3/validator/node" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/validator/node" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/db/BUILD.bazel b/cmd/validator/db/BUILD.bazel index 63efad6df8d5..c694518628d2 100644 --- a/cmd/validator/db/BUILD.bazel +++ b/cmd/validator/db/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["db.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator/db", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator/db", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/cmd/validator/db/db.go b/cmd/validator/db/db.go index 537958de1e5f..feaf5d2f490c 100644 --- a/cmd/validator/db/db.go +++ b/cmd/validator/db/db.go @@ -1,9 +1,9 @@ package db import ( - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" - validatordb "github.com/prysmaticlabs/prysm/v3/validator/db" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" + validatordb "github.com/prysmaticlabs/prysm/v4/validator/db" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/flags/BUILD.bazel b/cmd/validator/flags/BUILD.bazel index 40d4076709ed..6bece501cd74 100644 --- a/cmd/validator/flags/BUILD.bazel +++ b/cmd/validator/flags/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "flags.go", "interop.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags", visibility = [ "//cmd/prysmctl:__subpackages__", "//cmd/validator:__subpackages__", diff --git a/cmd/validator/flags/flags.go b/cmd/validator/flags/flags.go index 3cbe243a8449..f8b420a9b76f 100644 --- a/cmd/validator/flags/flags.go +++ b/cmd/validator/flags/flags.go @@ -8,8 +8,8 @@ import ( "runtime" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/flags/flags_test.go b/cmd/validator/flags/flags_test.go index 312c295c443b..922a38a60790 100644 --- a/cmd/validator/flags/flags_test.go +++ b/cmd/validator/flags/flags_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/main.go b/cmd/validator/main.go index 76a4f30be8e1..6ec9a7892ab6 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -11,23 +11,23 @@ import ( runtimeDebug "runtime/debug" joonix "github.com/joonix/log" - "github.com/prysmaticlabs/prysm/v3/cmd" - accountcommands "github.com/prysmaticlabs/prysm/v3/cmd/validator/accounts" - dbcommands "github.com/prysmaticlabs/prysm/v3/cmd/validator/db" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - slashingprotectioncommands "github.com/prysmaticlabs/prysm/v3/cmd/validator/slashing-protection" - walletcommands "github.com/prysmaticlabs/prysm/v3/cmd/validator/wallet" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/web" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/monitoring/journald" - "github.com/prysmaticlabs/prysm/v3/runtime/debug" - prefixed "github.com/prysmaticlabs/prysm/v3/runtime/logging/logrus-prefixed-formatter" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/validator/node" + "github.com/prysmaticlabs/prysm/v4/cmd" + accountcommands "github.com/prysmaticlabs/prysm/v4/cmd/validator/accounts" + dbcommands "github.com/prysmaticlabs/prysm/v4/cmd/validator/db" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + slashingprotectioncommands "github.com/prysmaticlabs/prysm/v4/cmd/validator/slashing-protection" + walletcommands "github.com/prysmaticlabs/prysm/v4/cmd/validator/wallet" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/web" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/monitoring/journald" + "github.com/prysmaticlabs/prysm/v4/runtime/debug" + prefixed "github.com/prysmaticlabs/prysm/v4/runtime/logging/logrus-prefixed-formatter" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/validator/node" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/slashing-protection/BUILD.bazel b/cmd/validator/slashing-protection/BUILD.bazel index 6ba84404c121..e3490af3baf4 100644 --- a/cmd/validator/slashing-protection/BUILD.bazel +++ b/cmd/validator/slashing-protection/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "log.go", "slashing-protection.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator/slashing-protection", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator/slashing-protection", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/cmd/validator/slashing-protection/export.go b/cmd/validator/slashing-protection/export.go index ab3f65a2f0af..ffbd717bd1fc 100644 --- a/cmd/validator/slashing-protection/export.go +++ b/cmd/validator/slashing-protection/export.go @@ -6,12 +6,12 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - slashingprotection "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + slashingprotection "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/slashing-protection/import.go b/cmd/validator/slashing-protection/import.go index 6ceb0ee21d7d..a3ef178ab99a 100644 --- a/cmd/validator/slashing-protection/import.go +++ b/cmd/validator/slashing-protection/import.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - slashingprotection "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + slashingprotection "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/slashing-protection/import_export_test.go b/cmd/validator/slashing-protection/import_export_test.go index 4dc411e90752..9d1729a210ad 100644 --- a/cmd/validator/slashing-protection/import_export_test.go +++ b/cmd/validator/slashing-protection/import_export_test.go @@ -6,15 +6,15 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - dbTest "github.com/prysmaticlabs/prysm/v3/validator/db/testing" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" - mocks "github.com/prysmaticlabs/prysm/v3/validator/testing" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + dbTest "github.com/prysmaticlabs/prysm/v4/validator/db/testing" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" + mocks "github.com/prysmaticlabs/prysm/v4/validator/testing" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/slashing-protection/slashing-protection.go b/cmd/validator/slashing-protection/slashing-protection.go index df79218846a8..bcca6ac577b2 100644 --- a/cmd/validator/slashing-protection/slashing-protection.go +++ b/cmd/validator/slashing-protection/slashing-protection.go @@ -1,10 +1,10 @@ package historycmd import ( - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/usage.go b/cmd/validator/usage.go index e7bf1345d673..b6ea273f849d 100644 --- a/cmd/validator/usage.go +++ b/cmd/validator/usage.go @@ -5,10 +5,10 @@ import ( "io" "sort" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/debug" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/debug" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/usage_test.go b/cmd/validator/usage_test.go index 15e3bac8da0f..720cf168da4d 100644 --- a/cmd/validator/usage_test.go +++ b/cmd/validator/usage_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/features" + "github.com/prysmaticlabs/prysm/v4/config/features" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/wallet/BUILD.bazel b/cmd/validator/wallet/BUILD.bazel index 40ce0cd15051..f7c059952ad1 100644 --- a/cmd/validator/wallet/BUILD.bazel +++ b/cmd/validator/wallet/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "recover.go", "wallet.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator/wallet", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator/wallet", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/cmd/validator/wallet/create.go b/cmd/validator/wallet/create.go index da54709a9475..fc10f9edb70f 100644 --- a/cmd/validator/wallet/create.go +++ b/cmd/validator/wallet/create.go @@ -7,12 +7,12 @@ import ( "github.com/manifoldco/promptui" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/wallet/create_test.go b/cmd/validator/wallet/create_test.go index 9de0bd018f56..ca57732d8b92 100644 --- a/cmd/validator/wallet/create_test.go +++ b/cmd/validator/wallet/create_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/pkg/errors" - cmdacc "github.com/prysmaticlabs/prysm/v3/cmd/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + cmdacc "github.com/prysmaticlabs/prysm/v4/cmd/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" diff --git a/cmd/validator/wallet/recover.go b/cmd/validator/wallet/recover.go index 7f6bbeedf33b..7143b5c9ccb2 100644 --- a/cmd/validator/wallet/recover.go +++ b/cmd/validator/wallet/recover.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" "github.com/tyler-smith/go-bip39" "github.com/tyler-smith/go-bip39/wordlists" "github.com/urfave/cli/v2" diff --git a/cmd/validator/wallet/recover_test.go b/cmd/validator/wallet/recover_test.go index a9199832708f..d2ae1628efe5 100644 --- a/cmd/validator/wallet/recover_test.go +++ b/cmd/validator/wallet/recover_test.go @@ -8,13 +8,13 @@ import ( "strconv" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/wallet/wallet.go b/cmd/validator/wallet/wallet.go index c7737aa9ba55..5328d6b0fb57 100644 --- a/cmd/validator/wallet/wallet.go +++ b/cmd/validator/wallet/wallet.go @@ -1,10 +1,10 @@ package wallet import ( - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/cmd/validator/web/BUILD.bazel b/cmd/validator/web/BUILD.bazel index b1ec45e6d504..7c0c0fe9db96 100644 --- a/cmd/validator/web/BUILD.bazel +++ b/cmd/validator/web/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "web.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/cmd/validator/web", + importpath = "github.com/prysmaticlabs/prysm/v4/cmd/validator/web", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/cmd/validator/web/web.go b/cmd/validator/web/web.go index 6febfb31149f..4de8a1c31f7a 100644 --- a/cmd/validator/web/web.go +++ b/cmd/validator/web/web.go @@ -3,11 +3,11 @@ package web import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/runtime/tos" - "github.com/prysmaticlabs/prysm/v3/validator/rpc" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/runtime/tos" + "github.com/prysmaticlabs/prysm/v4/validator/rpc" "github.com/urfave/cli/v2" ) diff --git a/config/features/BUILD.bazel b/config/features/BUILD.bazel index 4273542f4277..dac0d80a4002 100644 --- a/config/features/BUILD.bazel +++ b/config/features/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "filter_flags.go", "flags.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/config/features", + importpath = "github.com/prysmaticlabs/prysm/v4/config/features", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/config/features/config.go b/config/features/config.go index 6a07f4f6ad78..a49554a68ad1 100644 --- a/config/features/config.go +++ b/config/features/config.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/config/features/config_test.go b/config/features/config_test.go index c100f6b56c32..b61219a5e2e9 100644 --- a/config/features/config_test.go +++ b/config/features/config_test.go @@ -4,8 +4,8 @@ import ( "flag" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/config/features/deprecated_flags_test.go b/config/features/deprecated_flags_test.go index ec07720864a1..13f2d379a7e9 100644 --- a/config/features/deprecated_flags_test.go +++ b/config/features/deprecated_flags_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestDeprecatedFlags(t *testing.T) { diff --git a/config/fieldparams/BUILD.bazel b/config/fieldparams/BUILD.bazel index 68f7657ec982..1e0d2af074cb 100644 --- a/config/fieldparams/BUILD.bazel +++ b/config/fieldparams/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "//config:mainnet": ["mainnet.go"], "//config:minimal": ["minimal.go"], }), - importpath = "github.com/prysmaticlabs/prysm/v3/config/fieldparams", + importpath = "github.com/prysmaticlabs/prysm/v4/config/fieldparams", visibility = ["//visibility:public"], ) diff --git a/config/fieldparams/common_test.go b/config/fieldparams/common_test.go index f2e1f8009ba7..61884630947a 100644 --- a/config/fieldparams/common_test.go +++ b/config/fieldparams/common_test.go @@ -3,9 +3,9 @@ package field_params_test import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func testFieldParametersMatchConfig(t *testing.T) { diff --git a/config/fieldparams/mainnet_test.go b/config/fieldparams/mainnet_test.go index 5634ea51be54..ef42acef56fe 100644 --- a/config/fieldparams/mainnet_test.go +++ b/config/fieldparams/mainnet_test.go @@ -5,9 +5,9 @@ package field_params_test import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFieldParametersValues(t *testing.T) { diff --git a/config/fieldparams/minimal_test.go b/config/fieldparams/minimal_test.go index e18537c74701..617599092551 100644 --- a/config/fieldparams/minimal_test.go +++ b/config/fieldparams/minimal_test.go @@ -5,9 +5,9 @@ package field_params_test import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFieldParametersValues(t *testing.T) { diff --git a/config/params/BUILD.bazel b/config/params/BUILD.bazel index c2d3f659166f..be0854db9df5 100644 --- a/config/params/BUILD.bazel +++ b/config/params/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "testutils_develop.go", # keep "values.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/config/params", + importpath = "github.com/prysmaticlabs/prysm/v4/config/params", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/config/params/config.go b/config/params/config.go index 6a3482222084..dc58f6921fc4 100644 --- a/config/params/config.go +++ b/config/params/config.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // BeaconChainConfig contains constant configs for node to participate in beacon chain. diff --git a/config/params/config_test.go b/config/params/config_test.go index 0aeaeb053097..8093e5241ae0 100644 --- a/config/params/config_test.go +++ b/config/params/config_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) // Test cases can be executed in an arbitrary order. TestOverrideBeaconConfigTestTeardown checks diff --git a/config/params/configset.go b/config/params/configset.go index 0c9b4f1382d5..85e68b30f4f2 100644 --- a/config/params/configset.go +++ b/config/params/configset.go @@ -2,7 +2,7 @@ package params import ( "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" ) var configs *configset diff --git a/config/params/configset_test.go b/config/params/configset_test.go index 518e17e39ba6..d206148f9564 100644 --- a/config/params/configset_test.go +++ b/config/params/configset_test.go @@ -3,8 +3,8 @@ package params import ( "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestConfigset_Add(t *testing.T) { diff --git a/config/params/loader.go b/config/params/loader.go index 34d820954263..eccd426130e2 100644 --- a/config/params/loader.go +++ b/config/params/loader.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/math" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) diff --git a/config/params/loader_test.go b/config/params/loader_test.go index 45cc3102f38f..e291831ae024 100644 --- a/config/params/loader_test.go +++ b/config/params/loader_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "gopkg.in/yaml.v2" ) diff --git a/config/params/mainnet_config.go b/config/params/mainnet_config.go index 49a7aa38c056..b6c338c03a9e 100644 --- a/config/params/mainnet_config.go +++ b/config/params/mainnet_config.go @@ -4,8 +4,8 @@ import ( "math" "time" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // MainnetConfig returns the configuration to be used in the main network. diff --git a/config/params/minimal_config.go b/config/params/minimal_config.go index f954e6059c0e..f41d9ae8a8a6 100644 --- a/config/params/minimal_config.go +++ b/config/params/minimal_config.go @@ -3,7 +3,7 @@ package params import ( "math" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) // MinimalSpecConfig retrieves the minimal config used in spec tests. diff --git a/config/params/network_config.go b/config/params/network_config.go index 88c421b84661..4ad6c97e839c 100644 --- a/config/params/network_config.go +++ b/config/params/network_config.go @@ -4,7 +4,7 @@ import ( "time" "github.com/mohae/deepcopy" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // NetworkConfig defines the spec based network parameters. diff --git a/config/params/testnet_config_test.go b/config/params/testnet_config_test.go index 9f4285235cab..4883cca55762 100644 --- a/config/params/testnet_config_test.go +++ b/config/params/testnet_config_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func testnetConfigFilePath(t *testing.T, network string) string { diff --git a/config/params/testnet_prater_config_test.go b/config/params/testnet_prater_config_test.go index 6625747a7972..ab284272695c 100644 --- a/config/params/testnet_prater_config_test.go +++ b/config/params/testnet_prater_config_test.go @@ -3,8 +3,8 @@ package params_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPraterConfigMatchesUpstreamYaml(t *testing.T) { diff --git a/config/validator/service/BUILD.bazel b/config/validator/service/BUILD.bazel index 595940661b28..1422a7cb3a43 100644 --- a/config/validator/service/BUILD.bazel +++ b/config/validator/service/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["proposer-settings.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/config/validator/service", + importpath = "github.com/prysmaticlabs/prysm/v4/config/validator/service", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/config/validator/service/proposer-settings.go b/config/validator/service/proposer-settings.go index 8496f8f0e9fb..feff58a75796 100644 --- a/config/validator/service/proposer-settings.go +++ b/config/validator/service/proposer-settings.go @@ -4,7 +4,7 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" ) // ProposerSettingsPayload is the struct representation of the JSON or YAML payload set in the validator through the CLI. diff --git a/consensus-types/blocks/BUILD.bazel b/consensus-types/blocks/BUILD.bazel index be78583c0eb2..f47bb3ad9b19 100644 --- a/consensus-types/blocks/BUILD.bazel +++ b/consensus-types/blocks/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "setters.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/consensus-types/blocks/execution.go b/consensus-types/blocks/execution.go index dcd2683f6f80..a0c97e161430 100644 --- a/consensus-types/blocks/execution.go +++ b/consensus-types/blocks/execution.go @@ -6,11 +6,11 @@ import ( "math/big" fastssz "github.com/prysmaticlabs/fastssz" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" "google.golang.org/protobuf/proto" ) diff --git a/consensus-types/blocks/execution_test.go b/consensus-types/blocks/execution_test.go index 609b192cf129..eb8afa99bdb5 100644 --- a/consensus-types/blocks/execution_test.go +++ b/consensus-types/blocks/execution_test.go @@ -4,12 +4,12 @@ import ( "math/big" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestWrapExecutionPayload(t *testing.T) { diff --git a/consensus-types/blocks/factory.go b/consensus-types/blocks/factory.go index 66a897b854ad..1e91daf56b26 100644 --- a/consensus-types/blocks/factory.go +++ b/consensus-types/blocks/factory.go @@ -5,10 +5,10 @@ import ( "math/big" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) var ( diff --git a/consensus-types/blocks/factory_test.go b/consensus-types/blocks/factory_test.go index ca9eaf424878..dba7164c8e87 100644 --- a/consensus-types/blocks/factory_test.go +++ b/consensus-types/blocks/factory_test.go @@ -5,13 +5,13 @@ import ( "errors" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_NewSignedBeaconBlock(t *testing.T) { diff --git a/consensus-types/blocks/getters.go b/consensus-types/blocks/getters.go index 7625f350733f..c184314e223d 100644 --- a/consensus-types/blocks/getters.go +++ b/consensus-types/blocks/getters.go @@ -6,13 +6,13 @@ import ( "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - field_params "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + field_params "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // BeaconBlockIsNil checks if any composite field of input signed beacon block is nil. diff --git a/consensus-types/blocks/getters_test.go b/consensus-types/blocks/getters_test.go index 2758034b0f78..066180b68673 100644 --- a/consensus-types/blocks/getters_test.go +++ b/consensus-types/blocks/getters_test.go @@ -5,16 +5,16 @@ import ( "testing" ssz "github.com/prysmaticlabs/fastssz" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_BeaconBlockIsNil(t *testing.T) { diff --git a/consensus-types/blocks/proto.go b/consensus-types/blocks/proto.go index aa9ee8a06d41..c2a1a4af05df 100644 --- a/consensus-types/blocks/proto.go +++ b/consensus-types/blocks/proto.go @@ -4,10 +4,10 @@ import ( "math/big" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/protobuf/proto" ) diff --git a/consensus-types/blocks/proto_test.go b/consensus-types/blocks/proto_test.go index e3a2abb52ff5..8724fcc321df 100644 --- a/consensus-types/blocks/proto_test.go +++ b/consensus-types/blocks/proto_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type fields struct { diff --git a/consensus-types/blocks/setters.go b/consensus-types/blocks/setters.go index ed8ca4f0f606..f7dd4802b933 100644 --- a/consensus-types/blocks/setters.go +++ b/consensus-types/blocks/setters.go @@ -1,10 +1,10 @@ package blocks import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // SetSignature sets the signature of the signed beacon block. diff --git a/consensus-types/blocks/testing/BUILD.bazel b/consensus-types/blocks/testing/BUILD.bazel index 1fb31caddd04..a82c500c9350 100644 --- a/consensus-types/blocks/testing/BUILD.bazel +++ b/consensus-types/blocks/testing/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "factory.go", "mutator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing", visibility = ["//visibility:public"], deps = [ "//consensus-types/blocks:go_default_library", diff --git a/consensus-types/blocks/testing/factory.go b/consensus-types/blocks/testing/factory.go index 04fde668e019..c49bd19e89d1 100644 --- a/consensus-types/blocks/testing/factory.go +++ b/consensus-types/blocks/testing/factory.go @@ -2,9 +2,9 @@ package testing import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // NewSignedBeaconBlockFromGeneric creates a signed beacon block diff --git a/consensus-types/blocks/testing/mutator.go b/consensus-types/blocks/testing/mutator.go index 23da634a076e..ff7d0fea7653 100644 --- a/consensus-types/blocks/testing/mutator.go +++ b/consensus-types/blocks/testing/mutator.go @@ -1,11 +1,11 @@ package testing import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) type blockMutator struct { diff --git a/consensus-types/blocks/types.go b/consensus-types/blocks/types.go index b31ddcad2daa..78d3cb6f6572 100644 --- a/consensus-types/blocks/types.go +++ b/consensus-types/blocks/types.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/pkg/errors" - field_params "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + field_params "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) var ( diff --git a/consensus-types/interfaces/BUILD.bazel b/consensus-types/interfaces/BUILD.bazel index 664f534f0613..83a1bc4af6e5 100644 --- a/consensus-types/interfaces/BUILD.bazel +++ b/consensus-types/interfaces/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "beacon_block.go", "utils.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/consensus-types/interfaces/beacon_block.go b/consensus-types/interfaces/beacon_block.go index 8a0b9b7bd98d..246407aa4553 100644 --- a/consensus-types/interfaces/beacon_block.go +++ b/consensus-types/interfaces/beacon_block.go @@ -4,11 +4,11 @@ import ( "math/big" ssz "github.com/prysmaticlabs/fastssz" - field_params "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" + field_params "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" "google.golang.org/protobuf/proto" ) diff --git a/consensus-types/interfaces/utils.go b/consensus-types/interfaces/utils.go index 7beb0fc8e3b6..dcab9afa31a7 100644 --- a/consensus-types/interfaces/utils.go +++ b/consensus-types/interfaces/utils.go @@ -2,7 +2,7 @@ package interfaces import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SignedBeaconBlockHeaderFromBlock function to retrieve signed block header from block. diff --git a/consensus-types/interfaces/utils_test.go b/consensus-types/interfaces/utils_test.go index d963b3909fec..0c47b9b24435 100644 --- a/consensus-types/interfaces/utils_test.go +++ b/consensus-types/interfaces/utils_test.go @@ -3,13 +3,13 @@ package interfaces_test import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBeaconBlockHeaderFromBlock(t *testing.T) { diff --git a/consensus-types/mock/BUILD.bazel b/consensus-types/mock/BUILD.bazel index 8b4351948a30..d202a720b177 100644 --- a/consensus-types/mock/BUILD.bazel +++ b/consensus-types/mock/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["block.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/mock", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/consensus-types/mock/block.go b/consensus-types/mock/block.go index 3b2046b699de..66ab1f788317 100644 --- a/consensus-types/mock/block.go +++ b/consensus-types/mock/block.go @@ -2,11 +2,11 @@ package mock import ( ssz "github.com/prysmaticlabs/fastssz" - field_params "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" + field_params "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" "google.golang.org/protobuf/proto" ) diff --git a/consensus-types/payload-attribute/BUILD.bazel b/consensus-types/payload-attribute/BUILD.bazel index 59d8af0757e0..6d05d04955fe 100644 --- a/consensus-types/payload-attribute/BUILD.bazel +++ b/consensus-types/payload-attribute/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "interface.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute", visibility = ["//visibility:public"], deps = [ "//consensus-types/blocks:go_default_library", diff --git a/consensus-types/payload-attribute/getters.go b/consensus-types/payload-attribute/getters.go index ebba2599f1b3..03059fa2c48c 100644 --- a/consensus-types/payload-attribute/getters.go +++ b/consensus-types/payload-attribute/getters.go @@ -1,9 +1,9 @@ package payloadattribute import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // Version returns the version of the payload attribute. diff --git a/consensus-types/payload-attribute/getters_test.go b/consensus-types/payload-attribute/getters_test.go index cb357bd4a632..20500e77f15c 100644 --- a/consensus-types/payload-attribute/getters_test.go +++ b/consensus-types/payload-attribute/getters_test.go @@ -3,9 +3,9 @@ package payloadattribute import ( "testing" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/require" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPayloadAttributeGetters(t *testing.T) { diff --git a/consensus-types/payload-attribute/interface.go b/consensus-types/payload-attribute/interface.go index 0c507d758eea..2a4d5ae317d9 100644 --- a/consensus-types/payload-attribute/interface.go +++ b/consensus-types/payload-attribute/interface.go @@ -1,7 +1,7 @@ package payloadattribute import ( - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" ) type Attributer interface { diff --git a/consensus-types/payload-attribute/types.go b/consensus-types/payload-attribute/types.go index 2f48b9e9e08c..a0cb58459f7f 100644 --- a/consensus-types/payload-attribute/types.go +++ b/consensus-types/payload-attribute/types.go @@ -2,9 +2,9 @@ package payloadattribute import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) var ( diff --git a/consensus-types/primitives/BUILD.bazel b/consensus-types/primitives/BUILD.bazel index db8c3c757858..f33c9c766d9a 100644 --- a/consensus-types/primitives/BUILD.bazel +++ b/consensus-types/primitives/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "sszuint64.go", "validator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives", visibility = ["//visibility:public"], deps = [ "//math:go_default_library", diff --git a/consensus-types/primitives/epoch.go b/consensus-types/primitives/epoch.go index 0318e8059da3..6b575c5096d4 100644 --- a/consensus-types/primitives/epoch.go +++ b/consensus-types/primitives/epoch.go @@ -4,7 +4,7 @@ import ( "fmt" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/math" ) var _ fssz.HashRoot = (Epoch)(0) diff --git a/consensus-types/primitives/epoch_test.go b/consensus-types/primitives/epoch_test.go index 69d0e202b262..3d851f577497 100644 --- a/consensus-types/primitives/epoch_test.go +++ b/consensus-types/primitives/epoch_test.go @@ -5,9 +5,9 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - mathprysm "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + mathprysm "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestMaxEpoch(t *testing.T) { diff --git a/consensus-types/primitives/slot.go b/consensus-types/primitives/slot.go index c4ff9d9ae512..8f62a2cc804b 100644 --- a/consensus-types/primitives/slot.go +++ b/consensus-types/primitives/slot.go @@ -4,7 +4,7 @@ import ( "fmt" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/math" ) var _ fssz.HashRoot = (Slot)(0) diff --git a/consensus-types/primitives/slot_test.go b/consensus-types/primitives/slot_test.go index ed129268ce43..1e79db4f5ac4 100644 --- a/consensus-types/primitives/slot_test.go +++ b/consensus-types/primitives/slot_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - mathprysm "github.com/prysmaticlabs/prysm/v3/math" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + mathprysm "github.com/prysmaticlabs/prysm/v4/math" ) func TestSlot_Casting(t *testing.T) { diff --git a/consensus-types/primitives/sszbytes_test.go b/consensus-types/primitives/sszbytes_test.go index 5ea8accd54c7..38f27c3fba59 100644 --- a/consensus-types/primitives/sszbytes_test.go +++ b/consensus-types/primitives/sszbytes_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) func TestSSZBytes_HashTreeRoot(t *testing.T) { diff --git a/consensus-types/primitives/sszuint64_test.go b/consensus-types/primitives/sszuint64_test.go index bfae28545e6a..63d4775083b5 100644 --- a/consensus-types/primitives/sszuint64_test.go +++ b/consensus-types/primitives/sszuint64_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) func TestSSZUint64_Limit(t *testing.T) { diff --git a/consensus-types/wrapper/BUILD.bazel b/consensus-types/wrapper/BUILD.bazel index 9accb4ff4fb4..aec9b0b85044 100644 --- a/consensus-types/wrapper/BUILD.bazel +++ b/consensus-types/wrapper/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["metadata.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/consensus-types/wrapper", + importpath = "github.com/prysmaticlabs/prysm/v4/consensus-types/wrapper", visibility = ["//visibility:public"], deps = [ "//proto/prysm/v1alpha1:go_default_library", diff --git a/consensus-types/wrapper/metadata.go b/consensus-types/wrapper/metadata.go index 605150ce4fc2..2a5d068d9f1a 100644 --- a/consensus-types/wrapper/metadata.go +++ b/consensus-types/wrapper/metadata.go @@ -2,9 +2,9 @@ package wrapper import ( "github.com/prysmaticlabs/go-bitfield" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/protobuf/proto" ) diff --git a/container/doubly-linked-list/BUILD.bazel b/container/doubly-linked-list/BUILD.bazel index f5e2ffa8812b..76821cafd77b 100644 --- a/container/doubly-linked-list/BUILD.bazel +++ b/container/doubly-linked-list/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["list.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/container/doubly-linked-list", + importpath = "github.com/prysmaticlabs/prysm/v4/container/doubly-linked-list", visibility = ["//visibility:public"], deps = ["@com_github_pkg_errors//:go_default_library"], ) diff --git a/container/doubly-linked-list/list_test.go b/container/doubly-linked-list/list_test.go index 30a19f2f60b5..2ca20fd32c8c 100644 --- a/container/doubly-linked-list/list_test.go +++ b/container/doubly-linked-list/list_test.go @@ -3,8 +3,8 @@ package doublylinkedlist import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestAppend(t *testing.T) { diff --git a/container/leaky-bucket/BUILD.bazel b/container/leaky-bucket/BUILD.bazel index b57a9cda4d69..8454090a8554 100644 --- a/container/leaky-bucket/BUILD.bazel +++ b/container/leaky-bucket/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "heap.go", "leakybucket.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/container/leaky-bucket", + importpath = "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket", visibility = ["//visibility:public"], ) diff --git a/container/queue/BUILD.bazel b/container/queue/BUILD.bazel index c1e081012023..2f85dfcd2b1b 100644 --- a/container/queue/BUILD.bazel +++ b/container/queue/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["priority_queue.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/container/queue", + importpath = "github.com/prysmaticlabs/prysm/v4/container/queue", visibility = ["//visibility:public"], ) diff --git a/container/queue/priority_queue_test.go b/container/queue/priority_queue_test.go index 8e2a2f6fb181..ae8ed21130d1 100644 --- a/container/queue/priority_queue_test.go +++ b/container/queue/priority_queue_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // Ensure we satisfy the heap.Interface diff --git a/container/slice/BUILD.bazel b/container/slice/BUILD.bazel index 0e86bbb18885..cccd2eee08ef 100644 --- a/container/slice/BUILD.bazel +++ b/container/slice/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "doc.go", "slice.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/container/slice", + importpath = "github.com/prysmaticlabs/prysm/v4/container/slice", visibility = ["//visibility:public"], deps = ["//consensus-types/primitives:go_default_library"], ) diff --git a/container/slice/slice.go b/container/slice/slice.go index 141543ccf827..2336adc14684 100644 --- a/container/slice/slice.go +++ b/container/slice/slice.go @@ -3,7 +3,7 @@ package slice import ( "strings" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // SubsetUint64 returns true if the first array is diff --git a/container/slice/slice_test.go b/container/slice/slice_test.go index 53707cd083cc..d07a5dd436d3 100644 --- a/container/slice/slice_test.go +++ b/container/slice/slice_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSubsetUint64(t *testing.T) { diff --git a/container/thread-safe/BUILD.bazel b/container/thread-safe/BUILD.bazel index 7b2d756aa0f9..35054ee72978 100644 --- a/container/thread-safe/BUILD.bazel +++ b/container/thread-safe/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["map.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/container/thread-safe", + importpath = "github.com/prysmaticlabs/prysm/v4/container/thread-safe", visibility = ["//visibility:public"], ) diff --git a/container/thread-safe/map_test.go b/container/thread-safe/map_test.go index ca356fb5ca63..73e34b3e4073 100644 --- a/container/thread-safe/map_test.go +++ b/container/thread-safe/map_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type safeMap struct { diff --git a/container/trie/BUILD.bazel b/container/trie/BUILD.bazel index 595e726c082b..bf8e3d55d810 100644 --- a/container/trie/BUILD.bazel +++ b/container/trie/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "sparse_merkle.go", "zerohashes.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/container/trie", + importpath = "github.com/prysmaticlabs/prysm/v4/container/trie", visibility = ["//visibility:public"], deps = [ "//crypto/hash:go_default_library", diff --git a/container/trie/sparse_merkle.go b/container/trie/sparse_merkle.go index 3a19de565f85..55991ad33945 100644 --- a/container/trie/sparse_merkle.go +++ b/container/trie/sparse_merkle.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - protodb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + protodb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // SparseMerkleTrie implements a sparse, general purpose Merkle trie to be used diff --git a/container/trie/sparse_merkle_test.go b/container/trie/sparse_merkle_test.go index f32df7f37e6b..176d60da9227 100644 --- a/container/trie/sparse_merkle_test.go +++ b/container/trie/sparse_merkle_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/ethereum/go-ethereum/accounts/abi/bind" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestCreateTrieFromProto_Validation(t *testing.T) { diff --git a/container/trie/sparse_merkle_trie_fuzz_test.go b/container/trie/sparse_merkle_trie_fuzz_test.go index d6245dae76d7..971e8b18b380 100644 --- a/container/trie/sparse_merkle_trie_fuzz_test.go +++ b/container/trie/sparse_merkle_trie_fuzz_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/golang/protobuf/proto" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func FuzzSparseMerkleTrie_HashTreeRoot(f *testing.F) { diff --git a/contracts/deposit/BUILD.bazel b/contracts/deposit/BUILD.bazel index 5d39d5b1ea85..f4dddbba21c7 100644 --- a/contracts/deposit/BUILD.bazel +++ b/contracts/deposit/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "helper.go", "logs.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/contracts/deposit", + importpath = "github.com/prysmaticlabs/prysm/v4/contracts/deposit", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/signing:go_default_library", diff --git a/contracts/deposit/contract_test.go b/contracts/deposit/contract_test.go index d83035c0c4c4..ee869eba411a 100644 --- a/contracts/deposit/contract_test.go +++ b/contracts/deposit/contract_test.go @@ -7,11 +7,11 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" - depositcontract "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + depositcontract "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSetupRegistrationContract_OK(t *testing.T) { diff --git a/contracts/deposit/deposit.go b/contracts/deposit/deposit.go index 99e5e43cb489..d13b64a57318 100644 --- a/contracts/deposit/deposit.go +++ b/contracts/deposit/deposit.go @@ -4,11 +4,11 @@ package deposit import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // DepositInput for a given key. This input data can be used to when making a diff --git a/contracts/deposit/deposit_test.go b/contracts/deposit/deposit_test.go index afe3799e08b5..918a782dc28e 100644 --- a/contracts/deposit/deposit_test.go +++ b/contracts/deposit/deposit_test.go @@ -3,14 +3,14 @@ package deposit_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestDepositInput_GeneratesPb(t *testing.T) { diff --git a/contracts/deposit/deposit_tree_test.go b/contracts/deposit/deposit_tree_test.go index ce0461b15d62..b77a42d05ea0 100644 --- a/contracts/deposit/deposit_tree_test.go +++ b/contracts/deposit/deposit_tree_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - depositcontract "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + depositcontract "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDepositTrieRoot_OK(t *testing.T) { diff --git a/contracts/deposit/mock/BUILD.bazel b/contracts/deposit/mock/BUILD.bazel index d69d034b5357..7cc6fd78dd32 100644 --- a/contracts/deposit/mock/BUILD.bazel +++ b/contracts/deposit/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/contracts/deposit/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/contracts/deposit/mock", visibility = ["//visibility:public"], deps = [ "//contracts/deposit:go_default_library", diff --git a/contracts/deposit/mock/mock.go b/contracts/deposit/mock/mock.go index 5a85c7387efe..e2bc9cdfc5cb 100644 --- a/contracts/deposit/mock/mock.go +++ b/contracts/deposit/mock/mock.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/prysmaticlabs/prysm/v3/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/contracts/deposit" ) var ( diff --git a/crypto/bls/BUILD.bazel b/crypto/bls/BUILD.bazel index 060912d2dbe6..7513bed70156 100644 --- a/crypto/bls/BUILD.bazel +++ b/crypto/bls/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "interface.go", "signature_batch.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/bls", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/bls", visibility = ["//visibility:public"], deps = [ "//crypto/bls/blst:go_default_library", diff --git a/crypto/bls/bls.go b/crypto/bls/bls.go index ae79ecdbe2bf..921c1396ec78 100644 --- a/crypto/bls/bls.go +++ b/crypto/bls/bls.go @@ -4,9 +4,9 @@ package bls import ( - "github.com/prysmaticlabs/prysm/v3/crypto/bls/blst" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/herumi" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/herumi" ) // Initialize herumi temporarily while we transition to blst for ethdo. diff --git a/crypto/bls/bls_test.go b/crypto/bls/bls_test.go index 0c81e12bca77..689d8af29766 100644 --- a/crypto/bls/bls_test.go +++ b/crypto/bls/bls_test.go @@ -3,8 +3,8 @@ package bls import ( "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDisallowZeroSecretKeys(t *testing.T) { diff --git a/crypto/bls/blst/BUILD.bazel b/crypto/bls/blst/BUILD.bazel index 308dfd4d32a5..e9cdf5f2fcc5 100644 --- a/crypto/bls/blst/BUILD.bazel +++ b/crypto/bls/blst/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "signature.go", "stub.go", # keep ], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/bls/blst", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/bls/blst", visibility = ["//visibility:public"], deps = [ "//cache/lru:go_default_library", diff --git a/crypto/bls/blst/bls_benchmark_test.go b/crypto/bls/blst/bls_benchmark_test.go index c940bccba9aa..8c2a739cf58e 100644 --- a/crypto/bls/blst/bls_benchmark_test.go +++ b/crypto/bls/blst/bls_benchmark_test.go @@ -5,9 +5,9 @@ package blst_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/blst" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func BenchmarkSignature_Verify(b *testing.B) { diff --git a/crypto/bls/blst/public_key.go b/crypto/bls/blst/public_key.go index db9777efbc9e..8b5132805183 100644 --- a/crypto/bls/blst/public_key.go +++ b/crypto/bls/blst/public_key.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/pkg/errors" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" ) var maxKeys = 1000000 diff --git a/crypto/bls/blst/public_key_test.go b/crypto/bls/blst/public_key_test.go index fee967efd552..164dc42a6426 100644 --- a/crypto/bls/blst/public_key_test.go +++ b/crypto/bls/blst/public_key_test.go @@ -7,10 +7,10 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/blst" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPublicKeyFromBytes(t *testing.T) { diff --git a/crypto/bls/blst/secret_key.go b/crypto/bls/blst/secret_key.go index da95a67dc290..2148de27e2fe 100644 --- a/crypto/bls/blst/secret_key.go +++ b/crypto/bls/blst/secret_key.go @@ -6,9 +6,9 @@ import ( "crypto/subtle" "fmt" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" blst "github.com/supranational/blst/bindings/go" ) diff --git a/crypto/bls/blst/secret_key_test.go b/crypto/bls/blst/secret_key_test.go index ba6ac88174d4..2d834c5ca9c8 100644 --- a/crypto/bls/blst/secret_key_test.go +++ b/crypto/bls/blst/secret_key_test.go @@ -8,11 +8,11 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/blst" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestMarshalUnmarshal(t *testing.T) { diff --git a/crypto/bls/blst/signature.go b/crypto/bls/blst/signature.go index b6b7c0c300e7..6e007e12ba2c 100644 --- a/crypto/bls/blst/signature.go +++ b/crypto/bls/blst/signature.go @@ -8,9 +8,9 @@ import ( "sync" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" blst "github.com/supranational/blst/bindings/go" ) diff --git a/crypto/bls/blst/signature_test.go b/crypto/bls/blst/signature_test.go index 607a3b94519b..7bdfe05570e2 100644 --- a/crypto/bls/blst/signature_test.go +++ b/crypto/bls/blst/signature_test.go @@ -7,9 +7,9 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSignVerify(t *testing.T) { diff --git a/crypto/bls/blst/stub.go b/crypto/bls/blst/stub.go index 51cdde0e6477..daeb3e3e30ac 100644 --- a/crypto/bls/blst/stub.go +++ b/crypto/bls/blst/stub.go @@ -3,7 +3,7 @@ package blst import ( - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" ) // This stub file exists until build issues can be resolved for libfuzz. diff --git a/crypto/bls/common/BUILD.bazel b/crypto/bls/common/BUILD.bazel index 840b0b0a747d..c6c1cc821614 100644 --- a/crypto/bls/common/BUILD.bazel +++ b/crypto/bls/common/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "error.go", "interface.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/bls/common", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/bls/common", visibility = ["//visibility:public"], deps = ["//config/fieldparams:go_default_library"], ) diff --git a/crypto/bls/common/constants.go b/crypto/bls/common/constants.go index 61f94ee76875..646f3cb447d9 100644 --- a/crypto/bls/common/constants.go +++ b/crypto/bls/common/constants.go @@ -1,6 +1,6 @@ package common -import fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" +import fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" // ZeroSecretKey represents a zero secret key. var ZeroSecretKey = [32]byte{} diff --git a/crypto/bls/common/mock/BUILD.bazel b/crypto/bls/common/mock/BUILD.bazel index fa69fb23f39d..7e16a2a2290c 100644 --- a/crypto/bls/common/mock/BUILD.bazel +++ b/crypto/bls/common/mock/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["interface_mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/bls/common/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/bls/common/mock", visibility = ["//visibility:public"], deps = [ "//crypto/bls/common:go_default_library", diff --git a/crypto/bls/common/mock/interface_mock.go b/crypto/bls/common/mock/interface_mock.go index 13fec4f3b85f..939ccf9b3784 100644 --- a/crypto/bls/common/mock/interface_mock.go +++ b/crypto/bls/common/mock/interface_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - common "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" + common "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" ) // MockSecretKey is a mock of SecretKey interface. diff --git a/crypto/bls/herumi/BUILD.bazel b/crypto/bls/herumi/BUILD.bazel index 078638eac3ae..f002ec6d6aea 100644 --- a/crypto/bls/herumi/BUILD.bazel +++ b/crypto/bls/herumi/BUILD.bazel @@ -5,7 +5,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["init.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/bls/herumi", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/bls/herumi", visibility = [ "//crypto/bls:__pkg__", ], diff --git a/crypto/bls/interface.go b/crypto/bls/interface.go index fdd3c7d38dac..f238406d191d 100644 --- a/crypto/bls/interface.go +++ b/crypto/bls/interface.go @@ -1,7 +1,7 @@ package bls import ( - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" ) // PublicKey represents a BLS public key. diff --git a/crypto/bls/signature_batch_test.go b/crypto/bls/signature_batch_test.go index ccd1aa2d3af6..0429d1f9caaf 100644 --- a/crypto/bls/signature_batch_test.go +++ b/crypto/bls/signature_batch_test.go @@ -7,9 +7,9 @@ import ( "sort" "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) const TestSignature = "test signature" diff --git a/crypto/ecdsa/BUILD.bazel b/crypto/ecdsa/BUILD.bazel index 12af981ce78a..02fdc2c03674 100644 --- a/crypto/ecdsa/BUILD.bazel +++ b/crypto/ecdsa/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["utils.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa", visibility = ["//visibility:public"], deps = [ "@com_github_btcsuite_btcd_btcec_v2//:go_default_library", diff --git a/crypto/ecdsa/utils_test.go b/crypto/ecdsa/utils_test.go index 42453bf43ced..fd9fb03b39bf 100644 --- a/crypto/ecdsa/utils_test.go +++ b/crypto/ecdsa/utils_test.go @@ -9,8 +9,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" gcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/libp2p/go-libp2p/core/crypto" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestConvertToInterfacePubkey(t *testing.T) { diff --git a/crypto/hash/BUILD.bazel b/crypto/hash/BUILD.bazel index 62838e4167c7..493bbc7326de 100644 --- a/crypto/hash/BUILD.bazel +++ b/crypto/hash/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["hash.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/hash", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/hash", visibility = ["//visibility:public"], deps = [ "//encoding/bytesutil:go_default_library", diff --git a/crypto/hash/hash.go b/crypto/hash/hash.go index d64dd4fc456d..16c38dd5ecb7 100644 --- a/crypto/hash/hash.go +++ b/crypto/hash/hash.go @@ -10,7 +10,7 @@ import ( "github.com/minio/highwayhash" "github.com/minio/sha256-simd" fastssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" "golang.org/x/crypto/sha3" "google.golang.org/protobuf/proto" ) diff --git a/crypto/hash/hash_test.go b/crypto/hash/hash_test.go index 836a64c37398..bc3398644833 100644 --- a/crypto/hash/hash_test.go +++ b/crypto/hash/hash_test.go @@ -5,13 +5,13 @@ import ( "testing" fuzz "github.com/google/gofuzz" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - pb "github.com/prysmaticlabs/prysm/v3/proto/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + pb "github.com/prysmaticlabs/prysm/v4/proto/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestHash(t *testing.T) { diff --git a/crypto/hash/htr/BUILD.bazel b/crypto/hash/htr/BUILD.bazel index 116832511bb5..4c20e2c14081 100644 --- a/crypto/hash/htr/BUILD.bazel +++ b/crypto/hash/htr/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["hashtree.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/hash/htr", visibility = ["//visibility:public"], deps = ["@com_github_prysmaticlabs_gohashtree//:go_default_library"], ) diff --git a/crypto/keystore/BUILD.bazel b/crypto/keystore/BUILD.bazel index 66a5c926db66..862987f15b32 100644 --- a/crypto/keystore/BUILD.bazel +++ b/crypto/keystore/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "keystore.go", "utils.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/keystore", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/keystore", visibility = ["//visibility:public"], deps = [ "//crypto/bls:go_default_library", diff --git a/crypto/keystore/key.go b/crypto/keystore/key.go index d104dacb4d4b..dfa90833e99e 100644 --- a/crypto/keystore/key.go +++ b/crypto/keystore/key.go @@ -25,8 +25,8 @@ import ( "path/filepath" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/io/file" ) const ( diff --git a/crypto/keystore/key_test.go b/crypto/keystore/key_test.go index 007bb6a8cafb..ca51468bfed6 100644 --- a/crypto/keystore/key_test.go +++ b/crypto/keystore/key_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestMarshalAndUnmarshal(t *testing.T) { diff --git a/crypto/keystore/keystore.go b/crypto/keystore/keystore.go index 7db814f7d478..adcf782c8e6e 100644 --- a/crypto/keystore/keystore.go +++ b/crypto/keystore/keystore.go @@ -34,7 +34,7 @@ import ( "github.com/minio/sha256-simd" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" log "github.com/sirupsen/logrus" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/crypto/keystore/keystore_test.go b/crypto/keystore/keystore_test.go index 3c3657a1f35a..bd06b9b710c4 100644 --- a/crypto/keystore/keystore_test.go +++ b/crypto/keystore/keystore_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStoreAndGetKey(t *testing.T) { diff --git a/crypto/keystore/utils.go b/crypto/keystore/utils.go index 262857b405ad..3ca14aa8b43c 100644 --- a/crypto/keystore/utils.go +++ b/crypto/keystore/utils.go @@ -25,8 +25,8 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) func aesCTRXOR(key, inText, iv []byte) ([]byte, error) { diff --git a/crypto/rand/BUILD.bazel b/crypto/rand/BUILD.bazel index c8039ec88432..42d9672c4b54 100644 --- a/crypto/rand/BUILD.bazel +++ b/crypto/rand/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["rand.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/crypto/rand", + importpath = "github.com/prysmaticlabs/prysm/v4/crypto/rand", visibility = ["//visibility:public"], ) diff --git a/crypto/rand/rand.go b/crypto/rand/rand.go index 5e7ecdb7341e..26430e26d893 100644 --- a/crypto/rand/rand.go +++ b/crypto/rand/rand.go @@ -7,7 +7,7 @@ This limits the scope of code that needs to be hardened. There are two modes, one for deterministic and another non-deterministic randomness: 1. If deterministic pseudo-random generator is enough, use: - import "github.com/prysmaticlabs/prysm/v3/crypto/rand" + import "github.com/prysmaticlabs/prysm/v4/crypto/rand" randGen := rand.NewDeterministicGenerator() randGen.Intn(32) // or any other func defined in math.rand API @@ -20,7 +20,7 @@ There are two modes, one for deterministic and another non-deterministic randomn 2. For cryptographically secure non-deterministic mode (CSPRNG), use: - import "github.com/prysmaticlabs/prysm/v3/crypto/rand" + import "github.com/prysmaticlabs/prysm/v4/crypto/rand" randGen := rand.NewGenerator() randGen.Intn(32) // or any other func defined in math.rand API diff --git a/deps.bzl b/deps.bzl index ba92e3d03e9d..aac4cbf13fb3 100644 --- a/deps.bzl +++ b/deps.bzl @@ -350,13 +350,13 @@ def prysm_deps(): sum = "h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=", version = "v0.1.0", ) - go_repository( name = "com_github_bketelsen_crypt", importpath = "github.com/bketelsen/crypt", sum = "h1:+0HFd5KSZ/mm3JmhmrDukiId5iR6w4+BdFtfSy4yWIc=", version = "v0.0.3-0.20200106085610-5cbc8cc4026c", ) + go_repository( name = "com_github_bmizerany_pat", importpath = "github.com/bmizerany/pat", @@ -396,13 +396,13 @@ def prysm_deps(): sum = "h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=", version = "v1.0.1", ) - go_repository( name = "com_github_bufbuild_buf", importpath = "github.com/bufbuild/buf", sum = "h1:11zJVA0D4uJVGOC9h+oOVHrKKoBgMYIqJJ0d1Xt6oeQ=", version = "v0.37.0", ) + go_repository( name = "com_github_buger_jsonparser", importpath = "github.com/buger/jsonparser", @@ -615,13 +615,13 @@ def prysm_deps(): sum = "h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=", version = "v1.0.4", ) - go_repository( name = "com_github_coreos_bbolt", importpath = "github.com/coreos/bbolt", sum = "h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s=", version = "v1.3.2", ) + go_repository( name = "com_github_coreos_etcd", importpath = "github.com/coreos/etcd", @@ -1365,13 +1365,13 @@ def prysm_deps(): sum = "h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=", version = "v5.1.0", ) - go_repository( name = "com_github_gofrs_flock", importpath = "github.com/gofrs/flock", sum = "h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=", version = "v0.8.0", ) + go_repository( name = "com_github_gofrs_uuid", importpath = "github.com/gofrs/uuid", @@ -1601,6 +1601,7 @@ def prysm_deps(): sum = "h1:vc7Dmrk4JwS0ZPS6WZvWlwDflgDTA26jItmbSj83nug=", version = "v0.0.0-20200309095847-7953dde2c7bf", ) + go_repository( name = "com_github_gorilla_context", importpath = "github.com/gorilla/context", @@ -1675,8 +1676,8 @@ def prysm_deps(): name = "com_github_grpc_ecosystem_grpc_gateway_v2", importpath = "github.com/grpc-ecosystem/grpc-gateway/v2", replace = "github.com/prysmaticlabs/grpc-gateway/v2", - sum = "h1:elSfkWAcpL94zg7B9J2ozu+WcbMxD1rZ3rzUjYAy6R8=", - version = "v2.3.1-0.20220721162526-0d1c40b5f064", + sum = "h1:4wctORg/1TkgLgXejv9yOSAm3cDBJxoTzl/RNuZmX28=", + version = "v2.3.1-0.20230315201114-09284ba20446", ) go_repository( @@ -2097,13 +2098,13 @@ def prysm_deps(): sum = "h1:ujPKutqRlJtcfWk6toYVYagwra7HQHbXOaS171b4Tg8=", version = "v0.0.0-20150330215556-f50fe3d243e1", ) - go_repository( name = "com_github_jhump_protoreflect", importpath = "github.com/jhump/protoreflect", sum = "h1:z7Ciiz3Bz37zSd485fbiTW8ABafIasyOWZI0N9EUUdo=", version = "v1.8.1", ) + go_repository( name = "com_github_jmespath_go_jmespath", importpath = "github.com/jmespath/go-jmespath", @@ -2954,7 +2955,6 @@ def prysm_deps(): sum = "h1:eFXv9Nu1lGbrNbj619aWwZfVF5HBrm9Plte8aNptuTI=", version = "v0.0.0-20151028013722-8c68805598ab", ) - go_repository( name = "com_github_nishanths_predeclared", importpath = "github.com/nishanths/predeclared", @@ -3791,13 +3791,13 @@ def prysm_deps(): sum = "h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=", version = "v1.8.1", ) - go_repository( name = "com_github_subosito_gotenv", importpath = "github.com/subosito/gotenv", sum = "h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=", version = "v1.2.0", ) + http_archive( name = "com_github_supranational_blst", urls = [ @@ -3908,6 +3908,7 @@ def prysm_deps(): sum = "h1:3fNSDoSPyq+fTrifIvGue9XM/tptzuhiGY83rxPVNUg=", version = "v7.1.0+incompatible", ) + go_repository( name = "com_github_tyler_smith_go_bip39", importpath = "github.com/tyler-smith/go-bip39", @@ -4220,13 +4221,13 @@ def prysm_deps(): sum = "h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=", version = "v1.1.0", ) - go_repository( name = "com_google_cloud_go_firestore", importpath = "cloud.google.com/go/firestore", sum = "h1:9x7Bx0A9R5/M9jibeJeZWqjeVEIxYW9fZYqB9a70/bY=", version = "v1.1.0", ) + go_repository( name = "com_google_cloud_go_pubsub", importpath = "cloud.google.com/go/pubsub", @@ -4657,6 +4658,7 @@ def prysm_deps(): sum = "h1:lQ+dE99pFsb8osbJB3oRfE5eW4Hx6a/lZQr8Jh+eoT4=", version = "v1.0.0", ) + go_repository( name = "org_golang_google_protobuf", importpath = "google.golang.org/protobuf", diff --git a/encoding/bytesutil/BUILD.bazel b/encoding/bytesutil/BUILD.bazel index 52f5e9992658..fa4f0149e723 100644 --- a/encoding/bytesutil/BUILD.bazel +++ b/encoding/bytesutil/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "hex.go", "integers.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil", + importpath = "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/encoding/bytesutil/bits_test.go b/encoding/bytesutil/bits_test.go index e5af1da0219e..dc38f669d964 100644 --- a/encoding/bytesutil/bits_test.go +++ b/encoding/bytesutil/bits_test.go @@ -3,9 +3,9 @@ package bytesutil_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSetBit(t *testing.T) { diff --git a/encoding/bytesutil/bytes_test.go b/encoding/bytesutil/bytes_test.go index f266ff2b08c2..35708f24f173 100644 --- a/encoding/bytesutil/bytes_test.go +++ b/encoding/bytesutil/bytes_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestTruncate(t *testing.T) { diff --git a/encoding/bytesutil/eth_types.go b/encoding/bytesutil/eth_types.go index a8534458de7b..ec0aabe83dd2 100644 --- a/encoding/bytesutil/eth_types.go +++ b/encoding/bytesutil/eth_types.go @@ -1,8 +1,8 @@ package bytesutil import ( - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // EpochToBytesLittleEndian conversion. diff --git a/encoding/bytesutil/eth_types_test.go b/encoding/bytesutil/eth_types_test.go index d1120f3623a3..f4e64a81d2da 100644 --- a/encoding/bytesutil/eth_types_test.go +++ b/encoding/bytesutil/eth_types_test.go @@ -3,10 +3,10 @@ package bytesutil_test import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestZeroRoot(t *testing.T) { diff --git a/encoding/bytesutil/hex_test.go b/encoding/bytesutil/hex_test.go index f9f9f4e1e108..143c56ba300e 100644 --- a/encoding/bytesutil/hex_test.go +++ b/encoding/bytesutil/hex_test.go @@ -3,8 +3,8 @@ package bytesutil_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestIsHex(t *testing.T) { diff --git a/encoding/bytesutil/integers_test.go b/encoding/bytesutil/integers_test.go index af537731d829..54776c1effb3 100644 --- a/encoding/bytesutil/integers_test.go +++ b/encoding/bytesutil/integers_test.go @@ -7,8 +7,8 @@ import ( "math/big" "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestToBytes(t *testing.T) { diff --git a/encoding/ssz/BUILD.bazel b/encoding/ssz/BUILD.bazel index 62e9e8701b40..f2757ff43325 100644 --- a/encoding/ssz/BUILD.bazel +++ b/encoding/ssz/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "htrutils.go", "merkleize.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/encoding/ssz", + importpath = "github.com/prysmaticlabs/prysm/v4/encoding/ssz", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/encoding/ssz/detect/BUILD.bazel b/encoding/ssz/detect/BUILD.bazel index ede366fdaa77..84ae13a36ed4 100644 --- a/encoding/ssz/detect/BUILD.bazel +++ b/encoding/ssz/detect/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "configfork.go", "fieldspec.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect", + importpath = "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/encoding/ssz/detect/configfork.go b/encoding/ssz/detect/configfork.go index 8bf5fa74196e..05f8682c3b08 100644 --- a/encoding/ssz/detect/configfork.go +++ b/encoding/ssz/detect/configfork.go @@ -3,21 +3,21 @@ package detect import ( "fmt" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/network/forks" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/network/forks" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // VersionedUnmarshaler represents the intersection of Configuration (eg mainnet, testnet) and Fork (eg phase0, altair). diff --git a/encoding/ssz/detect/configfork_test.go b/encoding/ssz/detect/configfork_test.go index e853d1810eec..5fb8165cab47 100644 --- a/encoding/ssz/detect/configfork_test.go +++ b/encoding/ssz/detect/configfork_test.go @@ -6,18 +6,18 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time/slots" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSlotFromBlock(t *testing.T) { diff --git a/encoding/ssz/detect/fieldspec.go b/encoding/ssz/detect/fieldspec.go index 350d73cb8adb..4ccba9ac28b9 100644 --- a/encoding/ssz/detect/fieldspec.go +++ b/encoding/ssz/detect/fieldspec.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) type fieldType int diff --git a/encoding/ssz/detect/fieldspec_test.go b/encoding/ssz/detect/fieldspec_test.go index 554764af037a..4953d4da6a9b 100644 --- a/encoding/ssz/detect/fieldspec_test.go +++ b/encoding/ssz/detect/fieldspec_test.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestTypeMismatch(t *testing.T) { diff --git a/encoding/ssz/equality/BUILD.bazel b/encoding/ssz/equality/BUILD.bazel index a3c22b7aa9e9..92024fbcff91 100644 --- a/encoding/ssz/equality/BUILD.bazel +++ b/encoding/ssz/equality/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["deep_equal.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality", + importpath = "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality", visibility = ["//visibility:public"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/encoding/ssz/equality/deep_equal.go b/encoding/ssz/equality/deep_equal.go index 40be690ff3cd..8778cfb91bc5 100644 --- a/encoding/ssz/equality/deep_equal.go +++ b/encoding/ssz/equality/deep_equal.go @@ -4,7 +4,7 @@ import ( "reflect" "unsafe" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/protobuf/proto" ) diff --git a/encoding/ssz/equality/deep_equal_test.go b/encoding/ssz/equality/deep_equal_test.go index 7683124ff329..70c71267edde 100644 --- a/encoding/ssz/equality/deep_equal_test.go +++ b/encoding/ssz/equality/deep_equal_test.go @@ -3,9 +3,9 @@ package equality_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestDeepEqualBasicTypes(t *testing.T) { diff --git a/encoding/ssz/hashers_test.go b/encoding/ssz/hashers_test.go index 11e98d7595ba..ce7505fc1947 100644 --- a/encoding/ssz/hashers_test.go +++ b/encoding/ssz/hashers_test.go @@ -3,9 +3,9 @@ package ssz_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestHash(t *testing.T) { diff --git a/encoding/ssz/helpers.go b/encoding/ssz/helpers.go index 5ee9da6fd5f6..7d881f31b6a5 100644 --- a/encoding/ssz/helpers.go +++ b/encoding/ssz/helpers.go @@ -8,7 +8,7 @@ import ( "github.com/minio/sha256-simd" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) const bytesPerChunk = 32 diff --git a/encoding/ssz/helpers_test.go b/encoding/ssz/helpers_test.go index 9a8dad2e0666..cd214303d36f 100644 --- a/encoding/ssz/helpers_test.go +++ b/encoding/ssz/helpers_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) const merkleizingListLimitError = "merkleizing list that is too large, over limit" diff --git a/encoding/ssz/htrutils.go b/encoding/ssz/htrutils.go index a16b17466eae..68d532078052 100644 --- a/encoding/ssz/htrutils.go +++ b/encoding/ssz/htrutils.go @@ -5,10 +5,10 @@ import ( "encoding/binary" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Uint64Root computes the HashTreeRoot Merkleization of diff --git a/encoding/ssz/htrutils_fuzz_test.go b/encoding/ssz/htrutils_fuzz_test.go index 547576397940..f72a5e83df80 100644 --- a/encoding/ssz/htrutils_fuzz_test.go +++ b/encoding/ssz/htrutils_fuzz_test.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func FuzzUint64Root(f *testing.F) { diff --git a/encoding/ssz/htrutils_test.go b/encoding/ssz/htrutils_test.go index b86eb81c0e12..dae1fb085a21 100644 --- a/encoding/ssz/htrutils_test.go +++ b/encoding/ssz/htrutils_test.go @@ -4,12 +4,12 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestUint64Root(t *testing.T) { @@ -209,7 +209,7 @@ func TestWithrawalSliceRoot(t *testing.T) { }, { name: "non-empty", - input: []*enginev1.Withdrawal{&enginev1.Withdrawal{ + input: []*enginev1.Withdrawal{{ Index: 123, ValidatorIndex: 123123, Address: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0}, diff --git a/encoding/ssz/merkleize.go b/encoding/ssz/merkleize.go index 62832c37429c..5702de4daac5 100644 --- a/encoding/ssz/merkleize.go +++ b/encoding/ssz/merkleize.go @@ -1,8 +1,8 @@ package ssz import ( - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/hash/htr" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/hash/htr" ) // Merkleize.go is mostly a directly copy of the same filename from diff --git a/encoding/ssz/merkleize_test.go b/encoding/ssz/merkleize_test.go index 9dba09676e77..d249b4fe74c3 100644 --- a/encoding/ssz/merkleize_test.go +++ b/encoding/ssz/merkleize_test.go @@ -3,9 +3,9 @@ package ssz_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestGetDepth(t *testing.T) { diff --git a/go.mod b/go.mod index 1d1ce730ee9a..9a5f632ce035 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/prysmaticlabs/prysm/v3 +module github.com/prysmaticlabs/prysm/v4 go 1.19 @@ -101,6 +101,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.0 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/cp v1.1.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.0 // indirect @@ -240,7 +241,6 @@ require ( ) require ( - github.com/cespare/cp v1.1.1 // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/fatih/color v1.9.0 // indirect github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect @@ -260,4 +260,4 @@ require ( replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b // See https://github.com/prysmaticlabs/grpc-gateway/issues/2 -replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220721162526-0d1c40b5f064 +replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20230315201114-09284ba20446 diff --git a/go.sum b/go.sum index fd3876a7631d..52a671fcdf49 100644 --- a/go.sum +++ b/go.sum @@ -1063,8 +1063,8 @@ github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 h1:0tVE4 github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7/go.mod h1:wmuf/mdK4VMD+jA9ThwcUKjg3a2XWM9cVfFYjDyY4j4= github.com/prysmaticlabs/gohashtree v0.0.2-alpha h1:hk5ZsDQuSkyUMhTd55qB396P1+dtyIKiSwMmYE/hyEU= github.com/prysmaticlabs/gohashtree v0.0.2-alpha/go.mod h1:4pWaT30XoEx1j8KNJf3TV+E3mQkaufn7mf+jRNb/Fuk= -github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220721162526-0d1c40b5f064 h1:elSfkWAcpL94zg7B9J2ozu+WcbMxD1rZ3rzUjYAy6R8= -github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220721162526-0d1c40b5f064/go.mod h1:IOyTYjcIO0rkmnGBfJTL0NJ11exy/Tc2QEuv7hCXp24= +github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20230315201114-09284ba20446 h1:4wctORg/1TkgLgXejv9yOSAm3cDBJxoTzl/RNuZmX28= +github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20230315201114-09284ba20446/go.mod h1:IOyTYjcIO0rkmnGBfJTL0NJ11exy/Tc2QEuv7hCXp24= github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c h1:9PHRCuO/VN0s9k+RmLykho7AjDxblNYI5bYKed16NPU= github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c/go.mod h1:ZRws458tYHS/Zs936OQ6oCrL+Ict5O4Xpwve1UQ6C9M= github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294 h1:q9wE0ZZRdTUAAeyFP/w0SwBEnCqlVy2+on6X2/e+eAU= diff --git a/hack/update-go-pbs.sh b/hack/update-go-pbs.sh index ef067f85d99c..0a8e9d82fd23 100755 --- a/hack/update-go-pbs.sh +++ b/hack/update-go-pbs.sh @@ -12,7 +12,7 @@ while IFS= read -d $'\0' -r file; do done < <($findutil -L "$(bazel info bazel-bin)"/proto -type f -regextype sed -regex ".*pb\.\(gw\.\)\?go$" -print0) arraylength=${#file_list[@]} -searchstring="prysmaticlabs/prysm/v3/" +searchstring="prysmaticlabs/prysm/v4/" # Copy pb.go files from bazel-bin to original folder where .proto is. for ((i = 0; i < arraylength; i++)); do diff --git a/hack/update-mockgen.sh b/hack/update-mockgen.sh index 72510cf263c1..0f9317b1015e 100755 --- a/hack/update-mockgen.sh +++ b/hack/update-mockgen.sh @@ -5,7 +5,7 @@ mock_path="testing/mock" -# github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 +# github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 # ------------------------------------------------------ proto_mocks_v1alpha1=( "$mock_path/beacon_service_mock.go BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient" @@ -21,10 +21,10 @@ for ((i = 0; i < ${#proto_mocks_v1alpha1[@]}; i++)); do interfaces=${proto_mocks_v1alpha1[i]#* }; echo "generating $file for interfaces: $interfaces"; echo - GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 "$interfaces" + GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 "$interfaces" done -# github.com/prysmaticlabs/prysm/v3/proto/eth/service +# github.com/prysmaticlabs/prysm/v4/proto/eth/service # --------------------------------------------------- proto_mocks_service=( "$mock_path/event_service_mock.go EventsClient,Events_StreamEventsClient,Events_StreamEventsServer" @@ -35,10 +35,10 @@ for ((i = 0; i < ${#proto_mocks_service[@]}; i++)); do interfaces=${proto_mocks_service[i]#* }; echo "generating $file for interfaces: $interfaces"; echo - GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/eth/service "$interfaces" + GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v4/proto/eth/service "$interfaces" done -# github.com/prysmaticlabs/prysm/proto/v3/prysm/v1alpha1/validator-client +# github.com/prysmaticlabs/prysm/proto/v4/prysm/v1alpha1/validator-client # ----------------------------------------------------------------------- proto_mocks_v1alpha1_validator_clients=( "$mock_path/keymanager_mock.go RemoteSignerClient" @@ -49,10 +49,10 @@ for ((i = 0; i < ${#proto_mocks_v1alpha1_validator_clients[@]}; i++)); do interfaces=${proto_mocks_v1alpha1_validator_clients[i]#* }; echo "generating $file for interfaces: $interfaces"; echo - GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client "$interfaces" + GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client "$interfaces" done -# github.com/prysmaticlabs/prysm/v3/validator/client/iface +# github.com/prysmaticlabs/prysm/v4/validator/client/iface # -------------------------------------------------------- iface_mocks=( "$mock_path/validator_client_mock.go ValidatorClient" @@ -62,13 +62,13 @@ for ((i = 0; i < ${#iface_mocks[@]}; i++)); do file=${iface_mocks[i]% *}; interfaces=${iface_mocks[i]#* }; echo "generating $file for interfaces: $interfaces"; - GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/validator/client/iface "$interfaces" + GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v4/validator/client/iface "$interfaces" done goimports -w "$mock_path/." gofmt -s -w "$mock_path/." -# github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api +# github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api # ------------------------------------------------------------- beacon_api_mock_path="validator/client/beacon-api/mock" beacon_api_mocks=( @@ -89,7 +89,7 @@ done goimports -w "$beacon_api_mock_path/." gofmt -s -w "$beacon_api_mock_path/." -# github.com/prysmaticlabs/prysm/v3/crypto/bls +# github.com/prysmaticlabs/prysm/v4/crypto/bls # -------------------------------------------- crypto_bls_common_mock_path="crypto/bls/common/mock" crypto_bls_common_mocks=( diff --git a/io/file/BUILD.bazel b/io/file/BUILD.bazel index 4a7b7e3ba42e..dfaef216e939 100644 --- a/io/file/BUILD.bazel +++ b/io/file/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["fileutil.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/io/file", + importpath = "github.com/prysmaticlabs/prysm/v4/io/file", visibility = ["//visibility:public"], deps = [ "//config/params:go_default_library", diff --git a/io/file/fileutil.go b/io/file/fileutil.go index 7ac581abc799..4f21a234f0cf 100644 --- a/io/file/fileutil.go +++ b/io/file/fileutil.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" log "github.com/sirupsen/logrus" ) diff --git a/io/file/fileutil_test.go b/io/file/fileutil_test.go index a5c63d735623..98458dbf39d6 100644 --- a/io/file/fileutil_test.go +++ b/io/file/fileutil_test.go @@ -24,10 +24,10 @@ import ( "sort" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPathExpansion(t *testing.T) { diff --git a/io/logs/BUILD.bazel b/io/logs/BUILD.bazel index 23a44f5eb1e0..f84645325553 100644 --- a/io/logs/BUILD.bazel +++ b/io/logs/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "logutil.go", "stream.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/io/logs", + importpath = "github.com/prysmaticlabs/prysm/v4/io/logs", visibility = ["//visibility:public"], deps = [ "//async/event:go_default_library", diff --git a/io/logs/logutil.go b/io/logs/logutil.go index 41fef18e7238..f8d1eb6f5ce5 100644 --- a/io/logs/logutil.go +++ b/io/logs/logutil.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" "github.com/sirupsen/logrus" ) diff --git a/io/logs/logutil_test.go b/io/logs/logutil_test.go index 0a7aa180c865..1a667e0d03a4 100644 --- a/io/logs/logutil_test.go +++ b/io/logs/logutil_test.go @@ -3,7 +3,7 @@ package logs import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) var urltests = []struct { diff --git a/io/logs/stream.go b/io/logs/stream.go index 3c6ee22b36d9..232764f6ddfb 100644 --- a/io/logs/stream.go +++ b/io/logs/stream.go @@ -4,9 +4,9 @@ import ( "io" lru "github.com/hashicorp/golang-lru" - "github.com/prysmaticlabs/prysm/v3/async/event" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/async/event" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" ) const ( diff --git a/io/logs/stream_test.go b/io/logs/stream_test.go index f83276c96049..7c275e9d1eaf 100644 --- a/io/logs/stream_test.go +++ b/io/logs/stream_test.go @@ -3,7 +3,7 @@ package logs import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStreamServer_BackfillsMessages(t *testing.T) { diff --git a/io/prompt/BUILD.bazel b/io/prompt/BUILD.bazel index 6b99b2fde39d..15280668c857 100644 --- a/io/prompt/BUILD.bazel +++ b/io/prompt/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "prompt.go", "validate.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/io/prompt", + importpath = "github.com/prysmaticlabs/prysm/v4/io/prompt", visibility = ["//visibility:public"], deps = [ "//io/file:go_default_library", diff --git a/io/prompt/prompt.go b/io/prompt/prompt.go index d961cf85c18e..a5f8f89b09a9 100644 --- a/io/prompt/prompt.go +++ b/io/prompt/prompt.go @@ -9,7 +9,7 @@ import ( "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/io/file" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "golang.org/x/crypto/ssh/terminal" diff --git a/io/prompt/validate_test.go b/io/prompt/validate_test.go index 719c7eb77878..090a9d8c3a8e 100644 --- a/io/prompt/validate_test.go +++ b/io/prompt/validate_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestValidatePasswordInput(t *testing.T) { diff --git a/math/BUILD.bazel b/math/BUILD.bazel index 3e8637184c35..92284d464c24 100644 --- a/math/BUILD.bazel +++ b/math/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["math_helper.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/math", + importpath = "github.com/prysmaticlabs/prysm/v4/math", visibility = ["//visibility:public"], deps = ["@com_github_thomaso_mirodin_intmath//u64:go_default_library"], ) diff --git a/math/math_helper_test.go b/math/math_helper_test.go index 1a1857c03a78..3589a654d833 100644 --- a/math/math_helper_test.go +++ b/math/math_helper_test.go @@ -5,8 +5,8 @@ import ( stdmath "math" "testing" - "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestIntegerSquareRoot(t *testing.T) { diff --git a/monitoring/backup/BUILD.bazel b/monitoring/backup/BUILD.bazel index 6cfe3e94c799..e3e1990d809b 100644 --- a/monitoring/backup/BUILD.bazel +++ b/monitoring/backup/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["http_backup_handler.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/monitoring/backup", + importpath = "github.com/prysmaticlabs/prysm/v4/monitoring/backup", visibility = ["//visibility:public"], deps = ["@com_github_sirupsen_logrus//:go_default_library"], ) diff --git a/monitoring/clientstats/BUILD.bazel b/monitoring/clientstats/BUILD.bazel index 6aab69b87fb7..af9215877ade 100644 --- a/monitoring/clientstats/BUILD.bazel +++ b/monitoring/clientstats/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "types.go", "updaters.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/monitoring/clientstats", + importpath = "github.com/prysmaticlabs/prysm/v4/monitoring/clientstats", visibility = ["//visibility:public"], deps = [ "//proto/prysm/v1alpha1:go_default_library", diff --git a/monitoring/clientstats/scrapers.go b/monitoring/clientstats/scrapers.go index 6b43c1b8588d..9d7103c69bc4 100644 --- a/monitoring/clientstats/scrapers.go +++ b/monitoring/clientstats/scrapers.go @@ -11,7 +11,7 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/prometheus/prom2json" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" log "github.com/sirupsen/logrus" ) diff --git a/monitoring/clientstats/scrapers_test.go b/monitoring/clientstats/scrapers_test.go index 8caad603160d..f4d1139395df 100644 --- a/monitoring/clientstats/scrapers_test.go +++ b/monitoring/clientstats/scrapers_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/monitoring/journald/BUILD.bazel b/monitoring/journald/BUILD.bazel index 87712528fbfb..d6dd22606f2d 100644 --- a/monitoring/journald/BUILD.bazel +++ b/monitoring/journald/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "journald.go", "journald_linux.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/monitoring/journald", + importpath = "github.com/prysmaticlabs/prysm/v4/monitoring/journald", visibility = ["//visibility:public"], deps = select({ "@io_bazel_rules_go//go/platform:android": [ diff --git a/monitoring/progress/BUILD.bazel b/monitoring/progress/BUILD.bazel index 719acb8767c7..39ccfa579bc0 100644 --- a/monitoring/progress/BUILD.bazel +++ b/monitoring/progress/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["progress.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/monitoring/progress", + importpath = "github.com/prysmaticlabs/prysm/v4/monitoring/progress", visibility = ["//visibility:public"], deps = [ "@com_github_k0kubun_go_ansi//:go_default_library", diff --git a/monitoring/prometheus/BUILD.bazel b/monitoring/prometheus/BUILD.bazel index 07d037e9a4d5..e776e347966b 100644 --- a/monitoring/prometheus/BUILD.bazel +++ b/monitoring/prometheus/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "service.go", "simple_server.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/monitoring/prometheus", + importpath = "github.com/prysmaticlabs/prysm/v4/monitoring/prometheus", visibility = ["//visibility:public"], deps = [ "//runtime:go_default_library", diff --git a/monitoring/prometheus/logrus_collector_test.go b/monitoring/prometheus/logrus_collector_test.go index 27c335c0cd5a..23149fb17f61 100644 --- a/monitoring/prometheus/logrus_collector_test.go +++ b/monitoring/prometheus/logrus_collector_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/monitoring/prometheus" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/monitoring/prometheus" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" log "github.com/sirupsen/logrus" ) diff --git a/monitoring/prometheus/service.go b/monitoring/prometheus/service.go index 27b682234133..c3b857b26c13 100644 --- a/monitoring/prometheus/service.go +++ b/monitoring/prometheus/service.go @@ -14,7 +14,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/prysmaticlabs/prysm/v3/runtime" + "github.com/prysmaticlabs/prysm/v4/runtime" "github.com/sirupsen/logrus" ) diff --git a/monitoring/prometheus/service_test.go b/monitoring/prometheus/service_test.go index 84027419779b..881860348587 100644 --- a/monitoring/prometheus/service_test.go +++ b/monitoring/prometheus/service_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" ) diff --git a/monitoring/tracing/BUILD.bazel b/monitoring/tracing/BUILD.bazel index 5cedd65705c3..94c2ca8adfa4 100644 --- a/monitoring/tracing/BUILD.bazel +++ b/monitoring/tracing/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "recovery_interceptor_option.go", "tracer.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/monitoring/tracing", + importpath = "github.com/prysmaticlabs/prysm/v4/monitoring/tracing", visibility = ["//visibility:public"], deps = [ "//runtime/version:go_default_library", diff --git a/monitoring/tracing/tracer.go b/monitoring/tracing/tracer.go index 30c476a0540f..02dc1bdf2ebf 100644 --- a/monitoring/tracing/tracer.go +++ b/monitoring/tracing/tracer.go @@ -6,7 +6,7 @@ import ( "errors" "contrib.go.opencensus.io/exporter/jaeger" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/network/BUILD.bazel b/network/BUILD.bazel index 195e8638764c..99f460c42653 100644 --- a/network/BUILD.bazel +++ b/network/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "endpoint.go", "external_ip.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/network", + importpath = "github.com/prysmaticlabs/prysm/v4/network", visibility = ["//visibility:public"], deps = [ "//network/authorization:go_default_library", diff --git a/network/auth_test.go b/network/auth_test.go index 49315e95e0d3..4e350d0f9c84 100644 --- a/network/auth_test.go +++ b/network/auth_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/golang-jwt/jwt/v4" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestJWTAuthTransport(t *testing.T) { diff --git a/network/authorization/BUILD.bazel b/network/authorization/BUILD.bazel index d596f46e1594..c7cbd4a9f21d 100644 --- a/network/authorization/BUILD.bazel +++ b/network/authorization/BUILD.bazel @@ -3,6 +3,6 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["authorization_method.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/network/authorization", + importpath = "github.com/prysmaticlabs/prysm/v4/network/authorization", visibility = ["//visibility:public"], ) diff --git a/network/endpoint.go b/network/endpoint.go index 0bab5a99116d..ca1bf92ec83b 100644 --- a/network/endpoint.go +++ b/network/endpoint.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/prysmaticlabs/prysm/v3/network/authorization" + "github.com/prysmaticlabs/prysm/v4/network/authorization" ) // Endpoint is an endpoint with authorization data. diff --git a/network/endpoint_test.go b/network/endpoint_test.go index 69912756d68c..0d5392d773f1 100644 --- a/network/endpoint_test.go +++ b/network/endpoint_test.go @@ -3,9 +3,9 @@ package network import ( "testing" - "github.com/prysmaticlabs/prysm/v3/network/authorization" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/network/authorization" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestToHeaderValue(t *testing.T) { diff --git a/network/external_ip_test.go b/network/external_ip_test.go index 6621995845b4..a5be0c089a7d 100644 --- a/network/external_ip_test.go +++ b/network/external_ip_test.go @@ -5,9 +5,9 @@ import ( "regexp" "testing" - "github.com/prysmaticlabs/prysm/v3/network" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/network" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestExternalIPv4(t *testing.T) { diff --git a/network/forks/BUILD.bazel b/network/forks/BUILD.bazel index ddb8ae65ca9a..0b0582950d95 100644 --- a/network/forks/BUILD.bazel +++ b/network/forks/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "fork.go", "ordered.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/network/forks", + importpath = "github.com/prysmaticlabs/prysm/v4/network/forks", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/signing:go_default_library", diff --git a/network/forks/fork.go b/network/forks/fork.go index 245be7666a9d..859cdbcbd404 100644 --- a/network/forks/fork.go +++ b/network/forks/fork.go @@ -8,12 +8,12 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // IsForkNextEpoch checks if an alloted fork is in the following epoch. diff --git a/network/forks/fork_test.go b/network/forks/fork_test.go index 07751fda8f22..f1716e4c0251 100644 --- a/network/forks/fork_test.go +++ b/network/forks/fork_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestFork(t *testing.T) { diff --git a/network/forks/ordered.go b/network/forks/ordered.go index c55c2cf0eb9b..0df5bb78259d 100644 --- a/network/forks/ordered.go +++ b/network/forks/ordered.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // ForkScheduleEntry is a Version+Epoch tuple for sorted storage in an OrderedSchedule diff --git a/network/forks/ordered_test.go b/network/forks/ordered_test.go index 16586a75d6c2..fbdcf31e9b0e 100644 --- a/network/forks/ordered_test.go +++ b/network/forks/ordered_test.go @@ -4,9 +4,9 @@ import ( "math" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestOrderedConfigSchedule(t *testing.T) { diff --git a/proto/engine/v1/BUILD.bazel b/proto/engine/v1/BUILD.bazel index a4547d5379c7..e186b0dd7c3f 100644 --- a/proto/engine/v1/BUILD.bazel +++ b/proto/engine/v1/BUILD.bazel @@ -48,7 +48,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/engine/v1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/engine/v1", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -71,7 +71,7 @@ go_library( embed = [ ":go_proto", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/engine/v1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/engine/v1", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/proto/engine/v1/execution_engine.pb.go b/proto/engine/v1/execution_engine.pb.go index 392f2da27104..334f715f6790 100755 --- a/proto/engine/v1/execution_engine.pb.go +++ b/proto/engine/v1/execution_engine.pb.go @@ -7,13 +7,12 @@ package enginev1 import ( - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -1140,7 +1139,7 @@ type Withdrawal struct { unknownFields protoimpl.UnknownFields Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Address []byte `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty" ssz-size:"20"` Amount uint64 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"` } @@ -1184,11 +1183,11 @@ func (x *Withdrawal) GetIndex() uint64 { return 0 } -func (x *Withdrawal) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *Withdrawal) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *Withdrawal) GetAddress() []byte { @@ -1572,7 +1571,7 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, @@ -1601,7 +1600,7 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, diff --git a/proto/engine/v1/execution_engine.proto b/proto/engine/v1/execution_engine.proto index 5a4bceea1471..40b9272b66ce 100644 --- a/proto/engine/v1/execution_engine.proto +++ b/proto/engine/v1/execution_engine.proto @@ -18,7 +18,7 @@ package ethereum.engine.v1; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Engine.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/engine/v1;enginev1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/engine/v1;enginev1"; option java_multiple_files = true; option java_outer_classname = "ExecutionEngineProto"; option java_package = "org.ethereum.engine.v1"; @@ -150,7 +150,7 @@ message Withdrawal { uint64 index = 1; // Validator index for the withdrawal - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The execution address receiving the funds bytes address = 3 [(ethereum.eth.ext.ssz_size) = "20"]; diff --git a/proto/engine/v1/generated.ssz.go b/proto/engine/v1/generated.ssz.go index 329806ec752b..d863b43f5aef 100644 --- a/proto/engine/v1/generated.ssz.go +++ b/proto/engine/v1/generated.ssz.go @@ -1,10 +1,10 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: edbc5aa03156793a03df9d7bed8634b21e5f8b384316f8925d25a5d693045bf8 +// Hash: 99c3888145752786d92f39f03192e702b630b31ad97407fce1eb162aad7fff42 package enginev1 import ( ssz "github.com/prysmaticlabs/fastssz" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // MarshalSSZ ssz marshals the ExecutionPayload object @@ -1540,7 +1540,7 @@ func (w *Withdrawal) UnmarshalSSZ(buf []byte) error { w.Index = ssz.UnmarshallUint64(buf[0:8]) // Field (1) 'ValidatorIndex' - w.ValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + w.ValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'Address' if cap(w.Address) == 0 { diff --git a/proto/engine/v1/json_marshal_unmarshal.go b/proto/engine/v1/json_marshal_unmarshal.go index fec0fb18da78..cd77f12961bc 100644 --- a/proto/engine/v1/json_marshal_unmarshal.go +++ b/proto/engine/v1/json_marshal_unmarshal.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) // PayloadIDBytes defines a custom type for Payload IDs used by the engine API diff --git a/proto/engine/v1/json_marshal_unmarshal_test.go b/proto/engine/v1/json_marshal_unmarshal_test.go index 951d12a52c3e..3997978e8b8f 100644 --- a/proto/engine/v1/json_marshal_unmarshal_test.go +++ b/proto/engine/v1/json_marshal_unmarshal_test.go @@ -10,12 +10,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/holiman/uint256" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type withdrawalJSON struct { diff --git a/proto/eth/ext/BUILD.bazel b/proto/eth/ext/BUILD.bazel index be74083247b4..724685e68070 100644 --- a/proto/eth/ext/BUILD.bazel +++ b/proto/eth/ext/BUILD.bazel @@ -24,7 +24,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/ext", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/ext", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -40,7 +40,7 @@ go_proto_library( go_library( name = "go_default_library", embed = [":ext_go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/ext", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/ext", visibility = ["//visibility:public"], deps = SSZ_DEPS + [ "@com_github_golang_protobuf//proto:go_default_library", @@ -53,7 +53,7 @@ go_library( go_proto_library( name = "ext_go_proto", - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/ext", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/ext", proto = ":proto", visibility = ["//visibility:public"], ) diff --git a/proto/eth/ext/options.pb.go b/proto/eth/ext/options.pb.go index f87a62f72444..703982681a45 100755 --- a/proto/eth/ext/options.pb.go +++ b/proto/eth/ext/options.pb.go @@ -7,11 +7,10 @@ package ext import ( - reflect "reflect" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" + reflect "reflect" ) const ( @@ -95,7 +94,7 @@ var file_proto_eth_ext_options_proto_rawDesc = []byte{ 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x65, 0x78, 0x74, 0x42, 0x0c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x65, 0x78, 0x74, 0xaa, 0x02, 0x10, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x65, 0x78, 0x74, 0xca, 0x02, 0x10, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x65, diff --git a/proto/eth/ext/options.proto b/proto/eth/ext/options.proto index dd0f578f5f68..840f941e22a1 100644 --- a/proto/eth/ext/options.proto +++ b/proto/eth/ext/options.proto @@ -18,7 +18,7 @@ package ethereum.eth.ext; import "google/protobuf/descriptor.proto"; option csharp_namespace = "Ethereum.Eth.ext"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/ext"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/ext"; option java_multiple_files = true; option java_outer_classname = "OptionsProto"; option java_package = "org.ethereum.eth.ext"; diff --git a/proto/eth/service/BUILD.bazel b/proto/eth/service/BUILD.bazel index 88397dc90f18..a007e74573a8 100644 --- a/proto/eth/service/BUILD.bazel +++ b/proto/eth/service/BUILD.bazel @@ -30,7 +30,7 @@ proto_library( go_proto_library( name = "go_proto", compilers = ["@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc",], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/service", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/service", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -74,7 +74,7 @@ go_proto_library( "allow_delete_body_gateway_compiler", ], embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/service", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/service", protos = [":proto"], visibility = ["//proto:__subpackages__"], deps = [ @@ -92,6 +92,6 @@ go_proto_library( go_library( name = "go_default_library", embed = [":go_grpc_gateway_library"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/service", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/service", visibility = ["//visibility:public"], ) diff --git a/proto/eth/service/beacon_chain_service.pb.go b/proto/eth/service/beacon_chain_service.pb.go index 9e825b01519c..653775e38ae8 100755 --- a/proto/eth/service/beacon_chain_service.pb.go +++ b/proto/eth/service/beacon_chain_service.pb.go @@ -8,18 +8,17 @@ package service import ( context "context" - reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" empty "github.com/golang/protobuf/ptypes/empty" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" ) const ( @@ -425,7 +424,7 @@ var file_proto_eth_service_beacon_chain_service_proto_rawDesc = []byte{ 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xaa, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, diff --git a/proto/eth/service/beacon_chain_service.pb.gw.go b/proto/eth/service/beacon_chain_service.pb.gw.go index 98c973fc2e54..a31d83e16df4 100755 --- a/proto/eth/service/beacon_chain_service.pb.gw.go +++ b/proto/eth/service/beacon_chain_service.pb.gw.go @@ -10,22 +10,21 @@ package service import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -35,7 +34,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/eth/service/beacon_chain_service.proto b/proto/eth/service/beacon_chain_service.proto index 5f5377cd7ead..f6d0029b2a97 100644 --- a/proto/eth/service/beacon_chain_service.proto +++ b/proto/eth/service/beacon_chain_service.proto @@ -29,7 +29,7 @@ import "proto/eth/v2/sync_committee.proto"; import "proto/eth/v2/withdrawals.proto"; option csharp_namespace = "Ethereum.Eth.Service"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/service"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/service"; option java_multiple_files = true; option java_outer_classname = "BeaconChainServiceProto"; option java_package = "org.ethereum.eth.service"; diff --git a/proto/eth/service/beacon_debug_service.pb.go b/proto/eth/service/beacon_debug_service.pb.go index e4874544b3c3..8856d408cdb3 100755 --- a/proto/eth/service/beacon_debug_service.pb.go +++ b/proto/eth/service/beacon_debug_service.pb.go @@ -8,18 +8,17 @@ package service import ( context "context" - reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" empty "github.com/golang/protobuf/ptypes/empty" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" ) const ( @@ -98,7 +97,7 @@ var file_proto_eth_service_beacon_debug_service_proto_rawDesc = []byte{ 0x42, 0x17, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x44, 0x65, 0x62, 0x75, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xaa, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, diff --git a/proto/eth/service/beacon_debug_service.pb.gw.go b/proto/eth/service/beacon_debug_service.pb.gw.go index 757db4f2c96c..11d4c69ccda2 100755 --- a/proto/eth/service/beacon_debug_service.pb.gw.go +++ b/proto/eth/service/beacon_debug_service.pb.gw.go @@ -10,22 +10,21 @@ package service import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -35,7 +34,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/eth/service/beacon_debug_service.proto b/proto/eth/service/beacon_debug_service.proto index 8f1990a24277..6164d87e0ac6 100644 --- a/proto/eth/service/beacon_debug_service.proto +++ b/proto/eth/service/beacon_debug_service.proto @@ -24,7 +24,7 @@ import "proto/eth/v2/beacon_state.proto"; import "proto/eth/v2/ssz.proto"; option csharp_namespace = "Ethereum.Eth.Service"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/service"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/service"; option java_multiple_files = true; option java_outer_classname = "BeaconDebugServiceProto"; option java_package = "org.ethereum.eth.service"; diff --git a/proto/eth/service/events_service.pb.go b/proto/eth/service/events_service.pb.go index 7af5877026f4..e862d4addb76 100755 --- a/proto/eth/service/events_service.pb.go +++ b/proto/eth/service/events_service.pb.go @@ -8,17 +8,16 @@ package service import ( context "context" - reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" gateway "github.com/grpc-ecosystem/grpc-gateway/v2/proto/gateway" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" ) const ( @@ -55,7 +54,7 @@ var file_proto_eth_service_events_service_proto_rawDesc = []byte{ 0x65, 0x42, 0x12, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xaa, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, diff --git a/proto/eth/service/events_service.pb.gw.go b/proto/eth/service/events_service.pb.gw.go index af8b9e27751f..3ef99f0f0372 100755 --- a/proto/eth/service/events_service.pb.gw.go +++ b/proto/eth/service/events_service.pb.gw.go @@ -10,21 +10,20 @@ package service import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -34,7 +33,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/eth/service/events_service.proto b/proto/eth/service/events_service.proto index 70e8fc66fe46..1217b3459e12 100644 --- a/proto/eth/service/events_service.proto +++ b/proto/eth/service/events_service.proto @@ -22,7 +22,7 @@ import "proto/eth/v1/events.proto"; import "proto/gateway/event_source.proto"; option csharp_namespace = "Ethereum.Eth.Service"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/service"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/service"; option java_multiple_files = true; option java_outer_classname = "EventsServiceProto"; option java_package = "org.ethereum.eth.service"; diff --git a/proto/eth/service/key_management.pb.go b/proto/eth/service/key_management.pb.go index 64d6e419d078..4d6f191fc367 100755 --- a/proto/eth/service/key_management.pb.go +++ b/proto/eth/service/key_management.pb.go @@ -8,9 +8,6 @@ package service import ( context "context" - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" empty "github.com/golang/protobuf/ptypes/empty" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -19,6 +16,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -1818,7 +1817,7 @@ var file_proto_eth_service_key_management_proto_rawDesc = []byte{ 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xaa, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, diff --git a/proto/eth/service/key_management.pb.gw.go b/proto/eth/service/key_management.pb.gw.go index e7f1596087c7..e420800dbc6a 100755 --- a/proto/eth/service/key_management.pb.gw.go +++ b/proto/eth/service/key_management.pb.gw.go @@ -10,20 +10,19 @@ package service import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/eth/service/key_management.proto b/proto/eth/service/key_management.proto index f30cdb1d0f3d..337474f43b5d 100644 --- a/proto/eth/service/key_management.proto +++ b/proto/eth/service/key_management.proto @@ -20,7 +20,7 @@ import "google/protobuf/descriptor.proto"; import "google/protobuf/empty.proto"; option csharp_namespace = "Ethereum.Eth.Service"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/service"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/service"; option java_multiple_files = true; option java_outer_classname = "KeyManagementServiceProto"; option java_package = "org.ethereum.eth.service"; diff --git a/proto/eth/service/node_service.pb.go b/proto/eth/service/node_service.pb.go index 1a15e4c99699..ab958f0e4122 100755 --- a/proto/eth/service/node_service.pb.go +++ b/proto/eth/service/node_service.pb.go @@ -8,17 +8,16 @@ package service import ( context "context" - reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" empty "github.com/golang/protobuf/ptypes/empty" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" ) const ( @@ -97,7 +96,7 @@ var file_proto_eth_service_node_service_proto_rawDesc = []byte{ 0x10, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xaa, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x53, diff --git a/proto/eth/service/node_service.pb.gw.go b/proto/eth/service/node_service.pb.gw.go index 56f6d61be5b7..c0df9c57d463 100755 --- a/proto/eth/service/node_service.pb.gw.go +++ b/proto/eth/service/node_service.pb.gw.go @@ -10,21 +10,20 @@ package service import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -34,7 +33,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/eth/service/node_service.proto b/proto/eth/service/node_service.proto index 1f43078bee29..0304551ee7f3 100644 --- a/proto/eth/service/node_service.proto +++ b/proto/eth/service/node_service.proto @@ -22,7 +22,7 @@ import "google/protobuf/empty.proto"; import "proto/eth/v1/node.proto"; option csharp_namespace = "Ethereum.Eth.Service"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/service"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/service"; option java_multiple_files = true; option java_outer_classname = "NodeServiceProto"; option java_package = "org.ethereum.eth.service"; diff --git a/proto/eth/service/validator_service.pb.go b/proto/eth/service/validator_service.pb.go index 9ceb440dd300..adca208a162a 100755 --- a/proto/eth/service/validator_service.pb.go +++ b/proto/eth/service/validator_service.pb.go @@ -8,18 +8,17 @@ package service import ( context "context" - reflect "reflect" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" empty "github.com/golang/protobuf/ptypes/empty" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" ) const ( @@ -234,7 +233,7 @@ var file_proto_eth_service_validator_service_proto_rawDesc = []byte{ 0x74, 0x6f, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xaa, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x14, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x53, 0x65, 0x72, diff --git a/proto/eth/service/validator_service.pb.gw.go b/proto/eth/service/validator_service.pb.gw.go index 52634e2299ca..c601ec1f8c0c 100755 --- a/proto/eth/service/validator_service.pb.gw.go +++ b/proto/eth/service/validator_service.pb.gw.go @@ -10,22 +10,21 @@ package service import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -35,7 +34,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} @@ -67,7 +66,7 @@ func request_BeaconValidator_GetAttesterDuties_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := client.GetAttesterDuties(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err @@ -102,7 +101,7 @@ func local_request_BeaconValidator_GetAttesterDuties_0(ctx context.Context, mars if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := server.GetAttesterDuties(ctx, &protoReq) return msg, metadata, err @@ -129,7 +128,7 @@ func request_BeaconValidator_GetProposerDuties_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := client.GetProposerDuties(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err @@ -156,7 +155,7 @@ func local_request_BeaconValidator_GetProposerDuties_0(ctx context.Context, mars if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := server.GetProposerDuties(ctx, &protoReq) return msg, metadata, err @@ -191,7 +190,7 @@ func request_BeaconValidator_GetSyncCommitteeDuties_0(ctx context.Context, marsh if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := client.GetSyncCommitteeDuties(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err @@ -226,7 +225,7 @@ func local_request_BeaconValidator_GetSyncCommitteeDuties_0(ctx context.Context, if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := server.GetSyncCommitteeDuties(ctx, &protoReq) return msg, metadata, err @@ -257,7 +256,7 @@ func request_BeaconValidator_ProduceBlockV2_0(ctx context.Context, marshaler run if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -291,7 +290,7 @@ func local_request_BeaconValidator_ProduceBlockV2_0(ctx context.Context, marshal if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -329,7 +328,7 @@ func request_BeaconValidator_ProduceBlockV2SSZ_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -363,7 +362,7 @@ func local_request_BeaconValidator_ProduceBlockV2SSZ_0(ctx context.Context, mars if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -401,7 +400,7 @@ func request_BeaconValidator_ProduceBlindedBlock_0(ctx context.Context, marshale if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -435,7 +434,7 @@ func local_request_BeaconValidator_ProduceBlindedBlock_0(ctx context.Context, ma if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -473,7 +472,7 @@ func request_BeaconValidator_ProduceBlindedBlockSSZ_0(ctx context.Context, marsh if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -507,7 +506,7 @@ func local_request_BeaconValidator_ProduceBlindedBlockSSZ_0(ctx context.Context, if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "slot", err) } - protoReq.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(slot) + protoReq.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(slot) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) @@ -861,7 +860,7 @@ func request_BeaconValidator_GetLiveness_0(ctx context.Context, marshaler runtim if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := client.GetLiveness(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err @@ -896,7 +895,7 @@ func local_request_BeaconValidator_GetLiveness_0(ctx context.Context, marshaler if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "epoch", err) } - protoReq.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(epoch) + protoReq.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(epoch) msg, err := server.GetLiveness(ctx, &protoReq) return msg, metadata, err diff --git a/proto/eth/service/validator_service.proto b/proto/eth/service/validator_service.proto index 668519e88cda..e77d81f3fab3 100644 --- a/proto/eth/service/validator_service.proto +++ b/proto/eth/service/validator_service.proto @@ -24,7 +24,7 @@ import "proto/eth/v2/ssz.proto"; import "proto/eth/v2/validator.proto"; option csharp_namespace = "Ethereum.Eth.Service"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/service"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/service"; option java_multiple_files = true; option java_outer_classname = "ValidatorServiceProto"; option java_package = "org.ethereum.eth.service"; diff --git a/proto/eth/v1/BUILD.bazel b/proto/eth/v1/BUILD.bazel index 0ffed2e3f147..cc6b945203ec 100644 --- a/proto/eth/v1/BUILD.bazel +++ b/proto/eth/v1/BUILD.bazel @@ -67,7 +67,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -88,7 +88,7 @@ go_proto_library( "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-grpc-gateway:go_gen_grpc_gateway", ], embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1", protos = [":proto"], visibility = ["//proto:__subpackages__"], ) @@ -101,7 +101,7 @@ go_library( embed = [ ":go_grpc_gateway_library", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1", visibility = ["//visibility:public"], deps = SSZ_DEPS ) diff --git a/proto/eth/v1/attestation.pb.go b/proto/eth/v1/attestation.pb.go index 1f2fc0cb396d..817b16367d4c 100755 --- a/proto/eth/v1/attestation.pb.go +++ b/proto/eth/v1/attestation.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -93,7 +92,7 @@ type AggregateAttestationAndProof struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AggregatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + AggregatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Aggregate *Attestation `protobuf:"bytes,3,opt,name=aggregate,proto3" json:"aggregate,omitempty"` SelectionProof []byte `protobuf:"bytes,2,opt,name=selection_proof,json=selectionProof,proto3" json:"selection_proof,omitempty" ssz-size:"96"` } @@ -130,11 +129,11 @@ func (*AggregateAttestationAndProof) Descriptor() ([]byte, []int) { return file_proto_eth_v1_attestation_proto_rawDescGZIP(), []int{1} } -func (x *AggregateAttestationAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *AggregateAttestationAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.AggregatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *AggregateAttestationAndProof) GetAggregate() *Attestation { @@ -211,8 +210,8 @@ type AttestationData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` BeaconBlockRoot []byte `protobuf:"bytes,3,opt,name=beacon_block_root,json=beaconBlockRoot,proto3" json:"beacon_block_root,omitempty" ssz-size:"32"` Source *Checkpoint `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"` Target *Checkpoint `protobuf:"bytes,5,opt,name=target,proto3" json:"target,omitempty"` @@ -250,18 +249,18 @@ func (*AttestationData) Descriptor() ([]byte, []int) { return file_proto_eth_v1_attestation_proto_rawDescGZIP(), []int{3} } -func (x *AttestationData) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AttestationData) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *AttestationData) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AttestationData) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } func (x *AttestationData) GetBeaconBlockRoot() []byte { @@ -290,7 +289,7 @@ type Checkpoint struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Root []byte `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty" ssz-size:"32"` } @@ -326,11 +325,11 @@ func (*Checkpoint) Descriptor() ([]byte, []int) { return file_proto_eth_v1_attestation_proto_rawDescGZIP(), []int{4} } -func (x *Checkpoint) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Checkpoint) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *Checkpoint) GetRoot() []byte { @@ -369,7 +368,7 @@ var file_proto_eth_v1_attestation_proto_rawDesc = []byte{ 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3a, @@ -393,13 +392,13 @@ var file_proto_eth_v1_attestation_proto_rawDesc = []byte{ 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x32, 0x0a, 0x11, 0x62, 0x65, 0x61, 0x63, 0x6f, @@ -416,7 +415,7 @@ var file_proto_eth_v1_attestation_proto_rawDesc = []byte{ 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, @@ -425,7 +424,7 @@ var file_proto_eth_v1_attestation_proto_rawDesc = []byte{ 0x74, 0x68, 0x2e, 0x76, 0x31, 0x42, 0x10, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, diff --git a/proto/eth/v1/attestation.proto b/proto/eth/v1/attestation.proto index 383fad23ea4c..0da8ad08a947 100644 --- a/proto/eth/v1/attestation.proto +++ b/proto/eth/v1/attestation.proto @@ -19,7 +19,7 @@ import "google/protobuf/descriptor.proto"; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "AttestationProto"; option java_package = "org.ethereum.eth.v1"; @@ -38,7 +38,7 @@ message Attestation { message AggregateAttestationAndProof { // The aggregator index that submitted this aggregated attestation and proof. - uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The aggregated attestation that was submitted. Attestation aggregate = 3; @@ -60,10 +60,10 @@ message AttestationData { // See: https://arxiv.org/pdf/1710.09437.pdf // Slot of the attestation attesting for. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The committee index that submitted this attestation. - uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // 32 byte root of the LMD GHOST block vote. bytes beacon_block_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -80,7 +80,7 @@ message Checkpoint { // is to link the check points together for justification and finalization. // Epoch the checkpoint references. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Block root of the checkpoint references. bytes root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; diff --git a/proto/eth/v1/beacon_block.pb.go b/proto/eth/v1/beacon_block.pb.go index 19ed536e34cf..4d6acf2b35d6 100755 --- a/proto/eth/v1/beacon_block.pb.go +++ b/proto/eth/v1/beacon_block.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -30,8 +29,8 @@ type BeaconBlock struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBody `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -69,18 +68,18 @@ func (*BeaconBlock) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_block_proto_rawDescGZIP(), []int{0} } -func (x *BeaconBlock) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlock) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlock) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlock) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlock) GetParentRoot() []byte { @@ -432,8 +431,8 @@ type VoluntaryExit struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *VoluntaryExit) Reset() { @@ -468,18 +467,18 @@ func (*VoluntaryExit) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_block_proto_rawDescGZIP(), []int{6} } -func (x *VoluntaryExit) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *VoluntaryExit) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *VoluntaryExit) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *VoluntaryExit) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type SignedVoluntaryExit struct { @@ -605,8 +604,8 @@ type BeaconBlockHeader struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` BodyRoot []byte `protobuf:"bytes,5,opt,name=body_root,json=bodyRoot,proto3" json:"body_root,omitempty" ssz-size:"32"` @@ -644,18 +643,18 @@ func (*BeaconBlockHeader) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_block_proto_rawDescGZIP(), []int{9} } -func (x *BeaconBlockHeader) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockHeader) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockHeader) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockHeader) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockHeader) GetParentRoot() []byte { @@ -939,13 +938,13 @@ var file_proto_eth_v1_beacon_block_proto_rawDesc = []byte{ 0x6b, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, @@ -1043,13 +1042,13 @@ var file_proto_eth_v1_beacon_block_proto_rawDesc = []byte{ 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x78, 0x0a, 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, @@ -1073,13 +1072,13 @@ var file_proto_eth_v1_beacon_block_proto_rawDesc = []byte{ 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, @@ -1126,7 +1125,7 @@ var file_proto_eth_v1_beacon_block_proto_rawDesc = []byte{ 0x10, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/eth/v1/beacon_block.proto b/proto/eth/v1/beacon_block.proto index a1b37383edc9..3dd42e672597 100644 --- a/proto/eth/v1/beacon_block.proto +++ b/proto/eth/v1/beacon_block.proto @@ -20,7 +20,7 @@ import "proto/eth/ext/options.proto"; import "proto/eth/v1/attestation.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "BeaconBlockProto"; option java_package = "org.ethereum.eth.v1"; @@ -29,10 +29,10 @@ option php_namespace = "Ethereum\\Eth\\v1"; // The Ethereum consensus beacon block. The message does not contain a validator signature. message BeaconBlock { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -132,10 +132,10 @@ message Deposit { // validator signature. message VoluntaryExit { // The epoch on when exit request becomes valid. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Index of the exiting validator. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } // The signed version of voluntary exit. @@ -168,10 +168,10 @@ message Eth1Data { // a validator signature. message BeaconBlockHeader { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte merkle tree root of the parent ssz encoded block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; diff --git a/proto/eth/v1/beacon_chain.pb.go b/proto/eth/v1/beacon_chain.pb.go index 29f8ea7cb798..d7dd074acfaf 100755 --- a/proto/eth/v1/beacon_chain.pb.go +++ b/proto/eth/v1/beacon_chain.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" timestamp "github.com/golang/protobuf/ptypes/timestamp" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -606,7 +605,7 @@ type ValidatorBalance struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Balance uint64 `protobuf:"varint,2,opt,name=balance,proto3" json:"balance,omitempty"` } @@ -642,11 +641,11 @@ func (*ValidatorBalance) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_chain_proto_rawDescGZIP(), []int{9} } -func (x *ValidatorBalance) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorBalance) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *ValidatorBalance) GetBalance() uint64 { @@ -780,9 +779,9 @@ type StateCommitteesRequest struct { unknownFields protoimpl.UnknownFields StateId []byte `protobuf:"bytes,1,opt,name=state_id,json=stateId,proto3" json:"state_id,omitempty"` - Epoch *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=epoch,proto3,oneof" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - Index *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,3,opt,name=index,proto3,oneof" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` - Slot *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,4,opt,name=slot,proto3,oneof" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Epoch *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=epoch,proto3,oneof" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + Index *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,3,opt,name=index,proto3,oneof" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` + Slot *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,4,opt,name=slot,proto3,oneof" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *StateCommitteesRequest) Reset() { @@ -824,25 +823,25 @@ func (x *StateCommitteesRequest) GetStateId() []byte { return nil } -func (x *StateCommitteesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *StateCommitteesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil && x.Epoch != nil { return *x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *StateCommitteesRequest) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *StateCommitteesRequest) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil && x.Index != nil { return *x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } -func (x *StateCommitteesRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *StateCommitteesRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil && x.Slot != nil { return *x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type StateCommitteesResponse struct { @@ -1086,7 +1085,7 @@ type BlockHeadersRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3,oneof" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3,oneof" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` ParentRoot []byte `protobuf:"bytes,2,opt,name=parent_root,json=parentRoot,proto3,oneof" json:"parent_root,omitempty" ssz-size:"32"` } @@ -1122,11 +1121,11 @@ func (*BlockHeadersRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_chain_proto_rawDescGZIP(), []int{17} } -func (x *BlockHeadersRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlockHeadersRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil && x.Slot != nil { return *x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BlockHeadersRequest) GetParentRoot() []byte { @@ -1581,8 +1580,8 @@ type AttestationsPoolRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3,oneof" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - CommitteeIndex *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3,oneof" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slot *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3,oneof" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + CommitteeIndex *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3,oneof" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` } func (x *AttestationsPoolRequest) Reset() { @@ -1617,18 +1616,18 @@ func (*AttestationsPoolRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_chain_proto_rawDescGZIP(), []int{26} } -func (x *AttestationsPoolRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AttestationsPoolRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil && x.Slot != nil { return *x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *AttestationsPoolRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AttestationsPoolRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil && x.CommitteeIndex != nil { return *x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } type SubmitAttestationsRequest struct { @@ -2274,13 +2273,13 @@ type ForkChoiceNode struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` BlockRoot []byte `protobuf:"bytes,2,opt,name=block_root,json=blockRoot,proto3" json:"block_root,omitempty" ssz-size:"32"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` - JustifiedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,4,opt,name=justified_epoch,json=justifiedEpoch,proto3" json:"justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - FinalizedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=finalized_epoch,json=finalizedEpoch,proto3" json:"finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - UnrealizedJustifiedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,6,opt,name=unrealized_justified_epoch,json=unrealizedJustifiedEpoch,proto3" json:"unrealized_justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - UnrealizedFinalizedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=unrealized_finalized_epoch,json=unrealizedFinalizedEpoch,proto3" json:"unrealized_finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + JustifiedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,4,opt,name=justified_epoch,json=justifiedEpoch,proto3" json:"justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + FinalizedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=finalized_epoch,json=finalizedEpoch,proto3" json:"finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + UnrealizedJustifiedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,6,opt,name=unrealized_justified_epoch,json=unrealizedJustifiedEpoch,proto3" json:"unrealized_justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + UnrealizedFinalizedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=unrealized_finalized_epoch,json=unrealizedFinalizedEpoch,proto3" json:"unrealized_finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Balance uint64 `protobuf:"varint,8,opt,name=balance,proto3" json:"balance,omitempty"` Weight uint64 `protobuf:"varint,9,opt,name=weight,proto3" json:"weight,omitempty"` ExecutionOptimistic bool `protobuf:"varint,10,opt,name=execution_optimistic,json=executionOptimistic,proto3" json:"execution_optimistic,omitempty"` @@ -2321,11 +2320,11 @@ func (*ForkChoiceNode) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_chain_proto_rawDescGZIP(), []int{39} } -func (x *ForkChoiceNode) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ForkChoiceNode) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *ForkChoiceNode) GetBlockRoot() []byte { @@ -2342,32 +2341,32 @@ func (x *ForkChoiceNode) GetParentRoot() []byte { return nil } -func (x *ForkChoiceNode) GetJustifiedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ForkChoiceNode) GetJustifiedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.JustifiedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *ForkChoiceNode) GetFinalizedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ForkChoiceNode) GetFinalizedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.FinalizedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *ForkChoiceNode) GetUnrealizedJustifiedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ForkChoiceNode) GetUnrealizedJustifiedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.UnrealizedJustifiedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *ForkChoiceNode) GetUnrealizedFinalizedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ForkChoiceNode) GetUnrealizedFinalizedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.UnrealizedFinalizedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ForkChoiceNode) GetBalance() uint64 { @@ -2713,7 +2712,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, @@ -2740,20 +2739,20 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x64, 0x12, 0x61, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x88, 0x01, 0x01, 0x12, 0x6a, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x48, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x88, 0x01, 0x01, 0x12, 0x5e, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x48, 0x02, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x69, @@ -2795,7 +2794,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2c, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, @@ -2863,14 +2862,14 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x74, 0x12, 0x5e, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x7d, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x48, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x88, 0x01, 0x01, @@ -2981,7 +2980,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, @@ -2992,7 +2991,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x12, 0x6f, 0x0a, 0x0f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, @@ -3000,14 +2999,14 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x84, 0x01, 0x0a, 0x1a, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x18, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x4a, 0x75, 0x73, 0x74, 0x69, @@ -3016,7 +3015,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x18, 0x75, 0x6e, 0x72, 0x65, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, @@ -3045,7 +3044,7 @@ var file_proto_eth_v1_beacon_chain_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, + 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/eth/v1/beacon_chain.proto b/proto/eth/v1/beacon_chain.proto index ae768dc8c607..070914c2ab57 100644 --- a/proto/eth/v1/beacon_chain.proto +++ b/proto/eth/v1/beacon_chain.proto @@ -25,7 +25,7 @@ import "proto/eth/v1/beacon_state.proto"; import "proto/eth/v1/validator.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "BeaconChainProto"; option java_package = "org.ethereum.eth.v1"; @@ -118,7 +118,7 @@ message ValidatorBalancesResponse { message ValidatorBalance { // The index of the validator the retrieved balance is for. - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The balance of the requested validator. uint64 balance = 2; @@ -145,13 +145,13 @@ message StateCommitteesRequest { bytes state_id = 1; // The epoch to retrieve the committees of. - optional uint64 epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + optional uint64 epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Committee index requested. - optional uint64 index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + optional uint64 index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // Committee slot requested. - optional uint64 slot = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + optional uint64 slot = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message StateCommitteesResponse { @@ -181,7 +181,7 @@ message BlockRootResponse { message BlockHeadersRequest { // Beacon chain slot of the requested block. - optional uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + optional uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 32 byte merkle tree root of the ssz encoded parent block. optional bytes parent_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -242,8 +242,8 @@ message BeaconBlockContainer { // Beacon Pool related API service. message AttestationsPoolRequest { - optional uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; - optional uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + optional uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; + optional uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; } message SubmitAttestationsRequest { @@ -329,19 +329,19 @@ message ForkChoiceDump { message ForkChoiceNode { // Slot of the forkchoice node. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Root of the forkchoice node. bytes block_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; // Parent root of the forkchoice node. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; // Justified epoch of the current forkchoice node. - uint64 justified_epoch = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 justified_epoch = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // finalized epoch of the current forkchoice node. - uint64 finalized_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 finalized_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Unrealized justified epoch of the current forkchoice node. - uint64 unrealized_justified_epoch = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 unrealized_justified_epoch = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Unrealized finalized epoch of the current forkchoice node. - uint64 unrealized_finalized_epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 unrealized_finalized_epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Current balance of the current forkchoice node. uint64 balance = 8; // Current weight of the current forkchoice node. diff --git a/proto/eth/v1/beacon_state.pb.go b/proto/eth/v1/beacon_state.pb.go index 0cfa6a414eee..7dc64d76c14b 100755 --- a/proto/eth/v1/beacon_state.pb.go +++ b/proto/eth/v1/beacon_state.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -32,7 +31,7 @@ type BeaconState struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -99,11 +98,11 @@ func (x *BeaconState) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconState) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconState) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconState) GetFork() *Fork { @@ -239,8 +238,8 @@ type PendingAttestation struct { AggregationBits github_com_prysmaticlabs_go_bitfield.Bitlist `protobuf:"bytes,1,opt,name=aggregation_bits,json=aggregationBits,proto3" json:"aggregation_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitlist" ssz-max:"2048"` Data *AttestationData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - InclusionDelay github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=inclusion_delay,json=inclusionDelay,proto3" json:"inclusion_delay,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + InclusionDelay github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=inclusion_delay,json=inclusionDelay,proto3" json:"inclusion_delay,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *PendingAttestation) Reset() { @@ -289,18 +288,18 @@ func (x *PendingAttestation) GetData() *AttestationData { return nil } -func (x *PendingAttestation) GetInclusionDelay() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *PendingAttestation) GetInclusionDelay() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.InclusionDelay } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *PendingAttestation) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *PendingAttestation) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type Committee struct { @@ -308,9 +307,9 @@ type Committee struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - Validators []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=validators,proto3" json:"validators,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + Validators []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=validators,proto3" json:"validators,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *Committee) Reset() { @@ -345,25 +344,25 @@ func (*Committee) Descriptor() ([]byte, []int) { return file_proto_eth_v1_beacon_state_proto_rawDescGZIP(), []int{2} } -func (x *Committee) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *Committee) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } -func (x *Committee) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *Committee) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *Committee) GetValidators() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *Committee) GetValidators() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Validators } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type Fork struct { @@ -373,7 +372,7 @@ type Fork struct { PreviousVersion []byte `protobuf:"bytes,1,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty" ssz-size:"4"` CurrentVersion []byte `protobuf:"bytes,2,opt,name=current_version,json=currentVersion,proto3" json:"current_version,omitempty" ssz-size:"4"` - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *Fork) Reset() { @@ -422,11 +421,11 @@ func (x *Fork) GetCurrentVersion() []byte { return nil } -func (x *Fork) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Fork) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type ForkChoiceHeadsResponse struct { @@ -482,7 +481,7 @@ type ForkChoiceHead struct { unknownFields protoimpl.UnknownFields Root []byte `protobuf:"bytes,1,opt,name=root,proto3" json:"root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *ForkChoiceHead) Reset() { @@ -524,11 +523,11 @@ func (x *ForkChoiceHead) GetRoot() []byte { return nil } -func (x *ForkChoiceHead) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ForkChoiceHead) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type BeaconStateResponse struct { @@ -604,7 +603,7 @@ var file_proto_eth_v1_beacon_state_proto_rawDesc = []byte{ 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x5a, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2a, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x0b, @@ -702,14 +701,14 @@ var file_proto_eth_v1_beacon_state_proto_rawDesc = []byte{ 0x12, 0x6e, 0x0a, 0x0f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, @@ -717,20 +716,20 @@ var file_proto_eth_v1_beacon_state_proto_rawDesc = []byte{ 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x6f, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x04, 0x46, 0x6f, @@ -743,7 +742,7 @@ var file_proto_eth_v1_beacon_state_proto_rawDesc = []byte{ 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x22, 0x4e, 0x0a, 0x17, 0x46, 0x6f, 0x72, 0x6b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, @@ -757,7 +756,7 @@ var file_proto_eth_v1_beacon_state_proto_rawDesc = []byte{ 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0x47, 0x0a, 0x13, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, @@ -769,7 +768,7 @@ var file_proto_eth_v1_beacon_state_proto_rawDesc = []byte{ 0x61, 0x63, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, + 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/eth/v1/beacon_state.proto b/proto/eth/v1/beacon_state.proto index 4c21dbb17fef..2196fb69e09e 100644 --- a/proto/eth/v1/beacon_state.proto +++ b/proto/eth/v1/beacon_state.proto @@ -23,7 +23,7 @@ import "proto/eth/v1/beacon_block.proto"; import "proto/eth/v1/validator.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "BeaconStateProto"; option java_package = "org.ethereum.eth.v1"; @@ -33,7 +33,7 @@ message BeaconState { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; Fork fork = 1004; // History [2001-3000] @@ -75,22 +75,22 @@ message PendingAttestation { bytes aggregation_bits = 1 [(ethereum.eth.ext.ssz_max) = "2048", (ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/go-bitfield.Bitlist"]; AttestationData data = 2; // The difference of when attestation gets created and get included on chain. - uint64 inclusion_delay = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 inclusion_delay = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The proposer who included the attestation in the block. - uint64 proposer_index = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message Committee { - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; - repeated uint64 validators = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; + repeated uint64 validators = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } // Fork structure used for indicating beacon chain versioning and forks. message Fork { bytes previous_version = 1 [(ethereum.eth.ext.ssz_size) = "4"]; bytes current_version = 2 [(ethereum.eth.ext.ssz_size) = "4"]; - uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } message ForkChoiceHeadsResponse { @@ -99,7 +99,7 @@ message ForkChoiceHeadsResponse { message ForkChoiceHead { bytes root = 1 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message BeaconStateResponse { diff --git a/proto/eth/v1/events.pb.go b/proto/eth/v1/events.pb.go index 08246001f2c4..21e0427793d3 100755 --- a/proto/eth/v1/events.pb.go +++ b/proto/eth/v1/events.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -77,7 +76,7 @@ type EventHead struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Block []byte `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty" ssz-size:"32"` State []byte `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty" ssz-size:"32"` EpochTransition bool `protobuf:"varint,4,opt,name=epoch_transition,json=epochTransition,proto3" json:"epoch_transition,omitempty"` @@ -118,11 +117,11 @@ func (*EventHead) Descriptor() ([]byte, []int) { return file_proto_eth_v1_events_proto_rawDescGZIP(), []int{1} } -func (x *EventHead) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *EventHead) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *EventHead) GetBlock() []byte { @@ -172,7 +171,7 @@ type EventBlock struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Block []byte `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty" ssz-size:"32"` ExecutionOptimistic bool `protobuf:"varint,3,opt,name=execution_optimistic,json=executionOptimistic,proto3" json:"execution_optimistic,omitempty"` } @@ -209,11 +208,11 @@ func (*EventBlock) Descriptor() ([]byte, []int) { return file_proto_eth_v1_events_proto_rawDescGZIP(), []int{2} } -func (x *EventBlock) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *EventBlock) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *EventBlock) GetBlock() []byte { @@ -235,13 +234,13 @@ type EventChainReorg struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Depth uint64 `protobuf:"varint,2,opt,name=depth,proto3" json:"depth,omitempty"` OldHeadBlock []byte `protobuf:"bytes,3,opt,name=old_head_block,json=oldHeadBlock,proto3" json:"old_head_block,omitempty" ssz-size:"32"` NewHeadBlock []byte `protobuf:"bytes,4,opt,name=new_head_block,json=newHeadBlock,proto3" json:"new_head_block,omitempty" ssz-size:"32"` OldHeadState []byte `protobuf:"bytes,5,opt,name=old_head_state,json=oldHeadState,proto3" json:"old_head_state,omitempty" ssz-size:"32"` NewHeadState []byte `protobuf:"bytes,6,opt,name=new_head_state,json=newHeadState,proto3" json:"new_head_state,omitempty" ssz-size:"32"` - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` ExecutionOptimistic bool `protobuf:"varint,8,opt,name=execution_optimistic,json=executionOptimistic,proto3" json:"execution_optimistic,omitempty"` } @@ -277,11 +276,11 @@ func (*EventChainReorg) Descriptor() ([]byte, []int) { return file_proto_eth_v1_events_proto_rawDescGZIP(), []int{3} } -func (x *EventChainReorg) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *EventChainReorg) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *EventChainReorg) GetDepth() uint64 { @@ -319,11 +318,11 @@ func (x *EventChainReorg) GetNewHeadState() []byte { return nil } -func (x *EventChainReorg) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *EventChainReorg) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *EventChainReorg) GetExecutionOptimistic() bool { @@ -340,7 +339,7 @@ type EventFinalizedCheckpoint struct { Block []byte `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty" ssz-size:"32"` State []byte `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty" ssz-size:"32"` - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` ExecutionOptimistic bool `protobuf:"varint,4,opt,name=execution_optimistic,json=executionOptimistic,proto3" json:"execution_optimistic,omitempty"` } @@ -390,11 +389,11 @@ func (x *EventFinalizedCheckpoint) GetState() []byte { return nil } -func (x *EventFinalizedCheckpoint) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *EventFinalizedCheckpoint) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *EventFinalizedCheckpoint) GetExecutionOptimistic() bool { @@ -519,11 +518,11 @@ type EventPayloadAttributeV1_BasePayloadAttribute struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ProposalSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=proposal_slot,json=proposalSlot,proto3" json:"proposal_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + ProposalSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=proposal_slot,json=proposalSlot,proto3" json:"proposal_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` ParentBlockNumber uint64 `protobuf:"varint,4,opt,name=parent_block_number,json=parentBlockNumber,proto3" json:"parent_block_number,omitempty"` ParentBlockRoot []byte `protobuf:"bytes,5,opt,name=parent_block_root,json=parentBlockRoot,proto3" json:"parent_block_root,omitempty" ssz-size:"32"` ParentBlockHash []byte `protobuf:"bytes,6,opt,name=parent_block_hash,json=parentBlockHash,proto3" json:"parent_block_hash,omitempty" ssz-size:"32"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` PayloadAttributes *v1.PayloadAttributes `protobuf:"bytes,8,opt,name=payload_attributes,json=payloadAttributes,proto3" json:"payload_attributes,omitempty"` } @@ -559,11 +558,11 @@ func (*EventPayloadAttributeV1_BasePayloadAttribute) Descriptor() ([]byte, []int return file_proto_eth_v1_events_proto_rawDescGZIP(), []int{5, 0} } -func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetProposalSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetProposalSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.ProposalSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetParentBlockNumber() uint64 { @@ -587,11 +586,11 @@ func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetParentBlockHash() []by return nil } -func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *EventPayloadAttributeV1_BasePayloadAttribute) GetPayloadAttributes() *v1.PayloadAttributes { @@ -606,11 +605,11 @@ type EventPayloadAttributeV2_BasePayloadAttribute struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ProposalSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=proposal_slot,json=proposalSlot,proto3" json:"proposal_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + ProposalSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=proposal_slot,json=proposalSlot,proto3" json:"proposal_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` ParentBlockNumber uint64 `protobuf:"varint,4,opt,name=parent_block_number,json=parentBlockNumber,proto3" json:"parent_block_number,omitempty"` ParentBlockRoot []byte `protobuf:"bytes,5,opt,name=parent_block_root,json=parentBlockRoot,proto3" json:"parent_block_root,omitempty" ssz-size:"32"` ParentBlockHash []byte `protobuf:"bytes,6,opt,name=parent_block_hash,json=parentBlockHash,proto3" json:"parent_block_hash,omitempty" ssz-size:"32"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` PayloadAttributesV2 *v1.PayloadAttributesV2 `protobuf:"bytes,8,opt,name=payload_attributes_v2,json=payloadAttributesV2,proto3" json:"payload_attributes_v2,omitempty"` } @@ -646,11 +645,11 @@ func (*EventPayloadAttributeV2_BasePayloadAttribute) Descriptor() ([]byte, []int return file_proto_eth_v1_events_proto_rawDescGZIP(), []int{6, 0} } -func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetProposalSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetProposalSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.ProposalSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetParentBlockNumber() uint64 { @@ -674,11 +673,11 @@ func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetParentBlockHash() []by return nil } -func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *EventPayloadAttributeV2_BasePayloadAttribute) GetPayloadAttributesV2() *v1.PayloadAttributesV2 { @@ -707,7 +706,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x1c, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, @@ -732,7 +731,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x1c, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, @@ -744,7 +743,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x65, 0x6f, 0x72, 0x67, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x70, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, @@ -763,7 +762,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x31, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, @@ -777,7 +776,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x31, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, @@ -797,7 +796,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, @@ -813,7 +812,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, @@ -836,7 +835,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x70, 0x61, @@ -853,7 +852,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x6e, 0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5b, 0x0a, 0x15, 0x70, 0x61, @@ -867,7 +866,7 @@ var file_proto_eth_v1_events_proto_rawDesc = []byte{ 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/eth/v1/events.proto b/proto/eth/v1/events.proto index df48ddb6f9ce..ddf5fd98e55e 100644 --- a/proto/eth/v1/events.proto +++ b/proto/eth/v1/events.proto @@ -20,7 +20,7 @@ import "proto/eth/ext/options.proto"; import "proto/engine/v1/execution_engine.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "BeaconEventsProto"; option java_package = "org.ethereum.eth.v1"; @@ -34,7 +34,7 @@ message StreamEventsRequest { message EventHead { // Slot of the new chain head. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Block root of the new chain head. bytes block = 2 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -57,7 +57,7 @@ message EventHead { message EventBlock { // The slot of the observed block. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The root of the observed block. bytes block = 2 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -68,7 +68,7 @@ message EventBlock { message EventChainReorg { // The slot of the observed reorg. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Depth of the reorg in slots. uint64 depth = 2; @@ -86,7 +86,7 @@ message EventChainReorg { bytes new_head_state = 6 [(ethereum.eth.ext.ssz_size) = "32"]; // Epoch of the observed reorg. - uint64 epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Information about optimistic sync. bool execution_optimistic = 8; @@ -100,7 +100,7 @@ message EventFinalizedCheckpoint { bytes state = 2 [(ethereum.eth.ext.ssz_size) = "32"]; // Epoch the checkpoint references. - uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Information about optimistic sync. bool execution_optimistic = 4; @@ -112,7 +112,7 @@ message EventPayloadAttributeV1 { BasePayloadAttribute data = 2; message BasePayloadAttribute { // The slot at which a block using these payload attributes may be built. - uint64 proposal_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 proposal_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The execution block number of the parent block. uint64 parent_block_number = 4; @@ -124,7 +124,7 @@ message EventPayloadAttributeV1 { bytes parent_block_hash = 6 [(ethereum.eth.ext.ssz_size) = "32"]; // The validator index of the proposer at proposal_slot on the chain identified by parent_block_root. - uint64 proposer_index = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // payload_attributes: beacon API encoding of PayloadAttributesV as defined by the execution-apis specification. // The version N must match the payload attributes for the hard fork matching version. @@ -141,7 +141,7 @@ message EventPayloadAttributeV2 { BasePayloadAttribute data = 2; message BasePayloadAttribute { // The slot at which a block using these payload attributes may be built. - uint64 proposal_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 proposal_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The execution block number of the parent block. uint64 parent_block_number = 4; @@ -153,7 +153,7 @@ message EventPayloadAttributeV2 { bytes parent_block_hash = 6 [(ethereum.eth.ext.ssz_size) = "32"]; // The validator index of the proposer at proposal_slot on the chain identified by parent_block_root. - uint64 proposer_index = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // payload_attributes: beacon API encoding of PayloadAttributesV as defined by the execution-apis specification. // The version N must match the payload attributes for the hard fork matching version. diff --git a/proto/eth/v1/generated.ssz.go b/proto/eth/v1/generated.ssz.go index 70c084dca9d2..a7afef3a3e07 100644 --- a/proto/eth/v1/generated.ssz.go +++ b/proto/eth/v1/generated.ssz.go @@ -1,10 +1,10 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: fb4dd6cca9018196eaa56d51f14f2e924edf2ea0e1e19e262b24651d34d0fbfd +// Hash: 9d3bf801facfb6d585fde0fadcdf8946a18bf44771c59db3e180da32a6dc313a package v1 import ( ssz "github.com/prysmaticlabs/fastssz" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // MarshalSSZ ssz marshals the Attestation object @@ -187,7 +187,7 @@ func (a *AggregateAttestationAndProof) UnmarshalSSZ(buf []byte) error { var o1 uint64 // Field (0) 'AggregatorIndex' - a.AggregatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) + a.AggregatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) // Offset (1) 'Aggregate' if o1 = ssz.ReadOffset(buf[8:12]); o1 > size { @@ -425,10 +425,10 @@ func (a *AttestationData) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - a.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + a.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'Index' - a.Index = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(ssz.UnmarshallUint64(buf[8:16])) + a.Index = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'BeaconBlockRoot' if cap(a.BeaconBlockRoot) == 0 { @@ -532,7 +532,7 @@ func (c *Checkpoint) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Epoch' - c.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) + c.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'Root' if cap(c.Root) == 0 { @@ -633,10 +633,10 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -1652,10 +1652,10 @@ func (v *VoluntaryExit) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Epoch' - v.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) + v.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ValidatorIndex' - v.ValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + v.ValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) return err } @@ -1919,10 +1919,10 @@ func (b *BeaconBlockHeader) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -2503,16 +2503,16 @@ func (v *Validator) UnmarshalSSZ(buf []byte) error { v.Slashed = ssz.UnmarshalBool(buf[88:89]) // Field (4) 'ActivationEligibilityEpoch' - v.ActivationEligibilityEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[89:97])) + v.ActivationEligibilityEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[89:97])) // Field (5) 'ActivationEpoch' - v.ActivationEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[97:105])) + v.ActivationEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[97:105])) // Field (6) 'ExitEpoch' - v.ExitEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[105:113])) + v.ExitEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[105:113])) // Field (7) 'WithdrawableEpoch' - v.WithdrawableEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[113:121])) + v.WithdrawableEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[113:121])) return err } diff --git a/proto/eth/v1/node.pb.go b/proto/eth/v1/node.pb.go index 96637cc63896..7dce1638ea8f 100755 --- a/proto/eth/v1/node.pb.go +++ b/proto/eth/v1/node.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -780,8 +779,8 @@ type SyncInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeadSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=head_slot,json=headSlot,proto3" json:"head_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - SyncDistance github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=sync_distance,json=syncDistance,proto3" json:"sync_distance,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + HeadSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=head_slot,json=headSlot,proto3" json:"head_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + SyncDistance github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=sync_distance,json=syncDistance,proto3" json:"sync_distance,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` IsSyncing bool `protobuf:"varint,3,opt,name=is_syncing,json=isSyncing,proto3" json:"is_syncing,omitempty"` IsOptimistic bool `protobuf:"varint,4,opt,name=is_optimistic,json=isOptimistic,proto3" json:"is_optimistic,omitempty"` ElOffline bool `protobuf:"varint,5,opt,name=el_offline,json=elOffline,proto3" json:"el_offline,omitempty"` @@ -819,18 +818,18 @@ func (*SyncInfo) Descriptor() ([]byte, []int) { return file_proto_eth_v1_node_proto_rawDescGZIP(), []int{12} } -func (x *SyncInfo) GetHeadSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncInfo) GetHeadSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.HeadSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *SyncInfo) GetSyncDistance() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncInfo) GetSyncDistance() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.SyncDistance } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncInfo) GetIsSyncing() bool { @@ -1073,13 +1072,13 @@ var file_proto_eth_v1_node_proto_rawDesc = []byte{ 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x08, 0x68, 0x65, 0x61, 0x64, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x6a, 0x0a, 0x0d, 0x73, 0x79, 0x6e, 0x63, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0c, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1d, @@ -1102,7 +1101,7 @@ var file_proto_eth_v1_node_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6e, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, + 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/eth/v1/node.proto b/proto/eth/v1/node.proto index 94392decc09c..464cf64a356b 100644 --- a/proto/eth/v1/node.proto +++ b/proto/eth/v1/node.proto @@ -20,7 +20,7 @@ import "google/protobuf/descriptor.proto"; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "BeaconNodeProto"; option java_package = "org.ethereum.eth.v1"; @@ -136,10 +136,10 @@ message SyncingResponse { message SyncInfo { // A uint64 states the latest head slot of the current node. - uint64 head_slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 head_slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // A uint64 indicating how many slots are left for the beacon node sync to complete. - uint64 sync_distance = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 sync_distance = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // A bool indicating whether the node is currently syncing or not. bool is_syncing = 3; diff --git a/proto/eth/v1/validator.pb.go b/proto/eth/v1/validator.pb.go index 3faf5b28e4e7..7a50310be3d1 100755 --- a/proto/eth/v1/validator.pb.go +++ b/proto/eth/v1/validator.pb.go @@ -7,14 +7,13 @@ package v1 import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -108,7 +107,7 @@ type ValidatorContainer struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Balance uint64 `protobuf:"varint,2,opt,name=balance,proto3" json:"balance,omitempty"` Status ValidatorStatus `protobuf:"varint,3,opt,name=status,proto3,enum=ethereum.eth.v1.ValidatorStatus" json:"status,omitempty"` Validator *Validator `protobuf:"bytes,4,opt,name=validator,proto3" json:"validator,omitempty"` @@ -146,11 +145,11 @@ func (*ValidatorContainer) Descriptor() ([]byte, []int) { return file_proto_eth_v1_validator_proto_rawDescGZIP(), []int{0} } -func (x *ValidatorContainer) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorContainer) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *ValidatorContainer) GetBalance() uint64 { @@ -183,10 +182,10 @@ type Validator struct { WithdrawalCredentials []byte `protobuf:"bytes,2,opt,name=withdrawal_credentials,json=withdrawalCredentials,proto3" json:"withdrawal_credentials,omitempty" ssz-size:"32"` EffectiveBalance uint64 `protobuf:"varint,3,opt,name=effective_balance,json=effectiveBalance,proto3" json:"effective_balance,omitempty"` Slashed bool `protobuf:"varint,4,opt,name=slashed,proto3" json:"slashed,omitempty"` - ActivationEligibilityEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=activation_eligibility_epoch,json=activationEligibilityEpoch,proto3" json:"activation_eligibility_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - ActivationEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,6,opt,name=activation_epoch,json=activationEpoch,proto3" json:"activation_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - ExitEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=exit_epoch,json=exitEpoch,proto3" json:"exit_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - WithdrawableEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,8,opt,name=withdrawable_epoch,json=withdrawableEpoch,proto3" json:"withdrawable_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + ActivationEligibilityEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=activation_eligibility_epoch,json=activationEligibilityEpoch,proto3" json:"activation_eligibility_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + ActivationEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,6,opt,name=activation_epoch,json=activationEpoch,proto3" json:"activation_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + ExitEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=exit_epoch,json=exitEpoch,proto3" json:"exit_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + WithdrawableEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,8,opt,name=withdrawable_epoch,json=withdrawableEpoch,proto3" json:"withdrawable_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *Validator) Reset() { @@ -249,32 +248,32 @@ func (x *Validator) GetSlashed() bool { return false } -func (x *Validator) GetActivationEligibilityEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetActivationEligibilityEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ActivationEligibilityEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *Validator) GetActivationEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetActivationEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ActivationEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *Validator) GetExitEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetExitEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ExitEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *Validator) GetWithdrawableEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetWithdrawableEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.WithdrawableEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type AttesterDutiesRequest struct { @@ -282,8 +281,8 @@ type AttesterDutiesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - Index []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + Index []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *AttesterDutiesRequest) Reset() { @@ -318,18 +317,18 @@ func (*AttesterDutiesRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v1_validator_proto_rawDescGZIP(), []int{2} } -func (x *AttesterDutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *AttesterDutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *AttesterDutiesRequest) GetIndex() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *AttesterDutiesRequest) GetIndex() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type AttesterDutiesResponse struct { @@ -401,12 +400,12 @@ type AttesterDuty struct { unknownFields protoimpl.UnknownFields Pubkey []byte `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty" ssz-size:"48"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,3,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,3,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` CommitteeLength uint64 `protobuf:"varint,4,opt,name=committee_length,json=committeeLength,proto3" json:"committee_length,omitempty"` CommitteesAtSlot uint64 `protobuf:"varint,5,opt,name=committees_at_slot,json=committeesAtSlot,proto3" json:"committees_at_slot,omitempty"` - ValidatorCommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,6,opt,name=validator_committee_index,json=validatorCommitteeIndex,proto3" json:"validator_committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,7,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + ValidatorCommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,6,opt,name=validator_committee_index,json=validatorCommitteeIndex,proto3" json:"validator_committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,7,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *AttesterDuty) Reset() { @@ -448,18 +447,18 @@ func (x *AttesterDuty) GetPubkey() []byte { return nil } -func (x *AttesterDuty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *AttesterDuty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } -func (x *AttesterDuty) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AttesterDuty) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } func (x *AttesterDuty) GetCommitteeLength() uint64 { @@ -476,18 +475,18 @@ func (x *AttesterDuty) GetCommitteesAtSlot() uint64 { return 0 } -func (x *AttesterDuty) GetValidatorCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AttesterDuty) GetValidatorCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.ValidatorCommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } -func (x *AttesterDuty) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AttesterDuty) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type ProposerDutiesRequest struct { @@ -495,7 +494,7 @@ type ProposerDutiesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *ProposerDutiesRequest) Reset() { @@ -530,11 +529,11 @@ func (*ProposerDutiesRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v1_validator_proto_rawDescGZIP(), []int{5} } -func (x *ProposerDutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ProposerDutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type ProposerDutiesResponse struct { @@ -606,8 +605,8 @@ type ProposerDuty struct { unknownFields protoimpl.UnknownFields Pubkey []byte `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty" ssz-size:"48"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *ProposerDuty) Reset() { @@ -649,18 +648,18 @@ func (x *ProposerDuty) GetPubkey() []byte { return nil } -func (x *ProposerDuty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ProposerDuty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } -func (x *ProposerDuty) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ProposerDuty) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type ProduceBlockRequest struct { @@ -668,7 +667,7 @@ type ProduceBlockRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` RandaoReveal []byte `protobuf:"bytes,2,opt,name=randao_reveal,json=randaoReveal,proto3" json:"randao_reveal,omitempty" ssz-size:"96"` Graffiti []byte `protobuf:"bytes,3,opt,name=graffiti,proto3,oneof" json:"graffiti,omitempty" ssz-size:"32"` } @@ -705,11 +704,11 @@ func (*ProduceBlockRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v1_validator_proto_rawDescGZIP(), []int{8} } -func (x *ProduceBlockRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ProduceBlockRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *ProduceBlockRequest) GetRandaoReveal() []byte { @@ -778,8 +777,8 @@ type ProduceAttestationDataRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` } func (x *ProduceAttestationDataRequest) Reset() { @@ -814,18 +813,18 @@ func (*ProduceAttestationDataRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v1_validator_proto_rawDescGZIP(), []int{10} } -func (x *ProduceAttestationDataRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ProduceAttestationDataRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ProduceAttestationDataRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *ProduceAttestationDataRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } type ProduceAttestationDataResponse struct { @@ -881,7 +880,7 @@ type AggregateAttestationRequest struct { unknownFields protoimpl.UnknownFields AttestationDataRoot []byte `protobuf:"bytes,1,opt,name=attestation_data_root,json=attestationDataRoot,proto3" json:"attestation_data_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *AggregateAttestationRequest) Reset() { @@ -923,11 +922,11 @@ func (x *AggregateAttestationRequest) GetAttestationDataRoot() []byte { return nil } -func (x *AggregateAttestationRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AggregateAttestationRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type AggregateAttestationResponse struct { @@ -1076,10 +1075,10 @@ type BeaconCommitteeSubscribe struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` CommitteesAtSlot uint64 `protobuf:"varint,3,opt,name=committees_at_slot,json=committeesAtSlot,proto3" json:"committees_at_slot,omitempty"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,4,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,4,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` IsAggregator bool `protobuf:"varint,5,opt,name=is_aggregator,json=isAggregator,proto3" json:"is_aggregator,omitempty"` } @@ -1115,18 +1114,18 @@ func (*BeaconCommitteeSubscribe) Descriptor() ([]byte, []int) { return file_proto_eth_v1_validator_proto_rawDescGZIP(), []int{16} } -func (x *BeaconCommitteeSubscribe) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconCommitteeSubscribe) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } -func (x *BeaconCommitteeSubscribe) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *BeaconCommitteeSubscribe) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } func (x *BeaconCommitteeSubscribe) GetCommitteesAtSlot() uint64 { @@ -1136,11 +1135,11 @@ func (x *BeaconCommitteeSubscribe) GetCommitteesAtSlot() uint64 { return 0 } -func (x *BeaconCommitteeSubscribe) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconCommitteeSubscribe) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconCommitteeSubscribe) GetIsAggregator() bool { @@ -1250,7 +1249,7 @@ type PrepareBeaconProposerRequest_FeeRecipientContainer struct { unknownFields protoimpl.UnknownFields FeeRecipient []byte `protobuf:"bytes,1,opt,name=fee_recipient,json=feeRecipient,proto3" json:"fee_recipient,omitempty" ssz-size:"20"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) Reset() { @@ -1292,11 +1291,11 @@ func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) GetFeeRecipient() [ return nil } -func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type SubmitValidatorRegistrationsRequest_ValidatorRegistration struct { @@ -1443,7 +1442,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x18, 0x0a, @@ -1472,7 +1471,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6c, 0x69, 0x67, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x45, @@ -1480,21 +1479,21 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x65, 0x0a, 0x0a, 0x65, 0x78, 0x69, 0x74, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x09, 0x65, 0x78, 0x69, 0x74, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x75, 0x0a, 0x12, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x11, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x22, 0xdc, 0x01, 0x0a, 0x15, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, @@ -1502,13 +1501,13 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xad, 0x01, 0x0a, 0x16, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, @@ -1529,14 +1528,14 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x78, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, @@ -1550,7 +1549,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, @@ -1558,14 +1557,14 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0x75, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x44, 0x75, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x22, 0xad, 0x01, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x44, @@ -1586,21 +1585,21 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0xd3, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2b, 0x0a, 0x0d, 0x72, 0x61, 0x6e, 0x64, 0x61, 0x6f, 0x5f, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, @@ -1618,14 +1617,14 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x78, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, @@ -1643,7 +1642,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x6f, 0x6f, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0x50, 0x0a, 0x1c, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x65, 0x73, @@ -1670,14 +1669,14 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x78, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, @@ -1687,7 +1686,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x73, 0x41, 0x74, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x73, 0x5f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, @@ -1709,7 +1708,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xeb, @@ -1765,7 +1764,7 @@ var file_proto_eth_v1_validator_proto_rawDesc = []byte{ 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, + 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x31, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/eth/v1/validator.proto b/proto/eth/v1/validator.proto index 3562e21b276d..7f59ac5bc0d4 100644 --- a/proto/eth/v1/validator.proto +++ b/proto/eth/v1/validator.proto @@ -22,14 +22,14 @@ import "proto/eth/v1/attestation.proto"; import "proto/eth/v1/beacon_block.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v1"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v1"; option java_multiple_files = true; option java_outer_classname = "ValidatorProto"; option java_package = "org.ethereum.eth.v1"; option php_namespace = "Ethereum\\Eth\\v1"; message ValidatorContainer { - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"];; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"];; uint64 balance = 2; ValidatorStatus status = 3; Validator validator = 4; @@ -52,24 +52,24 @@ message Validator { // Epoch when the validator became eligible for activation. This field may // be zero if the validator was present in the Ethereum proof of stake genesis. This // field is FAR_FUTURE_EPOCH if the validator has not been activated. - uint64 activation_eligibility_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 activation_eligibility_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Epoch when the validator was activated. This field may be zero if the // validator was present in the Ethereum proof of stake genesis. This field is // FAR_FUTURE_EPOCH if the validator has not been activated. - uint64 activation_epoch = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 activation_epoch = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Epoch when the validator was exited. This field is FAR_FUTURE_EPOCH if // the validator has not exited. // FAR_FUTURE_EPOCH is a constant defined by the official Ethereum Beacon Chain specification: // https://github.com/ethereum/consensus-specs/blob/v0.9.2/specs/core/0_beacon-chain.md#constants - uint64 exit_epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 exit_epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Epoch when the validator is eligible to withdraw their funds. This field // is FAR_FUTURE_EPOCH if the validator has not exited. // FAR_FUTURE_EPOCH is a constant defined by the official Ethereum Beacon Chain specification: // https://github.com/ethereum/consensus-specs/blob/v0.9.2/specs/core/0_beacon-chain.md#constants - uint64 withdrawable_epoch = 8 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 withdrawable_epoch = 8 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } enum ValidatorStatus { @@ -90,10 +90,10 @@ enum ValidatorStatus { message AttesterDutiesRequest { // Epoch to request, should only be allowed 1 epoch ahead. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Validator indices to request duties for. - repeated uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message AttesterDutiesResponse { @@ -107,10 +107,10 @@ message AttesterDuty { bytes pubkey = 1 [(ethereum.eth.ext.ssz_size) = "48"]; // The index of the validator in the beacon state. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The index of the committee where the validator belongs to. - uint64 committee_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // The length of the committee the validator belongs to. uint64 committee_length = 4; @@ -119,15 +119,15 @@ message AttesterDuty { uint64 committees_at_slot = 5; // The index of the validator in the committee. - uint64 validator_committee_index = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 validator_committee_index = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // The slot this duty is for. - uint64 slot = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message ProposerDutiesRequest { // Epoch to request duties for. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } message ProposerDutiesResponse { @@ -141,15 +141,15 @@ message ProposerDuty { bytes pubkey = 1 [(ethereum.eth.ext.ssz_size) = "48"]; // The index of the validator in the beacon state. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The slot this duty is for. - uint64 slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message ProduceBlockRequest { // The slot to request a block for. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The validators RANDAO reveal 96 byte value. bytes randao_reveal = 2 [(ethereum.eth.ext.ssz_size) = "96"]; @@ -165,10 +165,10 @@ message ProduceBlockResponse { message ProduceAttestationDataRequest { // Slot for which the attestation data should be retrieved for. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Committee index for which the attestation data should be retrieved for. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; } message ProduceAttestationDataResponse { @@ -180,7 +180,7 @@ message AggregateAttestationRequest { bytes attestation_data_root = 1 [(ethereum.eth.ext.ssz_size) = "32"]; // The slot for the requested aggregate attestation. - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message AggregateAttestationResponse { @@ -197,16 +197,16 @@ message SubmitBeaconCommitteeSubscriptionsRequest { message BeaconCommitteeSubscribe { // The validator index to subscribe for. - uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The committee index to be subscribed to. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // The total amount of committees for the given slot. uint64 committees_at_slot = 3; // The slot to be subscribed to. - uint64 slot = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // If subscribing for aggregator, the beacon node will aggregate all attestations received. bool is_aggregator = 5; @@ -218,7 +218,7 @@ message PrepareBeaconProposerRequest { bytes fee_recipient = 1 [(ethereum.eth.ext.ssz_size) = "20"]; // The proposer validator index. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } repeated FeeRecipientContainer recipients = 1; } diff --git a/proto/eth/v2/BUILD.bazel b/proto/eth/v2/BUILD.bazel index 1e67307a0277..982827faae2a 100644 --- a/proto/eth/v2/BUILD.bazel +++ b/proto/eth/v2/BUILD.bazel @@ -54,7 +54,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -73,7 +73,7 @@ go_proto_library( "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-grpc-gateway:go_gen_grpc_gateway", ], embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2", protos = [":proto"], visibility = ["//proto:__subpackages__"], ) @@ -84,7 +84,7 @@ go_library( ":ssz_generated_files", ], embed = [":go_grpc_gateway_library"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2", visibility = ["//visibility:public"], deps = SSZ_DEPS, ) diff --git a/proto/eth/v2/beacon_block.pb.go b/proto/eth/v2/beacon_block.pb.go index 6d92b7589860..8050eebb6de6 100755 --- a/proto/eth/v2/beacon_block.pb.go +++ b/proto/eth/v2/beacon_block.pb.go @@ -7,15 +7,14 @@ package eth import ( - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v11 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v11 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -948,8 +947,8 @@ type BeaconBlockBellatrix struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBodyBellatrix `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -987,18 +986,18 @@ func (*BeaconBlockBellatrix) Descriptor() ([]byte, []int) { return file_proto_eth_v2_beacon_block_proto_rawDescGZIP(), []int{12} } -func (x *BeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockBellatrix) GetParentRoot() []byte { @@ -1027,8 +1026,8 @@ type BlindedBeaconBlockBellatrix struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BlindedBeaconBlockBodyBellatrix `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -1066,18 +1065,18 @@ func (*BlindedBeaconBlockBellatrix) Descriptor() ([]byte, []int) { return file_proto_eth_v2_beacon_block_proto_rawDescGZIP(), []int{13} } -func (x *BlindedBeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlindedBeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BlindedBeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BlindedBeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BlindedBeaconBlockBellatrix) GetParentRoot() []byte { @@ -1106,8 +1105,8 @@ type BeaconBlockCapella struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBodyCapella `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -1145,18 +1144,18 @@ func (*BeaconBlockCapella) Descriptor() ([]byte, []int) { return file_proto_eth_v2_beacon_block_proto_rawDescGZIP(), []int{14} } -func (x *BeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockCapella) GetParentRoot() []byte { @@ -1185,8 +1184,8 @@ type BlindedBeaconBlockCapella struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BlindedBeaconBlockBodyCapella `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -1224,18 +1223,18 @@ func (*BlindedBeaconBlockCapella) Descriptor() ([]byte, []int) { return file_proto_eth_v2_beacon_block_proto_rawDescGZIP(), []int{15} } -func (x *BlindedBeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlindedBeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BlindedBeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BlindedBeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BlindedBeaconBlockCapella) GetParentRoot() []byte { @@ -1264,8 +1263,8 @@ type BeaconBlockAltair struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBodyAltair `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -1303,18 +1302,18 @@ func (*BeaconBlockAltair) Descriptor() ([]byte, []int) { return file_proto_eth_v2_beacon_block_proto_rawDescGZIP(), []int{16} } -func (x *BeaconBlockAltair) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockAltair) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockAltair) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockAltair) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockAltair) GetParentRoot() []byte { @@ -2129,13 +2128,13 @@ var file_proto_eth_v2_beacon_block_proto_rawDesc = []byte{ 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, @@ -2153,13 +2152,13 @@ var file_proto_eth_v2_beacon_block_proto_rawDesc = []byte{ 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, @@ -2177,13 +2176,13 @@ var file_proto_eth_v2_beacon_block_proto_rawDesc = []byte{ 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, @@ -2201,13 +2200,13 @@ var file_proto_eth_v2_beacon_block_proto_rawDesc = []byte{ 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, @@ -2224,14 +2223,14 @@ var file_proto_eth_v2_beacon_block_proto_rawDesc = []byte{ 0x6f, 0x63, 0x6b, 0x41, 0x6c, 0x74, 0x61, 0x69, 0x72, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0b, @@ -2486,7 +2485,7 @@ var file_proto_eth_v2_beacon_block_proto_rawDesc = []byte{ 0x2e, 0x76, 0x32, 0x42, 0x12, 0x53, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, diff --git a/proto/eth/v2/beacon_block.proto b/proto/eth/v2/beacon_block.proto index c2fffc145f2d..04e8e728c3b9 100644 --- a/proto/eth/v2/beacon_block.proto +++ b/proto/eth/v2/beacon_block.proto @@ -23,7 +23,7 @@ import "proto/eth/v2/withdrawals.proto"; import "proto/engine/v1/execution_engine.proto"; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "SyncCommitteeProto"; option java_package = "org.ethereum.eth.v2"; @@ -129,10 +129,10 @@ message SignedBeaconBlockAltair { // The Ethereum consensus beacon block. The message does not contain a validator signature. message BeaconBlockBellatrix { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -147,10 +147,10 @@ message BeaconBlockBellatrix { // The Ethereum consensus beacon block. The message does not contain a validator signature. message BlindedBeaconBlockBellatrix { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -165,10 +165,10 @@ message BlindedBeaconBlockBellatrix { // The Ethereum consensus beacon block. The message does not contain a validator signature. message BeaconBlockCapella { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -183,10 +183,10 @@ message BeaconBlockCapella { // The Ethereum consensus beacon block. The message does not contain a validator signature. message BlindedBeaconBlockCapella { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -201,10 +201,10 @@ message BlindedBeaconBlockCapella { // The Ethereum consensus beacon block. The message does not contain a validator signature. message BeaconBlockAltair { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; diff --git a/proto/eth/v2/beacon_chain.pb.go b/proto/eth/v2/beacon_chain.pb.go index cd54c8dd13f5..e16ca5df3513 100755 --- a/proto/eth/v2/beacon_chain.pb.go +++ b/proto/eth/v2/beacon_chain.pb.go @@ -7,11 +7,10 @@ package eth import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -87,7 +86,7 @@ var file_proto_eth_v2_beacon_chain_proto_rawDesc = []byte{ 0x42, 0x10, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, diff --git a/proto/eth/v2/beacon_chain.proto b/proto/eth/v2/beacon_chain.proto index d529b1e953f0..331fd3c8bea8 100644 --- a/proto/eth/v2/beacon_chain.proto +++ b/proto/eth/v2/beacon_chain.proto @@ -18,7 +18,7 @@ package ethereum.eth.v2; import "proto/eth/v2/withdrawals.proto"; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "BeaconChainProto"; option java_package = "org.ethereum.eth.v2"; diff --git a/proto/eth/v2/beacon_state.pb.go b/proto/eth/v2/beacon_state.pb.go index 255f7eaf0e94..541c839a67d9 100755 --- a/proto/eth/v2/beacon_state.pb.go +++ b/proto/eth/v2/beacon_state.pb.go @@ -7,16 +7,15 @@ package eth import ( - reflect "reflect" - sync "sync" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v11 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v11 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -33,7 +32,7 @@ type BeaconState struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *v1.Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *v1.BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -103,11 +102,11 @@ func (x *BeaconState) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconState) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconState) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconState) GetFork() *v1.Fork { @@ -264,7 +263,7 @@ type BeaconStateBellatrix struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *v1.Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *v1.BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -335,11 +334,11 @@ func (x *BeaconStateBellatrix) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconStateBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconStateBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconStateBellatrix) GetFork() *v1.Fork { @@ -503,7 +502,7 @@ type BeaconStateCapella struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *v1.Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *v1.BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -527,7 +526,7 @@ type BeaconStateCapella struct { NextSyncCommittee *SyncCommittee `protobuf:"bytes,9003,opt,name=next_sync_committee,json=nextSyncCommittee,proto3" json:"next_sync_committee,omitempty"` LatestExecutionPayloadHeader *v11.ExecutionPayloadHeaderCapella `protobuf:"bytes,10001,opt,name=latest_execution_payload_header,json=latestExecutionPayloadHeader,proto3" json:"latest_execution_payload_header,omitempty"` NextWithdrawalIndex uint64 `protobuf:"varint,11001,opt,name=next_withdrawal_index,json=nextWithdrawalIndex,proto3" json:"next_withdrawal_index,omitempty"` - NextWithdrawalValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,11002,opt,name=next_withdrawal_validator_index,json=nextWithdrawalValidatorIndex,proto3" json:"next_withdrawal_validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + NextWithdrawalValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,11002,opt,name=next_withdrawal_validator_index,json=nextWithdrawalValidatorIndex,proto3" json:"next_withdrawal_validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` HistoricalSummaries []*HistoricalSummary `protobuf:"bytes,11003,rep,name=historical_summaries,json=historicalSummaries,proto3" json:"historical_summaries,omitempty" ssz-max:"16777216"` } @@ -577,11 +576,11 @@ func (x *BeaconStateCapella) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconStateCapella) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconStateCapella) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconStateCapella) GetFork() *v1.Fork { @@ -745,11 +744,11 @@ func (x *BeaconStateCapella) GetNextWithdrawalIndex() uint64 { return 0 } -func (x *BeaconStateCapella) GetNextWithdrawalValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconStateCapella) GetNextWithdrawalValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.NextWithdrawalValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconStateCapella) GetHistoricalSummaries() []*HistoricalSummary { @@ -1149,7 +1148,7 @@ type ForkChoiceHead struct { unknownFields protoimpl.UnknownFields Root []byte `protobuf:"bytes,1,opt,name=root,proto3" json:"root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` ExecutionOptimistic bool `protobuf:"varint,3,opt,name=execution_optimistic,json=executionOptimistic,proto3" json:"execution_optimistic,omitempty"` } @@ -1192,11 +1191,11 @@ func (x *ForkChoiceHead) GetRoot() []byte { return nil } -func (x *ForkChoiceHead) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ForkChoiceHead) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *ForkChoiceHead) GetExecutionOptimistic() bool { @@ -1212,7 +1211,7 @@ type RandaoRequest struct { unknownFields protoimpl.UnknownFields StateId []byte `protobuf:"bytes,1,opt,name=state_id,json=stateId,proto3" json:"state_id,omitempty"` - Epoch *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=epoch,proto3,oneof" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=epoch,proto3,oneof" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *RandaoRequest) Reset() { @@ -1254,11 +1253,11 @@ func (x *RandaoRequest) GetStateId() []byte { return nil } -func (x *RandaoRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *RandaoRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil && x.Epoch != nil { return *x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type RandaoResponse struct { @@ -1404,7 +1403,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2a, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, @@ -1509,7 +1508,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x6f, 0x72, 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x5a, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2a, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, @@ -1622,7 +1621,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x5a, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2a, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x0b, @@ -1733,7 +1732,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0xfa, 0x55, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x1c, 0x6e, 0x65, 0x78, 0x74, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x56, @@ -1806,7 +1805,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x18, 0x02, 0x33, 0x32, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x31, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, @@ -1818,7 +1817,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x61, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x65, 0x70, 0x6f, @@ -1839,7 +1838,7 @@ var file_proto_eth_v2_beacon_state_proto_rawDesc = []byte{ 0x68, 0x2e, 0x76, 0x32, 0x42, 0x12, 0x53, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, diff --git a/proto/eth/v2/beacon_state.proto b/proto/eth/v2/beacon_state.proto index a86524bcf1d9..108a52e7a0dc 100644 --- a/proto/eth/v2/beacon_state.proto +++ b/proto/eth/v2/beacon_state.proto @@ -25,7 +25,7 @@ import "proto/eth/v2/version.proto"; import "proto/engine/v1/execution_engine.proto"; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "SyncCommitteeProto"; option java_package = "org.ethereum.eth.v2"; @@ -35,7 +35,7 @@ message BeaconState { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; v1.Fork fork = 1004; // History [2001-3000] @@ -80,7 +80,7 @@ message BeaconStateBellatrix { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; v1.Fork fork = 1004; // History [2001-3000] @@ -128,7 +128,7 @@ message BeaconStateCapella { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; v1.Fork fork = 1004; // History [2001-3000] @@ -173,7 +173,7 @@ message BeaconStateCapella { // Capella fields [11001-12000] uint64 next_withdrawal_index = 11001; // [New in Capella] - uint64 next_withdrawal_validator_index = 11002 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; // [New in Capella] + uint64 next_withdrawal_validator_index = 11002 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // [New in Capella] repeated HistoricalSummary historical_summaries = 11003 [(ethereum.eth.ext.ssz_max) = "16777216"]; // [New in Capella] } @@ -216,13 +216,13 @@ message ForkChoiceHeadsResponse { message ForkChoiceHead { bytes root = 1 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; bool execution_optimistic = 3; } message RandaoRequest { bytes state_id = 1; - optional uint64 epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + optional uint64 epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } message RandaoResponse { diff --git a/proto/eth/v2/generated.ssz.go b/proto/eth/v2/generated.ssz.go index 2751bc2c38a2..6dfb0d930fe8 100644 --- a/proto/eth/v2/generated.ssz.go +++ b/proto/eth/v2/generated.ssz.go @@ -1,12 +1,12 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: aee43aed536b874e25f44d6a1c015d4064b7928ff1dd3bd0634687c4082215ef +// Hash: 742da93ae7b491d548e2d45f72e6906f433421cb3e2aa4e402b98dd85b871c3f package eth import ( ssz "github.com/prysmaticlabs/fastssz" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v11 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v11 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" ) // MarshalSSZ ssz marshals the SignedBeaconBlockBellatrix object @@ -631,10 +631,10 @@ func (b *BeaconBlockBellatrix) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -782,10 +782,10 @@ func (b *BlindedBeaconBlockBellatrix) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -933,10 +933,10 @@ func (b *BeaconBlockCapella) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -1084,10 +1084,10 @@ func (b *BlindedBeaconBlockCapella) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -1235,10 +1235,10 @@ func (b *BeaconBlockAltair) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -4020,7 +4020,7 @@ func (b *BLSToExecutionChange) UnmarshalSSZ(buf []byte) error { } // Field (0) 'ValidatorIndex' - b.ValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) + b.ValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'FromBlsPubkey' if cap(b.FromBlsPubkey) == 0 { diff --git a/proto/eth/v2/ssz.pb.go b/proto/eth/v2/ssz.pb.go index fef09b090289..ba477617dbad 100755 --- a/proto/eth/v2/ssz.pb.go +++ b/proto/eth/v2/ssz.pb.go @@ -7,11 +7,10 @@ package eth import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -114,7 +113,7 @@ var file_proto_eth_v2_ssz_proto_rawDesc = []byte{ 0x65, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x42, 0x08, 0x53, 0x73, 0x7a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, diff --git a/proto/eth/v2/ssz.proto b/proto/eth/v2/ssz.proto index e02bed6a80f2..6e0fc6ac4dab 100644 --- a/proto/eth/v2/ssz.proto +++ b/proto/eth/v2/ssz.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package ethereum.eth.v2; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "SszProto"; option java_package = "org.ethereum.eth.v2"; diff --git a/proto/eth/v2/sync_committee.pb.go b/proto/eth/v2/sync_committee.pb.go index bf3b65d86375..6192d83b2e51 100755 --- a/proto/eth/v2/sync_committee.pb.go +++ b/proto/eth/v2/sync_committee.pb.go @@ -7,13 +7,12 @@ package eth import ( - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -177,9 +176,9 @@ type SyncCommitteeMessage struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` BeaconBlockRoot []byte `protobuf:"bytes,2,opt,name=beacon_block_root,json=beaconBlockRoot,proto3" json:"beacon_block_root,omitempty" ssz-size:"32"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty" ssz-size:"96"` } @@ -215,11 +214,11 @@ func (*SyncCommitteeMessage) Descriptor() ([]byte, []int) { return file_proto_eth_v2_sync_committee_proto_rawDescGZIP(), []int{3} } -func (x *SyncCommitteeMessage) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncCommitteeMessage) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncCommitteeMessage) GetBeaconBlockRoot() []byte { @@ -229,11 +228,11 @@ func (x *SyncCommitteeMessage) GetBeaconBlockRoot() []byte { return nil } -func (x *SyncCommitteeMessage) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncCommitteeMessage) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *SyncCommitteeMessage) GetSignature() []byte { @@ -249,7 +248,7 @@ type StateSyncCommitteesRequest struct { unknownFields protoimpl.UnknownFields StateId []byte `protobuf:"bytes,1,opt,name=state_id,json=stateId,proto3" json:"state_id,omitempty"` - Epoch *github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=epoch,proto3,oneof" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch *github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=epoch,proto3,oneof" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *StateSyncCommitteesRequest) Reset() { @@ -291,11 +290,11 @@ func (x *StateSyncCommitteesRequest) GetStateId() []byte { return nil } -func (x *StateSyncCommitteesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *StateSyncCommitteesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil && x.Epoch != nil { return *x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type StateSyncCommitteesResponse struct { @@ -366,7 +365,7 @@ type SyncCommitteeValidators struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Validators []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=validators,proto3" json:"validators,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Validators []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=validators,proto3" json:"validators,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ValidatorAggregates []*SyncSubcommitteeValidators `protobuf:"bytes,2,rep,name=validator_aggregates,json=validatorAggregates,proto3" json:"validator_aggregates,omitempty"` } @@ -402,11 +401,11 @@ func (*SyncCommitteeValidators) Descriptor() ([]byte, []int) { return file_proto_eth_v2_sync_committee_proto_rawDescGZIP(), []int{6} } -func (x *SyncCommitteeValidators) GetValidators() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncCommitteeValidators) GetValidators() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Validators } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } func (x *SyncCommitteeValidators) GetValidatorAggregates() []*SyncSubcommitteeValidators { @@ -421,7 +420,7 @@ type SyncSubcommitteeValidators struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Validators []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=validators,proto3" json:"validators,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Validators []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=validators,proto3" json:"validators,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *SyncSubcommitteeValidators) Reset() { @@ -456,11 +455,11 @@ func (*SyncSubcommitteeValidators) Descriptor() ([]byte, []int) { return file_proto_eth_v2_sync_committee_proto_rawDescGZIP(), []int{7} } -func (x *SyncSubcommitteeValidators) GetValidators() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncSubcommitteeValidators) GetValidators() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Validators } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } var File_proto_eth_v2_sync_committee_proto protoreflect.FileDescriptor @@ -494,7 +493,7 @@ var file_proto_eth_v2_sync_committee_proto_rawDesc = []byte{ 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x32, 0x0a, 0x11, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x6c, 0x6f, @@ -504,7 +503,7 @@ var file_proto_eth_v2_sync_committee_proto_rawDesc = []byte{ 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, @@ -517,7 +516,7 @@ var file_proto_eth_v2_sync_committee_proto_rawDesc = []byte{ 0x12, 0x61, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x22, 0xac, 0x01, @@ -537,7 +536,7 @@ var file_proto_eth_v2_sync_committee_proto_rawDesc = []byte{ 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x5e, 0x0a, 0x14, 0x76, 0x61, 0x6c, @@ -552,7 +551,7 @@ var file_proto_eth_v2_sync_committee_proto_rawDesc = []byte{ 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x42, 0x83, 0x01, 0x0a, 0x13, 0x6f, 0x72, @@ -560,7 +559,7 @@ var file_proto_eth_v2_sync_committee_proto_rawDesc = []byte{ 0x32, 0x42, 0x12, 0x53, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x32, 0x62, diff --git a/proto/eth/v2/sync_committee.proto b/proto/eth/v2/sync_committee.proto index ce7261263b8d..ac2c57fb0361 100644 --- a/proto/eth/v2/sync_committee.proto +++ b/proto/eth/v2/sync_committee.proto @@ -18,7 +18,7 @@ package ethereum.eth.v2; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "SyncCommitteeProto"; option java_package = "org.ethereum.eth.v2"; @@ -41,13 +41,13 @@ message SubmitPoolSyncCommitteeSignatures { // Sync committee object to support light client. message SyncCommitteeMessage { // Slot to which this contribution pertains. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 32 byte block root for this signature. bytes beacon_block_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; // Index of the validator that produced this signature. - uint64 validator_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Signature by the validator over the block root of `slot`. bytes signature = 4 [(ethereum.eth.ext.ssz_size) = "96"]; @@ -59,7 +59,7 @@ message StateSyncCommitteesRequest { bytes state_id = 1; // The epoch to retrieve the committees of. - optional uint64 epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + optional uint64 epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } message StateSyncCommitteesResponse { @@ -70,12 +70,12 @@ message StateSyncCommitteesResponse { message SyncCommitteeValidators { // All of the validator indices in the current sync committee. - repeated uint64 validators = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 validators = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; repeated SyncSubcommitteeValidators validator_aggregates = 2; } message SyncSubcommitteeValidators { // Subcommittee slices of the current sync committee. - repeated uint64 validators = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 validators = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } diff --git a/proto/eth/v2/validator.pb.go b/proto/eth/v2/validator.pb.go index 0446450beffc..858cd3b6a855 100755 --- a/proto/eth/v2/validator.pb.go +++ b/proto/eth/v2/validator.pb.go @@ -7,14 +7,13 @@ package eth import ( - reflect "reflect" - sync "sync" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -29,8 +28,8 @@ type SyncCommitteeDutiesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - Index []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + Index []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *SyncCommitteeDutiesRequest) Reset() { @@ -65,18 +64,18 @@ func (*SyncCommitteeDutiesRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{0} } -func (x *SyncCommitteeDutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *SyncCommitteeDutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *SyncCommitteeDutiesRequest) GetIndex() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncCommitteeDutiesRequest) GetIndex() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type SyncCommitteeDutiesResponse struct { @@ -140,7 +139,7 @@ type SyncCommitteeDuty struct { unknownFields protoimpl.UnknownFields Pubkey []byte `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty" ssz-size:"48"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ValidatorSyncCommitteeIndices []uint64 `protobuf:"varint,3,rep,packed,name=validator_sync_committee_indices,json=validatorSyncCommitteeIndices,proto3" json:"validator_sync_committee_indices,omitempty"` } @@ -183,11 +182,11 @@ func (x *SyncCommitteeDuty) GetPubkey() []byte { return nil } -func (x *SyncCommitteeDuty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncCommitteeDuty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *SyncCommitteeDuty) GetValidatorSyncCommitteeIndices() []uint64 { @@ -359,9 +358,9 @@ type SyncCommitteeSubscription struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` SyncCommitteeIndices []uint64 `protobuf:"varint,2,rep,packed,name=sync_committee_indices,json=syncCommitteeIndices,proto3" json:"sync_committee_indices,omitempty"` - UntilEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=until_epoch,json=untilEpoch,proto3" json:"until_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + UntilEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=until_epoch,json=untilEpoch,proto3" json:"until_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *SyncCommitteeSubscription) Reset() { @@ -396,11 +395,11 @@ func (*SyncCommitteeSubscription) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{6} } -func (x *SyncCommitteeSubscription) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncCommitteeSubscription) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *SyncCommitteeSubscription) GetSyncCommitteeIndices() []uint64 { @@ -410,11 +409,11 @@ func (x *SyncCommitteeSubscription) GetSyncCommitteeIndices() []uint64 { return nil } -func (x *SyncCommitteeSubscription) GetUntilEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *SyncCommitteeSubscription) GetUntilEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.UntilEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type ProduceSyncCommitteeContributionRequest struct { @@ -422,7 +421,7 @@ type ProduceSyncCommitteeContributionRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` SubcommitteeIndex uint64 `protobuf:"varint,2,opt,name=subcommittee_index,json=subcommitteeIndex,proto3" json:"subcommittee_index,omitempty"` BeaconBlockRoot []byte `protobuf:"bytes,3,opt,name=beacon_block_root,json=beaconBlockRoot,proto3" json:"beacon_block_root,omitempty" ssz-size:"32"` } @@ -459,11 +458,11 @@ func (*ProduceSyncCommitteeContributionRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{7} } -func (x *ProduceSyncCommitteeContributionRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ProduceSyncCommitteeContributionRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *ProduceSyncCommitteeContributionRequest) GetSubcommitteeIndex() uint64 { @@ -532,7 +531,7 @@ type SyncCommitteeContribution struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` BeaconBlockRoot []byte `protobuf:"bytes,2,opt,name=beacon_block_root,json=beaconBlockRoot,proto3" json:"beacon_block_root,omitempty" ssz-size:"32"` SubcommitteeIndex uint64 `protobuf:"varint,3,opt,name=subcommittee_index,json=subcommitteeIndex,proto3" json:"subcommittee_index,omitempty"` AggregationBits github_com_prysmaticlabs_go_bitfield.Bitvector128 `protobuf:"bytes,4,opt,name=aggregation_bits,json=aggregationBits,proto3" json:"aggregation_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector128" ssz-size:"16"` @@ -571,11 +570,11 @@ func (*SyncCommitteeContribution) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{9} } -func (x *SyncCommitteeContribution) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncCommitteeContribution) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncCommitteeContribution) GetBeaconBlockRoot() []byte { @@ -658,7 +657,7 @@ type ContributionAndProof struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AggregatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + AggregatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Contribution *SyncCommitteeContribution `protobuf:"bytes,2,opt,name=contribution,proto3" json:"contribution,omitempty"` SelectionProof []byte `protobuf:"bytes,3,opt,name=selection_proof,json=selectionProof,proto3" json:"selection_proof,omitempty" ssz-size:"96"` } @@ -695,11 +694,11 @@ func (*ContributionAndProof) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{11} } -func (x *ContributionAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ContributionAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.AggregatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *ContributionAndProof) GetContribution() *SyncCommitteeContribution { @@ -776,8 +775,8 @@ type GetLivenessRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - Index []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + Index []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *GetLivenessRequest) Reset() { @@ -812,18 +811,18 @@ func (*GetLivenessRequest) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{13} } -func (x *GetLivenessRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *GetLivenessRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *GetLivenessRequest) GetIndex() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *GetLivenessRequest) GetIndex() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type GetLivenessResponse struct { @@ -878,7 +877,7 @@ type GetLivenessResponse_Liveness struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` IsLive bool `protobuf:"varint,2,opt,name=is_live,json=isLive,proto3" json:"is_live,omitempty"` } @@ -914,11 +913,11 @@ func (*GetLivenessResponse_Liveness) Descriptor() ([]byte, []int) { return file_proto_eth_v2_validator_proto_rawDescGZIP(), []int{14, 0} } -func (x *GetLivenessResponse_Liveness) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *GetLivenessResponse_Liveness) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *GetLivenessResponse_Liveness) GetIsLive() bool { @@ -944,13 +943,13 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x88, 0x01, @@ -969,7 +968,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, @@ -1008,7 +1007,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, @@ -1019,7 +1018,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0a, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x22, 0xe7, 0x01, 0x0a, 0x27, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, @@ -1028,7 +1027,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2d, 0x0a, 0x12, 0x73, 0x75, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, @@ -1048,7 +1047,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x32, 0x0a, 0x11, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x5f, 0x62, @@ -1078,7 +1077,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, @@ -1103,13 +1102,13 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xe5, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x76, 0x65, @@ -1122,7 +1121,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x02, @@ -1131,7 +1130,7 @@ var file_proto_eth_v2_validator_proto_rawDesc = []byte{ 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x32, 0x62, 0x06, 0x70, diff --git a/proto/eth/v2/validator.proto b/proto/eth/v2/validator.proto index 78ae583f3aac..fc5b963460e2 100644 --- a/proto/eth/v2/validator.proto +++ b/proto/eth/v2/validator.proto @@ -20,7 +20,7 @@ import "proto/eth/v2/beacon_block.proto"; import "proto/eth/v2/version.proto"; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "ValidatorProto"; option java_package = "org.ethereum.eth.v2"; @@ -28,10 +28,10 @@ option php_namespace = "Ethereum\\Eth\\v2"; message SyncCommitteeDutiesRequest { // Must fulfill: epoch // EPOCHS_PER_SYNC_COMMITTEE_PERIOD <= current_epoch // EPOCHS_PER_SYNC_COMMITTEE_PERIOD + 1 - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Validator indices to request duties for. - repeated uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message SyncCommitteeDutiesResponse { @@ -44,7 +44,7 @@ message SyncCommitteeDuty { bytes pubkey = 1 [(ethereum.eth.ext.ssz_size) = "48"]; // Index of validator in validator registry. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The indices of the validator in the sync committee. repeated uint64 validator_sync_committee_indices = 3; @@ -66,18 +66,18 @@ message SubmitSyncCommitteeSubscriptionsRequest { message SyncCommitteeSubscription { // The validator index to subscribe for. - uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The sync committee indices to be subscribed to. repeated uint64 sync_committee_indices = 2; // The final epoch (exclusive value) that the specified validator requires the subscription for. - uint64 until_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 until_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } message ProduceSyncCommitteeContributionRequest { // The slot for which a sync committee contribution should be created. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The subcommittee index for which to produce the contribution. uint64 subcommittee_index = 2; @@ -93,7 +93,7 @@ message ProduceSyncCommitteeContributionResponse { // Aggregated sync committee object to support light client. message SyncCommitteeContribution { // Slot to which this contribution pertains. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 32 byte block root for this signature. bytes beacon_block_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -116,7 +116,7 @@ message SubmitContributionAndProofsRequest { // Aggregated sync committee signature object with selection proof to support light client. message ContributionAndProof { // Index of the aggregator that produced this proof. - uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; SyncCommitteeContribution contribution = 2; @@ -133,15 +133,15 @@ message SignedContributionAndProof { } message GetLivenessRequest { - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; - repeated uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; + repeated uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message GetLivenessResponse { repeated Liveness data = 1; message Liveness { - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; bool is_live = 2; } } diff --git a/proto/eth/v2/version.pb.go b/proto/eth/v2/version.pb.go index 3d4c019aeebb..152231decfb0 100755 --- a/proto/eth/v2/version.pb.go +++ b/proto/eth/v2/version.pb.go @@ -7,11 +7,10 @@ package eth import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -87,7 +86,7 @@ var file_proto_eth_v2_version_proto_rawDesc = []byte{ 0x2e, 0x76, 0x32, 0x42, 0x0c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, diff --git a/proto/eth/v2/version.proto b/proto/eth/v2/version.proto index 3c9f4807b9c4..3db94b07a825 100644 --- a/proto/eth/v2/version.proto +++ b/proto/eth/v2/version.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package ethereum.eth.v2; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "VersionProto"; option java_package = "org.ethereum.eth.v2"; diff --git a/proto/eth/v2/withdrawals.pb.go b/proto/eth/v2/withdrawals.pb.go index 8fb37273baca..87fec166e0b3 100755 --- a/proto/eth/v2/withdrawals.pb.go +++ b/proto/eth/v2/withdrawals.pb.go @@ -7,13 +7,12 @@ package eth import ( - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -28,7 +27,7 @@ type BLSToExecutionChange struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` FromBlsPubkey []byte `protobuf:"bytes,2,opt,name=from_bls_pubkey,json=fromBlsPubkey,proto3" json:"from_bls_pubkey,omitempty" ssz-size:"48"` ToExecutionAddress []byte `protobuf:"bytes,3,opt,name=to_execution_address,json=toExecutionAddress,proto3" json:"to_execution_address,omitempty" ssz-size:"20"` } @@ -65,11 +64,11 @@ func (*BLSToExecutionChange) Descriptor() ([]byte, []int) { return file_proto_eth_v2_withdrawals_proto_rawDescGZIP(), []int{0} } -func (x *BLSToExecutionChange) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BLSToExecutionChange) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BLSToExecutionChange) GetFromBlsPubkey() []byte { @@ -201,7 +200,7 @@ var file_proto_eth_v2_withdrawals_proto_rawDesc = []byte{ 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, @@ -231,7 +230,7 @@ var file_proto_eth_v2_withdrawals_proto_rawDesc = []byte{ 0x65, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x42, 0x10, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, 0x5c, diff --git a/proto/eth/v2/withdrawals.proto b/proto/eth/v2/withdrawals.proto index 1f343b97f55e..603d0b0f8eaa 100644 --- a/proto/eth/v2/withdrawals.proto +++ b/proto/eth/v2/withdrawals.proto @@ -18,7 +18,7 @@ package ethereum.eth.v2; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/eth/v2;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/eth/v2;eth"; option java_multiple_files = true; option java_outer_classname = "WithdrawalsProto"; option java_package = "org.ethereum.eth.v2"; @@ -27,7 +27,7 @@ option php_namespace = "Ethereum\\Eth\\v2"; // The message requesting a BLS to execution withdrawal credentials change message BLSToExecutionChange { // The validator index requesting the change - uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The public key of the BLS address requesting the change bytes from_bls_pubkey = 2 [(ethereum.eth.ext.ssz_size) = "48"]; diff --git a/proto/migration/BUILD.bazel b/proto/migration/BUILD.bazel index 623d586da308..690e0b1c5355 100644 --- a/proto/migration/BUILD.bazel +++ b/proto/migration/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "v1alpha1_to_v1.go", "v1alpha1_to_v2.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/migration", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/migration", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/proto/migration/enums.go b/proto/migration/enums.go index fe3700333d57..163677514a00 100644 --- a/proto/migration/enums.go +++ b/proto/migration/enums.go @@ -2,8 +2,8 @@ package migration import ( "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func V1Alpha1ConnectionStateToV1(connState eth.ConnectionState) ethpb.ConnectionState { diff --git a/proto/migration/enums_test.go b/proto/migration/enums_test.go index bbbbb60b6e37..dbb159d72226 100644 --- a/proto/migration/enums_test.go +++ b/proto/migration/enums_test.go @@ -3,8 +3,8 @@ package migration import ( "testing" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func TestV1Alpha1ConnectionStateToV1(t *testing.T) { diff --git a/proto/migration/v1alpha1_to_v1.go b/proto/migration/v1alpha1_to_v1.go index 790a75b04980..af39662c295f 100644 --- a/proto/migration/v1alpha1_to_v1.go +++ b/proto/migration/v1alpha1_to_v1.go @@ -2,11 +2,11 @@ package migration import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/proto/migration/v1alpha1_to_v1_test.go b/proto/migration/v1alpha1_to_v1_test.go index 089a2c3110e9..8e7019a09e00 100644 --- a/proto/migration/v1alpha1_to_v1_test.go +++ b/proto/migration/v1alpha1_to_v1_test.go @@ -4,15 +4,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) var ( diff --git a/proto/migration/v1alpha1_to_v2.go b/proto/migration/v1alpha1_to_v2.go index 3409a5cb90bd..7690d145ac9a 100644 --- a/proto/migration/v1alpha1_to_v2.go +++ b/proto/migration/v1alpha1_to_v2.go @@ -2,14 +2,14 @@ package migration import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" ) diff --git a/proto/migration/v1alpha1_to_v2_test.go b/proto/migration/v1alpha1_to_v2_test.go index 96660352f842..7969034c23d2 100644 --- a/proto/migration/v1alpha1_to_v2_test.go +++ b/proto/migration/v1alpha1_to_v2_test.go @@ -4,15 +4,15 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestV1Alpha1SignedContributionAndProofToV2(t *testing.T) { diff --git a/proto/prysm/v1alpha1/BUILD.bazel b/proto/prysm/v1alpha1/BUILD.bazel index 73792b49f124..3ad7d8f131af 100644 --- a/proto/prysm/v1alpha1/BUILD.bazel +++ b/proto/prysm/v1alpha1/BUILD.bazel @@ -129,7 +129,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -155,7 +155,7 @@ go_proto_library( "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-grpc-gateway:go_gen_grpc_gateway", ], embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1", protos = [":proto"], visibility = ["//visibility:private"], deps = [ @@ -181,7 +181,7 @@ go_library( embed = [ ":go_grpc_gateway_library", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1", visibility = ["//visibility:public"], deps = SSZ_DEPS + [ "//proto/eth/ext:go_default_library", diff --git a/proto/prysm/v1alpha1/attestation.pb.go b/proto/prysm/v1alpha1/attestation.pb.go index cbf3bd26e40f..81a6274739d0 100755 --- a/proto/prysm/v1alpha1/attestation.pb.go +++ b/proto/prysm/v1alpha1/attestation.pb.go @@ -7,14 +7,13 @@ package eth import ( - reflect "reflect" - sync "sync" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -92,7 +91,7 @@ type AggregateAttestationAndProof struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AggregatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + AggregatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Aggregate *Attestation `protobuf:"bytes,3,opt,name=aggregate,proto3" json:"aggregate,omitempty"` SelectionProof []byte `protobuf:"bytes,2,opt,name=selection_proof,json=selectionProof,proto3" json:"selection_proof,omitempty" ssz-size:"96"` } @@ -129,11 +128,11 @@ func (*AggregateAttestationAndProof) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_attestation_proto_rawDescGZIP(), []int{1} } -func (x *AggregateAttestationAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *AggregateAttestationAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.AggregatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *AggregateAttestationAndProof) GetAggregate() *Attestation { @@ -210,8 +209,8 @@ type AttestationData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` BeaconBlockRoot []byte `protobuf:"bytes,3,opt,name=beacon_block_root,json=beaconBlockRoot,proto3" json:"beacon_block_root,omitempty" ssz-size:"32"` Source *Checkpoint `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"` Target *Checkpoint `protobuf:"bytes,5,opt,name=target,proto3" json:"target,omitempty"` @@ -249,18 +248,18 @@ func (*AttestationData) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_attestation_proto_rawDescGZIP(), []int{3} } -func (x *AttestationData) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AttestationData) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *AttestationData) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AttestationData) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } func (x *AttestationData) GetBeaconBlockRoot() []byte { @@ -289,7 +288,7 @@ type Checkpoint struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Root []byte `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty" ssz-size:"32"` } @@ -325,11 +324,11 @@ func (*Checkpoint) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_attestation_proto_rawDescGZIP(), []int{4} } -func (x *Checkpoint) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Checkpoint) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *Checkpoint) GetRoot() []byte { @@ -367,7 +366,7 @@ var file_proto_prysm_v1alpha1_attestation_proto_rawDesc = []byte{ 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, @@ -392,13 +391,13 @@ var file_proto_prysm_v1alpha1_attestation_proto_rawDesc = []byte{ 0x61, 0x74, 0x61, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x78, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, @@ -417,7 +416,7 @@ var file_proto_prysm_v1alpha1_attestation_proto_rawDesc = []byte{ 0x74, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, @@ -426,7 +425,7 @@ var file_proto_prysm_v1alpha1_attestation_proto_rawDesc = []byte{ 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x10, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, diff --git a/proto/prysm/v1alpha1/attestation.proto b/proto/prysm/v1alpha1/attestation.proto index 1e35c494892e..140b349707c4 100644 --- a/proto/prysm/v1alpha1/attestation.proto +++ b/proto/prysm/v1alpha1/attestation.proto @@ -18,7 +18,7 @@ package ethereum.eth.v1alpha1; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "AttestationProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -37,7 +37,7 @@ message Attestation { message AggregateAttestationAndProof { // The aggregator index that submitted this aggregated attestation and proof. - uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The aggregated attestation that was submitted. Attestation aggregate = 3; @@ -59,10 +59,10 @@ message AttestationData { // See: https://arxiv.org/pdf/1710.09437.pdf // Slot of the attestation attesting for. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The committee index that submitted this attestation. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // 32 byte root of the LMD GHOST block vote. bytes beacon_block_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -79,7 +79,7 @@ message Checkpoint { // is to link the check points together for justification and finalization. // Epoch the checkpoint references. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Block root of the checkpoint references. bytes root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; diff --git a/proto/prysm/v1alpha1/attestation/BUILD.bazel b/proto/prysm/v1alpha1/attestation/BUILD.bazel index 828f982475c3..da7e6f803ddb 100644 --- a/proto/prysm/v1alpha1/attestation/BUILD.bazel +++ b/proto/prysm/v1alpha1/attestation/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["attestation_utils.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/signing:go_default_library", diff --git a/proto/prysm/v1alpha1/attestation/aggregation/BUILD.bazel b/proto/prysm/v1alpha1/attestation/aggregation/BUILD.bazel index e7617404794e..c8cea430fa90 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/BUILD.bazel +++ b/proto/prysm/v1alpha1/attestation/aggregation/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "aggregation.go", "maxcover.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation", visibility = ["//visibility:public"], deps = [ "@com_github_pkg_errors//:go_default_library", diff --git a/proto/prysm/v1alpha1/attestation/aggregation/attestations/BUILD.bazel b/proto/prysm/v1alpha1/attestation/aggregation/attestations/BUILD.bazel index 6e6fbfce93ae..07b34fee26ef 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/BUILD.bazel +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "attestations.go", "maxcover.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/attestations", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/attestations", visibility = ["//visibility:public"], deps = [ "//crypto/bls:go_default_library", diff --git a/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations.go b/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations.go index 79c6c6f089b0..4059016d2aef 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations.go @@ -2,9 +2,9 @@ package attestations import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" "github.com/sirupsen/logrus" ) diff --git a/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations_test.go b/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations_test.go index 46544ab96945..df2458a7d02f 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" - aggtesting "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" + aggtesting "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" ) diff --git a/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover.go b/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover.go index f22ac88b25da..c815d77f5ebb 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" ) // MaxCoverAttestationAggregation relies on Maximum Coverage greedy algorithm for aggregation. diff --git a/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover_test.go b/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover_test.go index 0bba239dacee..eab7f8dbd36b 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestAggregateAttestations_MaxCover_NewMaxCover(t *testing.T) { diff --git a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go index 55f0a69e4b18..83ae1663d21e 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/config/params" - aggtesting "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + aggtesting "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/testing" ) func BenchmarkMaxCoverProblem_MaxCover(b *testing.B) { diff --git a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_test.go b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_test.go index 1418d5d846b1..a2f4fd389d80 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - aggtesting "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + aggtesting "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestMaxCover_MaxCoverCandidates_filter(t *testing.T) { diff --git a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/BUILD.bazel b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/BUILD.bazel index ae6d6a8de16f..8ab507b554e8 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/BUILD.bazel +++ b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "contribution.go", "naive.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution", visibility = ["//visibility:public"], deps = [ "//crypto/bls:go_default_library", diff --git a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/contribution.go b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/contribution.go index 1e83465fd1f6..8a1c942bd072 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/contribution.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/contribution.go @@ -2,8 +2,8 @@ package sync_contribution import ( "github.com/pkg/errors" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" "github.com/sirupsen/logrus" ) diff --git a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive.go b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive.go index cabb5a46cb9a..f9320ccfcfe0 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive.go @@ -1,9 +1,9 @@ package sync_contribution import ( - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" ) // naiveSyncContributionAggregation aggregates naively, without any complex algorithms or optimizations. diff --git a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive_test.go b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive_test.go index f04ce0052092..69a817e2ae98 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation" - aggtesting "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation" + aggtesting "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestAggregateAttestations_aggregate(t *testing.T) { diff --git a/proto/prysm/v1alpha1/attestation/aggregation/testing/BUILD.bazel b/proto/prysm/v1alpha1/attestation/aggregation/testing/BUILD.bazel index 39a57654b109..5103637e189d 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/testing/BUILD.bazel +++ b/proto/prysm/v1alpha1/attestation/aggregation/testing/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["bitlistutils.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation/aggregation/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation/aggregation/testing", visibility = ["//visibility:public"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go b/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go index b2c7553c7cb6..27691766ffc1 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time" ) // BitlistWithAllBitsSet creates list of bitlists with all bits set. diff --git a/proto/prysm/v1alpha1/attestation/attestation_utils.go b/proto/prysm/v1alpha1/attestation/attestation_utils.go index 0970eb355f8c..3694b91265df 100644 --- a/proto/prysm/v1alpha1/attestation/attestation_utils.go +++ b/proto/prysm/v1alpha1/attestation/attestation_utils.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/proto/prysm/v1alpha1/attestation/attestation_utils_test.go b/proto/prysm/v1alpha1/attestation/attestation_utils_test.go index 53cb16504337..411f36e4d507 100644 --- a/proto/prysm/v1alpha1/attestation/attestation_utils_test.go +++ b/proto/prysm/v1alpha1/attestation/attestation_utils_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/attestation" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/attestation" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestAttestingIndices(t *testing.T) { diff --git a/proto/prysm/v1alpha1/beacon_block.pb.go b/proto/prysm/v1alpha1/beacon_block.pb.go index a451d2837095..9056e399491c 100755 --- a/proto/prysm/v1alpha1/beacon_block.pb.go +++ b/proto/prysm/v1alpha1/beacon_block.pb.go @@ -7,15 +7,14 @@ package eth import ( - reflect "reflect" - sync "sync" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -304,8 +303,8 @@ type BeaconBlock struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBody `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -343,18 +342,18 @@ func (*BeaconBlock) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{2} } -func (x *BeaconBlock) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlock) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlock) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlock) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlock) GetParentRoot() []byte { @@ -438,8 +437,8 @@ type BeaconBlockAltair struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBodyAltair `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -477,18 +476,18 @@ func (*BeaconBlockAltair) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{4} } -func (x *BeaconBlockAltair) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockAltair) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockAltair) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockAltair) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockAltair) GetParentRoot() []byte { @@ -951,8 +950,8 @@ type VoluntaryExit struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *VoluntaryExit) Reset() { @@ -987,18 +986,18 @@ func (*VoluntaryExit) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{11} } -func (x *VoluntaryExit) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *VoluntaryExit) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *VoluntaryExit) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *VoluntaryExit) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type SignedVoluntaryExit struct { @@ -1124,8 +1123,8 @@ type BeaconBlockHeader struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` BodyRoot []byte `protobuf:"bytes,5,opt,name=body_root,json=bodyRoot,proto3" json:"body_root,omitempty" ssz-size:"32"` @@ -1163,18 +1162,18 @@ func (*BeaconBlockHeader) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{14} } -func (x *BeaconBlockHeader) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockHeader) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockHeader) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockHeader) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockHeader) GetParentRoot() []byte { @@ -1431,8 +1430,8 @@ type BeaconBlockBellatrix struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBodyBellatrix `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -1470,18 +1469,18 @@ func (*BeaconBlockBellatrix) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{19} } -func (x *BeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockBellatrix) GetParentRoot() []byte { @@ -1684,8 +1683,8 @@ type BlindedBeaconBlockBellatrix struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BlindedBeaconBlockBodyBellatrix `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -1723,18 +1722,18 @@ func (*BlindedBeaconBlockBellatrix) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{22} } -func (x *BlindedBeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlindedBeaconBlockBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BlindedBeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BlindedBeaconBlockBellatrix) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BlindedBeaconBlockBellatrix) GetParentRoot() []byte { @@ -1992,8 +1991,8 @@ type BeaconBlockCapella struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BeaconBlockBodyCapella `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -2031,18 +2030,18 @@ func (*BeaconBlockCapella) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{26} } -func (x *BeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconBlockCapella) GetParentRoot() []byte { @@ -2253,8 +2252,8 @@ type BlindedBeaconBlockCapella struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ParentRoot []byte `protobuf:"bytes,3,opt,name=parent_root,json=parentRoot,proto3" json:"parent_root,omitempty" ssz-size:"32"` StateRoot []byte `protobuf:"bytes,4,opt,name=state_root,json=stateRoot,proto3" json:"state_root,omitempty" ssz-size:"32"` Body *BlindedBeaconBlockBodyCapella `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` @@ -2292,18 +2291,18 @@ func (*BlindedBeaconBlockCapella) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_block_proto_rawDescGZIP(), []int{29} } -func (x *BlindedBeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlindedBeaconBlockCapella) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *BlindedBeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BlindedBeaconBlockCapella) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BlindedBeaconBlockCapella) GetParentRoot() []byte { @@ -3022,13 +3021,13 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, @@ -3052,14 +3051,14 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x6b, 0x41, 0x6c, 0x74, 0x61, 0x69, 0x72, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0b, 0x70, 0x61, @@ -3203,14 +3202,14 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x61, 0x72, 0x79, 0x45, 0x78, 0x69, 0x74, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x78, 0x0a, 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, @@ -3234,13 +3233,13 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, @@ -3296,13 +3295,13 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, @@ -3377,14 +3376,14 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x42, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x72, 0x69, 0x78, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0b, @@ -3472,13 +3471,13 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, @@ -3560,14 +3559,14 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x63, 0x6b, 0x43, 0x61, 0x70, 0x65, 0x6c, 0x6c, 0x61, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0b, @@ -3704,7 +3703,7 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, + 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, diff --git a/proto/prysm/v1alpha1/beacon_block.proto b/proto/prysm/v1alpha1/beacon_block.proto index 51a4be73fe2d..a078a5bf79d1 100644 --- a/proto/prysm/v1alpha1/beacon_block.proto +++ b/proto/prysm/v1alpha1/beacon_block.proto @@ -22,7 +22,7 @@ import "proto/prysm/v1alpha1/blobs.proto"; import "proto/engine/v1/execution_engine.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "BeaconBlockProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -75,10 +75,10 @@ message GenericBeaconBlock { // The Ethereum consensus beacon block. The message does not contain a validator signature. message BeaconBlock { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -102,10 +102,10 @@ message SignedBeaconBlock { // The unsigned version of a (HF1) beacon block. The message does not contain a validator signature. message BeaconBlockAltair { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -240,10 +240,10 @@ message Deposit { // validator signature. message VoluntaryExit { // The epoch on when exit request becomes valid. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Index of the exiting validator. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } // The signed version of voluntary exit. @@ -276,10 +276,10 @@ message Eth1Data { // a validator signature. message BeaconBlockHeader { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte merkle tree root of the parent ssz encoded block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -328,10 +328,10 @@ message SignedBeaconBlockBellatrix { message BeaconBlockBellatrix { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -389,10 +389,10 @@ message SignedBlindedBeaconBlockBellatrix { message BlindedBeaconBlockBellatrix { // Beacon chain slot that this blinded block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -456,10 +456,10 @@ message SignedBeaconBlockCapella { message BeaconBlockCapella { // Beacon chain slot that this block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -520,10 +520,10 @@ message SignedBlindedBeaconBlockCapella { message BlindedBeaconBlockCapella { // Beacon chain slot that this blinded block represents. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator index of the validator that proposed the block header. - uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 32 byte root of the parent block. bytes parent_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; diff --git a/proto/prysm/v1alpha1/beacon_chain.pb.go b/proto/prysm/v1alpha1/beacon_chain.pb.go index f301e8727220..ec46724f0ac7 100755 --- a/proto/prysm/v1alpha1/beacon_chain.pb.go +++ b/proto/prysm/v1alpha1/beacon_chain.pb.go @@ -9,8 +9,8 @@ package eth import ( context "context" empty "github.com/golang/protobuf/ptypes/empty" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -186,11 +186,11 @@ func (m *ListIndexedAttestationsRequest) GetQueryFilter() isListIndexedAttestati return nil } -func (x *ListIndexedAttestationsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListIndexedAttestationsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListIndexedAttestationsRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListIndexedAttestationsRequest) GetGenesisEpoch() bool { @@ -219,7 +219,7 @@ type isListIndexedAttestationsRequest_QueryFilter interface { } type ListIndexedAttestationsRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListIndexedAttestationsRequest_GenesisEpoch struct { @@ -283,11 +283,11 @@ func (m *ListAttestationsRequest) GetQueryFilter() isListAttestationsRequest_Que return nil } -func (x *ListAttestationsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListAttestationsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListAttestationsRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListAttestationsRequest) GetGenesisEpoch() bool { @@ -316,7 +316,7 @@ type isListAttestationsRequest_QueryFilter interface { } type ListAttestationsRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListAttestationsRequest_GenesisEpoch struct { @@ -515,18 +515,18 @@ func (x *ListBlocksRequest) GetRoot() []byte { return nil } -func (x *ListBlocksRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ListBlocksRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x, ok := x.GetQueryFilter().(*ListBlocksRequest_Slot); ok { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ListBlocksRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListBlocksRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListBlocksRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListBlocksRequest) GetGenesis() bool { @@ -559,11 +559,11 @@ type ListBlocksRequest_Root struct { } type ListBlocksRequest_Slot struct { - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } type ListBlocksRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListBlocksRequest_Genesis struct { @@ -799,17 +799,17 @@ type ChainHead struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeadSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=head_slot,json=headSlot,proto3" json:"head_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - HeadEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=head_epoch,json=headEpoch,proto3" json:"head_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + HeadSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=head_slot,json=headSlot,proto3" json:"head_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + HeadEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=head_epoch,json=headEpoch,proto3" json:"head_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` HeadBlockRoot []byte `protobuf:"bytes,3,opt,name=head_block_root,json=headBlockRoot,proto3" json:"head_block_root,omitempty" ssz-size:"32"` - FinalizedSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,4,opt,name=finalized_slot,json=finalizedSlot,proto3" json:"finalized_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - FinalizedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=finalized_epoch,json=finalizedEpoch,proto3" json:"finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + FinalizedSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,4,opt,name=finalized_slot,json=finalizedSlot,proto3" json:"finalized_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + FinalizedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=finalized_epoch,json=finalizedEpoch,proto3" json:"finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` FinalizedBlockRoot []byte `protobuf:"bytes,6,opt,name=finalized_block_root,json=finalizedBlockRoot,proto3" json:"finalized_block_root,omitempty" ssz-size:"32"` - JustifiedSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,7,opt,name=justified_slot,json=justifiedSlot,proto3" json:"justified_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - JustifiedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,8,opt,name=justified_epoch,json=justifiedEpoch,proto3" json:"justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + JustifiedSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,7,opt,name=justified_slot,json=justifiedSlot,proto3" json:"justified_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + JustifiedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,8,opt,name=justified_epoch,json=justifiedEpoch,proto3" json:"justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` JustifiedBlockRoot []byte `protobuf:"bytes,9,opt,name=justified_block_root,json=justifiedBlockRoot,proto3" json:"justified_block_root,omitempty" ssz-size:"32"` - PreviousJustifiedSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,10,opt,name=previous_justified_slot,json=previousJustifiedSlot,proto3" json:"previous_justified_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - PreviousJustifiedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,11,opt,name=previous_justified_epoch,json=previousJustifiedEpoch,proto3" json:"previous_justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + PreviousJustifiedSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,10,opt,name=previous_justified_slot,json=previousJustifiedSlot,proto3" json:"previous_justified_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + PreviousJustifiedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,11,opt,name=previous_justified_epoch,json=previousJustifiedEpoch,proto3" json:"previous_justified_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` PreviousJustifiedBlockRoot []byte `protobuf:"bytes,12,opt,name=previous_justified_block_root,json=previousJustifiedBlockRoot,proto3" json:"previous_justified_block_root,omitempty" ssz-size:"32"` OptimisticStatus bool `protobuf:"varint,13,opt,name=optimistic_status,json=optimisticStatus,proto3" json:"optimistic_status,omitempty"` } @@ -846,18 +846,18 @@ func (*ChainHead) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{8} } -func (x *ChainHead) GetHeadSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ChainHead) GetHeadSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.HeadSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ChainHead) GetHeadEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ChainHead) GetHeadEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.HeadEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ChainHead) GetHeadBlockRoot() []byte { @@ -867,18 +867,18 @@ func (x *ChainHead) GetHeadBlockRoot() []byte { return nil } -func (x *ChainHead) GetFinalizedSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ChainHead) GetFinalizedSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.FinalizedSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ChainHead) GetFinalizedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ChainHead) GetFinalizedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.FinalizedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ChainHead) GetFinalizedBlockRoot() []byte { @@ -888,18 +888,18 @@ func (x *ChainHead) GetFinalizedBlockRoot() []byte { return nil } -func (x *ChainHead) GetJustifiedSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ChainHead) GetJustifiedSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.JustifiedSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ChainHead) GetJustifiedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ChainHead) GetJustifiedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.JustifiedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ChainHead) GetJustifiedBlockRoot() []byte { @@ -909,18 +909,18 @@ func (x *ChainHead) GetJustifiedBlockRoot() []byte { return nil } -func (x *ChainHead) GetPreviousJustifiedSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ChainHead) GetPreviousJustifiedSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.PreviousJustifiedSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ChainHead) GetPreviousJustifiedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ChainHead) GetPreviousJustifiedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.PreviousJustifiedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ChainHead) GetPreviousJustifiedBlockRoot() []byte { @@ -988,11 +988,11 @@ func (m *ListCommitteesRequest) GetQueryFilter() isListCommitteesRequest_QueryFi return nil } -func (x *ListCommitteesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListCommitteesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListCommitteesRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListCommitteesRequest) GetGenesis() bool { @@ -1007,7 +1007,7 @@ type isListCommitteesRequest_QueryFilter interface { } type ListCommitteesRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListCommitteesRequest_Genesis struct { @@ -1023,7 +1023,7 @@ type BeaconCommittees struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Committees map[uint64]*BeaconCommittees_CommitteesList `protobuf:"bytes,2,rep,name=committees,proto3" json:"committees,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` ActiveValidatorCount uint64 `protobuf:"varint,3,opt,name=active_validator_count,json=activeValidatorCount,proto3" json:"active_validator_count,omitempty"` } @@ -1060,11 +1060,11 @@ func (*BeaconCommittees) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{10} } -func (x *BeaconCommittees) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *BeaconCommittees) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *BeaconCommittees) GetCommittees() map[uint64]*BeaconCommittees_CommitteesList { @@ -1092,7 +1092,7 @@ type ListValidatorBalancesRequest struct { // *ListValidatorBalancesRequest_Genesis QueryFilter isListValidatorBalancesRequest_QueryFilter `protobuf_oneof:"query_filter"` PublicKeys [][]byte `protobuf:"bytes,3,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty" ssz-size:"?,48"` - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"` PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"` } @@ -1136,11 +1136,11 @@ func (m *ListValidatorBalancesRequest) GetQueryFilter() isListValidatorBalancesR return nil } -func (x *ListValidatorBalancesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListValidatorBalancesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListValidatorBalancesRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListValidatorBalancesRequest) GetGenesis() bool { @@ -1157,11 +1157,11 @@ func (x *ListValidatorBalancesRequest) GetPublicKeys() [][]byte { return nil } -func (x *ListValidatorBalancesRequest) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ListValidatorBalancesRequest) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } func (x *ListValidatorBalancesRequest) GetPageSize() int32 { @@ -1183,7 +1183,7 @@ type isListValidatorBalancesRequest_QueryFilter interface { } type ListValidatorBalancesRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListValidatorBalancesRequest_Genesis struct { @@ -1199,7 +1199,7 @@ type ValidatorBalances struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Balances []*ValidatorBalances_Balance `protobuf:"bytes,2,rep,name=balances,proto3" json:"balances,omitempty"` NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` TotalSize int32 `protobuf:"varint,4,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"` @@ -1237,11 +1237,11 @@ func (*ValidatorBalances) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{12} } -func (x *ValidatorBalances) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ValidatorBalances) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ValidatorBalances) GetBalances() []*ValidatorBalances_Balance { @@ -1279,7 +1279,7 @@ type ListValidatorsRequest struct { PageSize int32 `protobuf:"varint,4,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"` PageToken string `protobuf:"bytes,5,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"` PublicKeys [][]byte `protobuf:"bytes,6,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty"` - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ListValidatorsRequest) Reset() { @@ -1321,11 +1321,11 @@ func (m *ListValidatorsRequest) GetQueryFilter() isListValidatorsRequest_QueryFi return nil } -func (x *ListValidatorsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListValidatorsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListValidatorsRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListValidatorsRequest) GetGenesis() bool { @@ -1363,11 +1363,11 @@ func (x *ListValidatorsRequest) GetPublicKeys() [][]byte { return nil } -func (x *ListValidatorsRequest) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ListValidatorsRequest) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type isListValidatorsRequest_QueryFilter interface { @@ -1375,7 +1375,7 @@ type isListValidatorsRequest_QueryFilter interface { } type ListValidatorsRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListValidatorsRequest_Genesis struct { @@ -1437,11 +1437,11 @@ func (m *GetValidatorRequest) GetQueryFilter() isGetValidatorRequest_QueryFilter return nil } -func (x *GetValidatorRequest) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *GetValidatorRequest) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x, ok := x.GetQueryFilter().(*GetValidatorRequest_Index); ok { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *GetValidatorRequest) GetPublicKey() []byte { @@ -1456,7 +1456,7 @@ type isGetValidatorRequest_QueryFilter interface { } type GetValidatorRequest_Index struct { - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } type GetValidatorRequest_PublicKey struct { @@ -1472,7 +1472,7 @@ type Validators struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` ValidatorList []*Validators_ValidatorContainer `protobuf:"bytes,2,rep,name=validator_list,json=validatorList,proto3" json:"validator_list,omitempty"` NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` TotalSize int32 `protobuf:"varint,4,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"` @@ -1510,11 +1510,11 @@ func (*Validators) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{15} } -func (x *Validators) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validators) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *Validators) GetValidatorList() []*Validators_ValidatorContainer { @@ -1589,11 +1589,11 @@ func (m *GetValidatorActiveSetChangesRequest) GetQueryFilter() isGetValidatorAct return nil } -func (x *GetValidatorActiveSetChangesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *GetValidatorActiveSetChangesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*GetValidatorActiveSetChangesRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *GetValidatorActiveSetChangesRequest) GetGenesis() bool { @@ -1608,7 +1608,7 @@ type isGetValidatorActiveSetChangesRequest_QueryFilter interface { } type GetValidatorActiveSetChangesRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type GetValidatorActiveSetChangesRequest_Genesis struct { @@ -1626,15 +1626,15 @@ type ActiveSetChanges struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` ActivatedPublicKeys [][]byte `protobuf:"bytes,2,rep,name=activated_public_keys,json=activatedPublicKeys,proto3" json:"activated_public_keys,omitempty" ssz-size:"?,48"` - ActivatedIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=activated_indices,json=activatedIndices,proto3" json:"activated_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ActivatedIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=activated_indices,json=activatedIndices,proto3" json:"activated_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` ExitedPublicKeys [][]byte `protobuf:"bytes,4,rep,name=exited_public_keys,json=exitedPublicKeys,proto3" json:"exited_public_keys,omitempty" ssz-size:"?,48"` - ExitedIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,5,rep,packed,name=exited_indices,json=exitedIndices,proto3" json:"exited_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ExitedIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,5,rep,packed,name=exited_indices,json=exitedIndices,proto3" json:"exited_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` SlashedPublicKeys [][]byte `protobuf:"bytes,6,rep,name=slashed_public_keys,json=slashedPublicKeys,proto3" json:"slashed_public_keys,omitempty" ssz-size:"?,48"` - SlashedIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,rep,packed,name=slashed_indices,json=slashedIndices,proto3" json:"slashed_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + SlashedIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,rep,packed,name=slashed_indices,json=slashedIndices,proto3" json:"slashed_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` EjectedPublicKeys [][]byte `protobuf:"bytes,8,rep,name=ejected_public_keys,json=ejectedPublicKeys,proto3" json:"ejected_public_keys,omitempty" ssz-size:"?,48"` - EjectedIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,9,rep,packed,name=ejected_indices,json=ejectedIndices,proto3" json:"ejected_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + EjectedIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,9,rep,packed,name=ejected_indices,json=ejectedIndices,proto3" json:"ejected_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ActiveSetChanges) Reset() { @@ -1669,11 +1669,11 @@ func (*ActiveSetChanges) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{17} } -func (x *ActiveSetChanges) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ActiveSetChanges) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ActiveSetChanges) GetActivatedPublicKeys() [][]byte { @@ -1683,11 +1683,11 @@ func (x *ActiveSetChanges) GetActivatedPublicKeys() [][]byte { return nil } -func (x *ActiveSetChanges) GetActivatedIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ActiveSetChanges) GetActivatedIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ActivatedIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } func (x *ActiveSetChanges) GetExitedPublicKeys() [][]byte { @@ -1697,11 +1697,11 @@ func (x *ActiveSetChanges) GetExitedPublicKeys() [][]byte { return nil } -func (x *ActiveSetChanges) GetExitedIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ActiveSetChanges) GetExitedIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ExitedIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } func (x *ActiveSetChanges) GetSlashedPublicKeys() [][]byte { @@ -1711,11 +1711,11 @@ func (x *ActiveSetChanges) GetSlashedPublicKeys() [][]byte { return nil } -func (x *ActiveSetChanges) GetSlashedIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ActiveSetChanges) GetSlashedIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.SlashedIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } func (x *ActiveSetChanges) GetEjectedPublicKeys() [][]byte { @@ -1725,11 +1725,11 @@ func (x *ActiveSetChanges) GetEjectedPublicKeys() [][]byte { return nil } -func (x *ActiveSetChanges) GetEjectedIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ActiveSetChanges) GetEjectedIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.EjectedIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type ValidatorPerformanceRequest struct { @@ -1739,7 +1739,7 @@ type ValidatorPerformanceRequest struct { // Deprecated: Do not use. PublicKeys [][]byte `protobuf:"bytes,1,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty"` - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ValidatorPerformanceRequest) Reset() { @@ -1782,11 +1782,11 @@ func (x *ValidatorPerformanceRequest) GetPublicKeys() [][]byte { return nil } -func (x *ValidatorPerformanceRequest) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorPerformanceRequest) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } // Deprecated: Do not use. @@ -1797,9 +1797,9 @@ type ValidatorPerformanceResponse struct { CurrentEffectiveBalances []uint64 `protobuf:"varint,1,rep,packed,name=current_effective_balances,json=currentEffectiveBalances,proto3" json:"current_effective_balances,omitempty"` // Deprecated: Do not use. - InclusionSlots []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,rep,packed,name=inclusion_slots,json=inclusionSlots,proto3" json:"inclusion_slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + InclusionSlots []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,rep,packed,name=inclusion_slots,json=inclusionSlots,proto3" json:"inclusion_slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` // Deprecated: Do not use. - InclusionDistances []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,rep,packed,name=inclusion_distances,json=inclusionDistances,proto3" json:"inclusion_distances,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + InclusionDistances []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,rep,packed,name=inclusion_distances,json=inclusionDistances,proto3" json:"inclusion_distances,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` CorrectlyVotedSource []bool `protobuf:"varint,4,rep,packed,name=correctly_voted_source,json=correctlyVotedSource,proto3" json:"correctly_voted_source,omitempty"` CorrectlyVotedTarget []bool `protobuf:"varint,5,rep,packed,name=correctly_voted_target,json=correctlyVotedTarget,proto3" json:"correctly_voted_target,omitempty"` CorrectlyVotedHead []bool `protobuf:"varint,6,rep,packed,name=correctly_voted_head,json=correctlyVotedHead,proto3" json:"correctly_voted_head,omitempty"` @@ -1851,19 +1851,19 @@ func (x *ValidatorPerformanceResponse) GetCurrentEffectiveBalances() []uint64 { } // Deprecated: Do not use. -func (x *ValidatorPerformanceResponse) GetInclusionSlots() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ValidatorPerformanceResponse) GetInclusionSlots() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.InclusionSlots } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(nil) } // Deprecated: Do not use. -func (x *ValidatorPerformanceResponse) GetInclusionDistances() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ValidatorPerformanceResponse) GetInclusionDistances() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.InclusionDistances } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(nil) } func (x *ValidatorPerformanceResponse) GetCorrectlyVotedSource() []bool { @@ -1940,8 +1940,8 @@ type ValidatorQueue struct { ActivationPublicKeys [][]byte `protobuf:"bytes,2,rep,name=activation_public_keys,json=activationPublicKeys,proto3" json:"activation_public_keys,omitempty" ssz-size:"?,48"` // Deprecated: Do not use. ExitPublicKeys [][]byte `protobuf:"bytes,3,rep,name=exit_public_keys,json=exitPublicKeys,proto3" json:"exit_public_keys,omitempty" ssz-size:"?,48"` - ActivationValidatorIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,rep,packed,name=activation_validator_indices,json=activationValidatorIndices,proto3" json:"activation_validator_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - ExitValidatorIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,5,rep,packed,name=exit_validator_indices,json=exitValidatorIndices,proto3" json:"exit_validator_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ActivationValidatorIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,rep,packed,name=activation_validator_indices,json=activationValidatorIndices,proto3" json:"activation_validator_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + ExitValidatorIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,5,rep,packed,name=exit_validator_indices,json=exitValidatorIndices,proto3" json:"exit_validator_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ValidatorQueue) Reset() { @@ -1999,18 +1999,18 @@ func (x *ValidatorQueue) GetExitPublicKeys() [][]byte { return nil } -func (x *ValidatorQueue) GetActivationValidatorIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorQueue) GetActivationValidatorIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ActivationValidatorIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } -func (x *ValidatorQueue) GetExitValidatorIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorQueue) GetExitValidatorIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ExitValidatorIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type ListValidatorAssignmentsRequest struct { @@ -2024,7 +2024,7 @@ type ListValidatorAssignmentsRequest struct { // *ListValidatorAssignmentsRequest_Genesis QueryFilter isListValidatorAssignmentsRequest_QueryFilter `protobuf_oneof:"query_filter"` PublicKeys [][]byte `protobuf:"bytes,3,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty" ssz-size:"?,48"` - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` PageSize int32 `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"` PageToken string `protobuf:"bytes,6,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"` } @@ -2068,11 +2068,11 @@ func (m *ListValidatorAssignmentsRequest) GetQueryFilter() isListValidatorAssign return nil } -func (x *ListValidatorAssignmentsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ListValidatorAssignmentsRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*ListValidatorAssignmentsRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ListValidatorAssignmentsRequest) GetGenesis() bool { @@ -2089,11 +2089,11 @@ func (x *ListValidatorAssignmentsRequest) GetPublicKeys() [][]byte { return nil } -func (x *ListValidatorAssignmentsRequest) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ListValidatorAssignmentsRequest) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } func (x *ListValidatorAssignmentsRequest) GetPageSize() int32 { @@ -2115,7 +2115,7 @@ type isListValidatorAssignmentsRequest_QueryFilter interface { } type ListValidatorAssignmentsRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type ListValidatorAssignmentsRequest_Genesis struct { @@ -2131,7 +2131,7 @@ type ValidatorAssignments struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Assignments []*ValidatorAssignments_CommitteeAssignment `protobuf:"bytes,2,rep,name=assignments,proto3" json:"assignments,omitempty"` NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` TotalSize int32 `protobuf:"varint,4,opt,name=total_size,json=totalSize,proto3" json:"total_size,omitempty"` @@ -2169,11 +2169,11 @@ func (*ValidatorAssignments) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{22} } -func (x *ValidatorAssignments) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ValidatorAssignments) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ValidatorAssignments) GetAssignments() []*ValidatorAssignments_CommitteeAssignment { @@ -2249,11 +2249,11 @@ func (m *GetValidatorParticipationRequest) GetQueryFilter() isGetValidatorPartic return nil } -func (x *GetValidatorParticipationRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *GetValidatorParticipationRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetQueryFilter().(*GetValidatorParticipationRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *GetValidatorParticipationRequest) GetGenesis() bool { @@ -2268,7 +2268,7 @@ type isGetValidatorParticipationRequest_QueryFilter interface { } type GetValidatorParticipationRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type GetValidatorParticipationRequest_Genesis struct { @@ -2285,7 +2285,7 @@ type ValidatorParticipationResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Finalized bool `protobuf:"varint,2,opt,name=finalized,proto3" json:"finalized,omitempty"` Participation *ValidatorParticipation `protobuf:"bytes,3,opt,name=participation,proto3" json:"participation,omitempty"` } @@ -2322,11 +2322,11 @@ func (*ValidatorParticipationResponse) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{24} } -func (x *ValidatorParticipationResponse) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ValidatorParticipationResponse) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ValidatorParticipationResponse) GetFinalized() bool { @@ -2513,7 +2513,7 @@ type SubmitSlashingResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - SlashedIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=slashed_indices,json=slashedIndices,proto3" json:"slashed_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + SlashedIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=slashed_indices,json=slashedIndices,proto3" json:"slashed_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *SubmitSlashingResponse) Reset() { @@ -2548,11 +2548,11 @@ func (*SubmitSlashingResponse) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{28} } -func (x *SubmitSlashingResponse) GetSlashedIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SubmitSlashingResponse) GetSlashedIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.SlashedIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type IndividualVotesRequest struct { @@ -2560,9 +2560,9 @@ type IndividualVotesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` PublicKeys [][]byte `protobuf:"bytes,2,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty"` - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *IndividualVotesRequest) Reset() { @@ -2597,11 +2597,11 @@ func (*IndividualVotesRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{29} } -func (x *IndividualVotesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *IndividualVotesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *IndividualVotesRequest) GetPublicKeys() [][]byte { @@ -2611,11 +2611,11 @@ func (x *IndividualVotesRequest) GetPublicKeys() [][]byte { return nil } -func (x *IndividualVotesRequest) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *IndividualVotesRequest) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type IndividualVotesRespond struct { @@ -2670,7 +2670,7 @@ type BeaconCommittees_CommitteeItem struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ValidatorIndices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=validator_indices,json=validatorIndices,proto3" json:"validator_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=validator_indices,json=validatorIndices,proto3" json:"validator_indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *BeaconCommittees_CommitteeItem) Reset() { @@ -2705,11 +2705,11 @@ func (*BeaconCommittees_CommitteeItem) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{10, 0} } -func (x *BeaconCommittees_CommitteeItem) GetValidatorIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconCommittees_CommitteeItem) GetValidatorIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type BeaconCommittees_CommitteesList struct { @@ -2765,7 +2765,7 @@ type ValidatorBalances_Balance struct { unknownFields protoimpl.UnknownFields PublicKey []byte `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" ssz-size:"48"` - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Balance uint64 `protobuf:"varint,3,opt,name=balance,proto3" json:"balance,omitempty"` Status string `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"` } @@ -2809,11 +2809,11 @@ func (x *ValidatorBalances_Balance) GetPublicKey() []byte { return nil } -func (x *ValidatorBalances_Balance) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorBalances_Balance) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *ValidatorBalances_Balance) GetBalance() uint64 { @@ -2835,7 +2835,7 @@ type Validators_ValidatorContainer struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Validator *Validator `protobuf:"bytes,2,opt,name=validator,proto3" json:"validator,omitempty"` } @@ -2871,11 +2871,11 @@ func (*Validators_ValidatorContainer) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{15, 0} } -func (x *Validators_ValidatorContainer) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *Validators_ValidatorContainer) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *Validators_ValidatorContainer) GetValidator() *Validator { @@ -2890,13 +2890,13 @@ type ValidatorAssignments_CommitteeAssignment struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BeaconCommittees []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=beacon_committees,json=beaconCommittees,proto3" json:"beacon_committees,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` - AttesterSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerSlots []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,4,rep,packed,name=proposer_slots,json=proposerSlots,proto3" json:"proposer_slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + BeaconCommittees []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=beacon_committees,json=beaconCommittees,proto3" json:"beacon_committees,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` + AttesterSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerSlots []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,4,rep,packed,name=proposer_slots,json=proposerSlots,proto3" json:"proposer_slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` // Deprecated: Do not use. PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" ssz-size:"48"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,6,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,6,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ValidatorAssignments_CommitteeAssignment) Reset() { @@ -2931,32 +2931,32 @@ func (*ValidatorAssignments_CommitteeAssignment) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{22, 0} } -func (x *ValidatorAssignments_CommitteeAssignment) GetBeaconCommittees() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorAssignments_CommitteeAssignment) GetBeaconCommittees() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.BeaconCommittees } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } -func (x *ValidatorAssignments_CommitteeAssignment) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *ValidatorAssignments_CommitteeAssignment) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } -func (x *ValidatorAssignments_CommitteeAssignment) GetAttesterSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ValidatorAssignments_CommitteeAssignment) GetAttesterSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.AttesterSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ValidatorAssignments_CommitteeAssignment) GetProposerSlots() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ValidatorAssignments_CommitteeAssignment) GetProposerSlots() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.ProposerSlots } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(nil) } // Deprecated: Do not use. @@ -2967,11 +2967,11 @@ func (x *ValidatorAssignments_CommitteeAssignment) GetPublicKey() []byte { return nil } -func (x *ValidatorAssignments_CommitteeAssignment) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorAssignments_CommitteeAssignment) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type IndividualVotesRespond_IndividualVote struct { @@ -2979,9 +2979,9 @@ type IndividualVotesRespond_IndividualVote struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` PublicKey []byte `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` IsSlashed bool `protobuf:"varint,4,opt,name=is_slashed,json=isSlashed,proto3" json:"is_slashed,omitempty"` IsWithdrawableInCurrentEpoch bool `protobuf:"varint,5,opt,name=is_withdrawable_in_current_epoch,json=isWithdrawableInCurrentEpoch,proto3" json:"is_withdrawable_in_current_epoch,omitempty"` IsActiveInCurrentEpoch bool `protobuf:"varint,6,opt,name=is_active_in_current_epoch,json=isActiveInCurrentEpoch,proto3" json:"is_active_in_current_epoch,omitempty"` @@ -2993,9 +2993,9 @@ type IndividualVotesRespond_IndividualVote struct { IsPreviousEpochHeadAttester bool `protobuf:"varint,12,opt,name=is_previous_epoch_head_attester,json=isPreviousEpochHeadAttester,proto3" json:"is_previous_epoch_head_attester,omitempty"` CurrentEpochEffectiveBalanceGwei uint64 `protobuf:"varint,13,opt,name=current_epoch_effective_balance_gwei,json=currentEpochEffectiveBalanceGwei,proto3" json:"current_epoch_effective_balance_gwei,omitempty"` // Deprecated: Do not use. - InclusionSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,14,opt,name=inclusion_slot,json=inclusionSlot,proto3" json:"inclusion_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + InclusionSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,14,opt,name=inclusion_slot,json=inclusionSlot,proto3" json:"inclusion_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` // Deprecated: Do not use. - InclusionDistance github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,15,opt,name=inclusion_distance,json=inclusionDistance,proto3" json:"inclusion_distance,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + InclusionDistance github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,15,opt,name=inclusion_distance,json=inclusionDistance,proto3" json:"inclusion_distance,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` InactivityScore uint64 `protobuf:"varint,16,opt,name=inactivity_score,json=inactivityScore,proto3" json:"inactivity_score,omitempty"` } @@ -3031,11 +3031,11 @@ func (*IndividualVotesRespond_IndividualVote) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_chain_proto_rawDescGZIP(), []int{30, 0} } -func (x *IndividualVotesRespond_IndividualVote) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *IndividualVotesRespond_IndividualVote) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *IndividualVotesRespond_IndividualVote) GetPublicKey() []byte { @@ -3045,11 +3045,11 @@ func (x *IndividualVotesRespond_IndividualVote) GetPublicKey() []byte { return nil } -func (x *IndividualVotesRespond_IndividualVote) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *IndividualVotesRespond_IndividualVote) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *IndividualVotesRespond_IndividualVote) GetIsSlashed() bool { @@ -3123,19 +3123,19 @@ func (x *IndividualVotesRespond_IndividualVote) GetCurrentEpochEffectiveBalanceG } // Deprecated: Do not use. -func (x *IndividualVotesRespond_IndividualVote) GetInclusionSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *IndividualVotesRespond_IndividualVote) GetInclusionSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.InclusionSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } // Deprecated: Do not use. -func (x *IndividualVotesRespond_IndividualVote) GetInclusionDistance() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *IndividualVotesRespond_IndividualVote) GetInclusionDistance() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.InclusionDistance } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *IndividualVotesRespond_IndividualVote) GetInactivityScore() uint64 { @@ -3177,7 +3177,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x67, 0x65, 0x6e, 0x65, 0x73, @@ -3192,7 +3192,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, @@ -3231,13 +3231,13 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x28, 0x0c, 0x48, 0x00, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x12, 0x5b, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, @@ -3304,14 +3304,14 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x48, 0x65, 0x61, 0x64, 0x12, 0x62, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x08, 0x68, 0x65, 0x61, 0x64, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x65, 0x0a, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x2e, 0x0a, 0x0f, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, @@ -3320,14 +3320,14 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x6c, 0x0a, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0d, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x6f, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x38, @@ -3338,14 +3338,14 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0d, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x6f, 0x0a, 0x0f, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x38, 0x0a, 0x14, 0x6a, 0x75, 0x73, 0x74, 0x69, @@ -3356,7 +3356,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x15, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x6c, 0x6f, 0x74, @@ -3364,7 +3364,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x16, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x45, 0x70, @@ -3380,7 +3380,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, @@ -3390,7 +3390,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x69, 0x74, 0x74, 0x65, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x57, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, @@ -3407,7 +3407,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x69, @@ -3430,7 +3430,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x18, @@ -3441,7 +3441,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, @@ -3453,7 +3453,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x4c, 0x0a, 0x08, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, @@ -3472,7 +3472,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, @@ -3483,7 +3483,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x18, 0x02, 0x20, 0x01, @@ -3498,7 +3498,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x79, 0x73, 0x12, 0x69, 0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x42, 0x0e, 0x0a, @@ -3507,7 +3507,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x67, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x48, 0x00, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, @@ -3518,7 +3518,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x5b, 0x0a, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, @@ -3536,7 +3536,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3e, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, @@ -3549,7 +3549,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, @@ -3559,7 +3559,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x3c, 0x0a, 0x15, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, @@ -3569,7 +3569,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, @@ -3580,7 +3580,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x73, 0x12, 0x76, 0x0a, 0x0e, 0x65, 0x78, 0x69, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x65, 0x78, 0x69, 0x74, @@ -3592,7 +3592,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x73, 0x6c, 0x61, 0x73, 0x68, 0x65, 0x64, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x12, 0x38, 0x0a, @@ -3603,7 +3603,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, @@ -3614,7 +3614,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x69, 0x63, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x69, 0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, @@ -3628,14 +3628,14 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x6f, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x42, 0x47, 0x18, 0x01, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x12, 0x78, 0x0a, 0x13, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x42, 0x47, 0x18, 0x01, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x12, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x16, @@ -3686,7 +3686,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x56, 0x61, @@ -3695,7 +3695,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x14, 0x65, 0x78, 0x69, 0x74, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, @@ -3705,7 +3705,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, @@ -3715,7 +3715,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x63, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x69, 0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, @@ -3728,7 +3728,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x61, 0x0a, 0x0b, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, @@ -3747,7 +3747,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x10, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, @@ -3755,21 +3755,21 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x6a, 0x0a, 0x0d, 0x61, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0c, 0x61, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x6c, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x12, 0x27, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, @@ -3778,7 +3778,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x12, 0x78, 0x0a, 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, @@ -3788,7 +3788,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1a, 0x0a, 0x07, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, @@ -3799,7 +3799,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x73, 0x65, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x02, 0x20, @@ -3840,7 +3840,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x68, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x73, 0x6c, 0x61, 0x73, 0x68, 0x65, 0x64, 0x49, 0x6e, 0x64, 0x69, 0x63, @@ -3849,7 +3849,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, @@ -3857,7 +3857,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0x9f, 0x0a, 0x0a, 0x16, 0x49, 0x6e, 0x64, 0x69, @@ -3873,7 +3873,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, @@ -3881,7 +3881,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, @@ -3929,14 +3929,14 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x04, 0x42, 0x47, 0x18, 0x01, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x76, 0x0a, 0x12, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x04, 0x42, 0x47, 0x18, 0x01, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x11, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x29, @@ -4178,7 +4178,7 @@ var file_proto_prysm_v1alpha1_beacon_chain_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, + 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, diff --git a/proto/prysm/v1alpha1/beacon_chain.pb.gw.go b/proto/prysm/v1alpha1/beacon_chain.pb.gw.go index 88aa23484128..bd4e480ee1a2 100755 --- a/proto/prysm/v1alpha1/beacon_chain.pb.gw.go +++ b/proto/prysm/v1alpha1/beacon_chain.pb.gw.go @@ -10,20 +10,19 @@ package eth import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/beacon_chain.proto b/proto/prysm/v1alpha1/beacon_chain.proto index 8f03ae1900d2..0b731077bbc1 100644 --- a/proto/prysm/v1alpha1/beacon_chain.proto +++ b/proto/prysm/v1alpha1/beacon_chain.proto @@ -24,7 +24,7 @@ import "proto/prysm/v1alpha1/beacon_block.proto"; import "proto/prysm/v1alpha1/validator.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "BeaconChainProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -297,7 +297,7 @@ message ValidatorChangeSet { message ListIndexedAttestationsRequest { oneof query_filter { // Retrieve attestations by epoch processed. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve genesis epoch attestations. bool genesis_epoch = 2; @@ -319,7 +319,7 @@ message ListAttestationsRequest { oneof query_filter { // Filter attestations by epoch processed. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve attestations from 0 epoch. bool genesis_epoch = 2; @@ -367,11 +367,11 @@ message ListBlocksRequest { // Slot to lookup a block. If the slot is not yet finalized, this // criteria may yield multiple valid blocks if the node has seen blocks // from another fork. - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The epoch number for which to retrieve blocks. If specified, this // will return all blocks found within the span of the specified epoch. - uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve genesis block. bool genesis = 4; @@ -434,37 +434,37 @@ message BeaconBlockContainer { // Information about the head of the beacon chain. message ChainHead { // Slot of the head block. - uint64 head_slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 head_slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Epoch of the head block. - uint64 head_epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 head_epoch = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // 32 byte merkle tree root of the canonical head block in the beacon node. bytes head_block_root = 3 [(ethereum.eth.ext.ssz_size) = "32"]; // Most recent slot that contains the finalized block. - uint64 finalized_slot = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 finalized_slot = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Epoch of the finalized block. - uint64 finalized_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 finalized_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Most recent 32 byte finalized block root. bytes finalized_block_root = 6 [(ethereum.eth.ext.ssz_size) = "32"]; // Most recent slot that contains the justified block. - uint64 justified_slot = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 justified_slot = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Epoch of the justified block. - uint64 justified_epoch = 8 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 justified_epoch = 8 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Most recent 32 byte justified block root. bytes justified_block_root = 9 [(ethereum.eth.ext.ssz_size) = "32"]; // Most recent slot that contains the previous justified block. - uint64 previous_justified_slot = 10 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 previous_justified_slot = 10 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Epoch of the previous justified block. - uint64 previous_justified_epoch = 11 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 previous_justified_epoch = 11 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Previous 32 byte justified block root. bytes previous_justified_block_root = 12 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -476,7 +476,7 @@ message ChainHead { message ListCommitteesRequest { oneof query_filter { // Optional criteria to retrieve data at a specific epoch. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve genesis data. bool genesis = 2; @@ -486,7 +486,7 @@ message ListCommitteesRequest { message BeaconCommittees { message CommitteeItem { // A committee is a list of validator indices participating in consensus at a slot. - repeated uint64 validator_indices = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 validator_indices = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message CommitteesList { @@ -495,7 +495,7 @@ message BeaconCommittees { } // The epoch for which the committees in the response belong to. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // A map of validator committees by slot. map committees = 2; @@ -507,7 +507,7 @@ message BeaconCommittees { message ListValidatorBalancesRequest { oneof query_filter { // Optional criteria to retrieve balances at a specific epoch. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve the genesis list of balances. bool genesis = 2; @@ -517,7 +517,7 @@ message ListValidatorBalancesRequest { // epoch. repeated bytes public_keys = 3 [(ethereum.eth.ext.ssz_size) = "?,48"]; // Validator indices to filter validators for the given epoch. - repeated uint64 indices = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 indices = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The maximum number of Validators to return in the response. // This field is optional. @@ -531,14 +531,14 @@ message ListValidatorBalancesRequest { message ValidatorBalances { // Epoch which the state was considered to determine the validator balances. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; message Balance { // Validator's 48 byte BLS public key. bytes public_key = 1 [(ethereum.eth.ext.ssz_size) = "48"]; // Validator's index in the validator set. - uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Validator's balance in gwei. uint64 balance = 3; @@ -562,7 +562,7 @@ message ListValidatorsRequest { // Optional criteria to retrieve validators at a specific epoch. // Omitting this field or setting it to zero will retrieve a response // with the current active validator set. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve the genesis set of validators. bool genesis = 2; @@ -586,13 +586,13 @@ message ListValidatorsRequest { // Specify which validators you would like to retrieve by their indices. // This field is optional. - repeated uint64 indices = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 indices = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message GetValidatorRequest { oneof query_filter { // Validator index in the registry. - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 48 byte validator public key. bytes public_key = 2 [(ethereum.eth.ext.ssz_size) = "48"]; @@ -603,10 +603,10 @@ message Validators { // Epoch which the state was considered to determine the active validator // set. This field is not optional. Zero value epoch indicates the validator // set is from the Ethereum proof of stake genesis set. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; message ValidatorContainer { - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; Validator validator = 2; } @@ -624,7 +624,7 @@ message Validators { message GetValidatorActiveSetChangesRequest { oneof query_filter { // Optional criteria to retrieve balances at a specific epoch. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Optional criteria to retrieve the genesis list of balances. bool genesis = 2; @@ -634,38 +634,38 @@ message GetValidatorActiveSetChangesRequest { message ActiveSetChanges { // Epoch which the state was considered to determine the active validator // set. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // 48 byte validator public keys that have been activated in the given epoch. repeated bytes activated_public_keys = 2 [(ethereum.eth.ext.ssz_size) = "?,48"]; // Indices of validators activated in the given epoch. - repeated uint64 activated_indices = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 activated_indices = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 48 byte validator public keys that have been voluntarily exited in the given epoch. repeated bytes exited_public_keys = 4 [(ethereum.eth.ext.ssz_size) = "?,48"]; // Indices of validators exited in the given epoch. - repeated uint64 exited_indices = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 exited_indices = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 48 byte validator public keys that have been slashed in the given epoch. repeated bytes slashed_public_keys = 6 [(ethereum.eth.ext.ssz_size) = "?,48"]; // Indices of validators slashed in the given epoch. - repeated uint64 slashed_indices = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 slashed_indices = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // 48 byte validator public keys that have been involuntarily ejected in this epoch. repeated bytes ejected_public_keys = 8 [(ethereum.eth.ext.ssz_size) = "?,48"]; // Indices of validators ejected in the given epoch. - repeated uint64 ejected_indices = 9 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 ejected_indices = 9 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message ValidatorPerformanceRequest { // A list of 48 byte validator public keys. repeated bytes public_keys = 1 [deprecated = true]; // A list of validator indices to retrieve performance by their indices. - repeated uint64 indices = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 indices = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } // DEPRECATED: Prysm Web UI and associated endpoints will be fully removed in a future hard fork. @@ -677,11 +677,11 @@ message ValidatorPerformanceResponse { // The slot of when validator's attestation got included in the chain at previous epoch, the slot // is mapped 1-to-1 with the request's public keys. // Deprecated: This field can no longer be fetched from the beacon state after the Altair hard fork. - repeated uint64 inclusion_slots = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot", deprecated = true]; + repeated uint64 inclusion_slots = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot", deprecated = true]; // The distance of when validator submitted and got included in the chain, the distance // is mapped 1-to-1 with the request's public keys. // Deprecated: This field can no longer be fetched from the beacon state after the Altair hard fork. - repeated uint64 inclusion_distances = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot", deprecated = true]; + repeated uint64 inclusion_distances = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot", deprecated = true]; // Whether the list of validator recently correctly voted for source at previous epoch, the result // is mapped 1-to-1 with the request's public keys. repeated bool correctly_voted_source = 4; @@ -725,17 +725,17 @@ message ValidatorQueue { // Ordered list of validator indices awaiting activation. 0th item in the list is the // next validator index to be processed. - repeated uint64 activation_validator_indices = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 activation_validator_indices = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Ordered list of validator indices awaiting exit. 0th item in the list is the // next validator index to be processed. - repeated uint64 exit_validator_indices = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 exit_validator_indices = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message ListValidatorAssignmentsRequest { oneof query_filter { // Epoch to validator assignments for. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Whether or not to query for the genesis information. bool genesis = 2; @@ -743,7 +743,7 @@ message ListValidatorAssignmentsRequest { // 48 byte validator public keys to filter assignments for the given epoch. repeated bytes public_keys = 3 [(ethereum.eth.ext.ssz_size) = "?,48"]; // Validator indicies to filter assignments for the given epoch. - repeated uint64 indices = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 indices = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The maximum number of ValidatorAssignments to return in the response. // This field is optional. @@ -761,28 +761,28 @@ message ValidatorAssignments { // they also attest and produce beacon chain blocks. This is a list of validator indices that // are in the same committee as requested validator, everyone in the committee is assigned to the // same slot and same committee. - repeated uint64 beacon_committees = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 beacon_committees = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Committee index represents the committee of validator that's in. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // Beacon chain slot in which the validator must perform its assigned // duty as an attester. - uint64 attester_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 attester_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Beacon chain slots in which the validator must perform its assigned // duty as a proposer. - repeated uint64 proposer_slots = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + repeated uint64 proposer_slots = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 48 byte BLS public key. bytes public_key = 5 [(ethereum.eth.ext.ssz_size) = "48", deprecated = true]; // Validator index in the beacon state. - uint64 validator_index = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } // The epoch for which this set of validator assignments is valid. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; repeated CommitteeAssignment assignments = 2; @@ -800,7 +800,7 @@ message GetValidatorParticipationRequest { option deprecated = true; oneof query_filter { // Epoch to request participation information. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Whether or not to query for the genesis information. bool genesis = 2; @@ -811,7 +811,7 @@ message GetValidatorParticipationRequest { message ValidatorParticipationResponse { option deprecated = true; // Epoch which this message is applicable. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Whether or not epoch has been finalized. bool finalized = 2; @@ -853,26 +853,26 @@ message BeaconConfig { message SubmitSlashingResponse { // Indices of the validators to be slashed by the submitted // proposer/attester slashing object. - repeated uint64 slashed_indices = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 slashed_indices = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message IndividualVotesRequest { // Epoch of the request. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Validator 48 byte BLS public keys to filter validators for the given epoch. repeated bytes public_keys = 2; // Validator indices to filter validators for the given epoch. - repeated uint64 indices = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 indices = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message IndividualVotesRespond { message IndividualVote { // The epoch of the vote status request. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // The public key of the vote status request. bytes public_key = 2; // The validator index of the request. - uint64 validator_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Has the validator been slashed. bool is_slashed = 4; // Is the validator withdrawable. @@ -894,9 +894,9 @@ message IndividualVotesRespond { // The current effective balance of the validator. uint64 current_epoch_effective_balance_gwei = 13; // The slots of when the validator's attestation got included in the block. Only available in phase0. - uint64 inclusion_slot = 14 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot", deprecated = true]; + uint64 inclusion_slot = 14 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot", deprecated = true]; // How many slots have passed until the validator's attestation got included in the block. Only available in phase0. - uint64 inclusion_distance = 15 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot", deprecated = true]; + uint64 inclusion_distance = 15 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot", deprecated = true]; // The inactivity score of the validator tracks validator participation. [New in Altair] uint64 inactivity_score = 16; } diff --git a/proto/prysm/v1alpha1/beacon_state.pb.go b/proto/prysm/v1alpha1/beacon_state.pb.go index 4f547319e1a1..4d731431c73c 100755 --- a/proto/prysm/v1alpha1/beacon_state.pb.go +++ b/proto/prysm/v1alpha1/beacon_state.pb.go @@ -7,15 +7,14 @@ package eth import ( - reflect "reflect" - sync "sync" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -32,7 +31,7 @@ type BeaconState struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -99,11 +98,11 @@ func (x *BeaconState) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconState) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconState) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconState) GetFork() *Fork { @@ -239,7 +238,7 @@ type BeaconStateAltair struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -309,11 +308,11 @@ func (x *BeaconStateAltair) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconStateAltair) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconStateAltair) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconStateAltair) GetFork() *Fork { @@ -470,7 +469,7 @@ type Fork struct { PreviousVersion []byte `protobuf:"bytes,1,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty" ssz-size:"4"` CurrentVersion []byte `protobuf:"bytes,2,opt,name=current_version,json=currentVersion,proto3" json:"current_version,omitempty" ssz-size:"4"` - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *Fork) Reset() { @@ -519,11 +518,11 @@ func (x *Fork) GetCurrentVersion() []byte { return nil } -func (x *Fork) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Fork) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type PendingAttestation struct { @@ -533,8 +532,8 @@ type PendingAttestation struct { AggregationBits github_com_prysmaticlabs_go_bitfield.Bitlist `protobuf:"bytes,1,opt,name=aggregation_bits,json=aggregationBits,proto3" json:"aggregation_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitlist" ssz-max:"2048"` Data *AttestationData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - InclusionDelay github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=inclusion_delay,json=inclusionDelay,proto3" json:"inclusion_delay,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + InclusionDelay github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=inclusion_delay,json=inclusionDelay,proto3" json:"inclusion_delay,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *PendingAttestation) Reset() { @@ -583,18 +582,18 @@ func (x *PendingAttestation) GetData() *AttestationData { return nil } -func (x *PendingAttestation) GetInclusionDelay() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *PendingAttestation) GetInclusionDelay() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.InclusionDelay } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *PendingAttestation) GetProposerIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *PendingAttestation) GetProposerIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ProposerIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type HistoricalBatch struct { @@ -657,7 +656,7 @@ type StateSummary struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Root []byte `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"` } @@ -693,11 +692,11 @@ func (*StateSummary) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_state_proto_rawDescGZIP(), []int{5} } -func (x *StateSummary) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *StateSummary) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *StateSummary) GetRoot() []byte { @@ -1019,7 +1018,7 @@ type SyncAggregatorSelectionData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` SubcommitteeIndex uint64 `protobuf:"varint,2,opt,name=subcommittee_index,json=subcommitteeIndex,proto3" json:"subcommittee_index,omitempty"` } @@ -1055,11 +1054,11 @@ func (*SyncAggregatorSelectionData) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_beacon_state_proto_rawDescGZIP(), []int{11} } -func (x *SyncAggregatorSelectionData) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncAggregatorSelectionData) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncAggregatorSelectionData) GetSubcommitteeIndex() uint64 { @@ -1076,7 +1075,7 @@ type BeaconStateBellatrix struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -1147,11 +1146,11 @@ func (x *BeaconStateBellatrix) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconStateBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconStateBellatrix) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconStateBellatrix) GetFork() *Fork { @@ -1315,7 +1314,7 @@ type BeaconStateCapella struct { GenesisTime uint64 `protobuf:"varint,1001,opt,name=genesis_time,json=genesisTime,proto3" json:"genesis_time,omitempty"` GenesisValidatorsRoot []byte `protobuf:"bytes,1002,opt,name=genesis_validators_root,json=genesisValidatorsRoot,proto3" json:"genesis_validators_root,omitempty" ssz-size:"32"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1003,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Fork *Fork `protobuf:"bytes,1004,opt,name=fork,proto3" json:"fork,omitempty"` LatestBlockHeader *BeaconBlockHeader `protobuf:"bytes,2001,opt,name=latest_block_header,json=latestBlockHeader,proto3" json:"latest_block_header,omitempty"` BlockRoots [][]byte `protobuf:"bytes,2002,rep,name=block_roots,json=blockRoots,proto3" json:"block_roots,omitempty" ssz-size:"8192,32"` @@ -1339,7 +1338,7 @@ type BeaconStateCapella struct { NextSyncCommittee *SyncCommittee `protobuf:"bytes,9003,opt,name=next_sync_committee,json=nextSyncCommittee,proto3" json:"next_sync_committee,omitempty"` LatestExecutionPayloadHeader *v1.ExecutionPayloadHeaderCapella `protobuf:"bytes,10001,opt,name=latest_execution_payload_header,json=latestExecutionPayloadHeader,proto3" json:"latest_execution_payload_header,omitempty"` NextWithdrawalIndex uint64 `protobuf:"varint,11001,opt,name=next_withdrawal_index,json=nextWithdrawalIndex,proto3" json:"next_withdrawal_index,omitempty"` - NextWithdrawalValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,11002,opt,name=next_withdrawal_validator_index,json=nextWithdrawalValidatorIndex,proto3" json:"next_withdrawal_validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + NextWithdrawalValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,11002,opt,name=next_withdrawal_validator_index,json=nextWithdrawalValidatorIndex,proto3" json:"next_withdrawal_validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` HistoricalSummaries []*HistoricalSummary `protobuf:"bytes,11003,rep,name=historical_summaries,json=historicalSummaries,proto3" json:"historical_summaries,omitempty" ssz-max:"16777216"` } @@ -1389,11 +1388,11 @@ func (x *BeaconStateCapella) GetGenesisValidatorsRoot() []byte { return nil } -func (x *BeaconStateCapella) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconStateCapella) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconStateCapella) GetFork() *Fork { @@ -1557,11 +1556,11 @@ func (x *BeaconStateCapella) GetNextWithdrawalIndex() uint64 { return 0 } -func (x *BeaconStateCapella) GetNextWithdrawalValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BeaconStateCapella) GetNextWithdrawalValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.NextWithdrawalValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BeaconStateCapella) GetHistoricalSummaries() []*HistoricalSummary { @@ -1718,7 +1717,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x74, 0x12, 0x5a, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, @@ -1816,7 +1815,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x74, 0x12, 0x5a, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, @@ -1924,7 +1923,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x22, 0x9d, 0x03, 0x0a, 0x12, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, @@ -1942,14 +1941,14 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x76, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x49, @@ -1964,7 +1963,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x61, 0x72, 0x79, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x72, 0x6f, @@ -2014,7 +2013,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2d, 0x0a, 0x12, 0x73, 0x75, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, @@ -2031,7 +2030,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, @@ -2147,7 +2146,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x6f, 0x72, 0x73, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x5a, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x66, 0x6f, 0x72, 0x6b, 0x18, 0xec, 0x07, 0x20, 0x01, @@ -2262,7 +2261,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0xfa, 0x55, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x1c, 0x6e, 0x65, 0x78, 0x74, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x56, 0x61, 0x6c, @@ -2295,7 +2294,7 @@ var file_proto_prysm_v1alpha1_beacon_state_proto_rawDesc = []byte{ 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x10, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0x41, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, diff --git a/proto/prysm/v1alpha1/beacon_state.proto b/proto/prysm/v1alpha1/beacon_state.proto index 394d4dc9fbc1..cc9739809288 100644 --- a/proto/prysm/v1alpha1/beacon_state.proto +++ b/proto/prysm/v1alpha1/beacon_state.proto @@ -9,7 +9,7 @@ import "proto/engine/v1/execution_engine.proto"; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V1Alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "BeaconStateProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -19,7 +19,7 @@ message BeaconState { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; Fork fork = 1004; // History [2001-3000] @@ -61,7 +61,7 @@ message BeaconStateAltair { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; Fork fork = 1004; // History [2001-3000] @@ -105,7 +105,7 @@ message BeaconStateAltair { message Fork { bytes previous_version = 1 [(ethereum.eth.ext.ssz_size) = "4"]; bytes current_version = 2 [(ethereum.eth.ext.ssz_size) = "4"]; - uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } message PendingAttestation { @@ -114,9 +114,9 @@ message PendingAttestation { bytes aggregation_bits = 1 [(ethereum.eth.ext.ssz_max) = "2048", (ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/go-bitfield.Bitlist"]; AttestationData data = 2; // The difference of when attestation gets created and get included on chain. - uint64 inclusion_delay = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 inclusion_delay = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The proposer who included the attestation in the block. - uint64 proposer_index = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 proposer_index = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message HistoricalBatch { @@ -130,7 +130,7 @@ message HistoricalBatch { // and blocks. message StateSummary { // The slot of the state. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The block root of the state. bytes root = 2; } @@ -183,7 +183,7 @@ message SyncCommittee { // SyncAggregatorSelectionData is used to sign over and then check whether the aggregator is selected within a subcommittee. message SyncAggregatorSelectionData { // Slot of this signing data. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Subcommittee index of this signing data. uint64 subcommittee_index = 2; } @@ -192,7 +192,7 @@ message BeaconStateBellatrix { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; Fork fork = 1004; // History [2001-3000] @@ -240,7 +240,7 @@ message BeaconStateCapella { // Versioning [1001-2000] uint64 genesis_time = 1001; bytes genesis_validators_root = 1002 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1003 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; Fork fork = 1004; // History [2001-3000] @@ -285,7 +285,7 @@ message BeaconStateCapella { // Capella fields [11001-12000] uint64 next_withdrawal_index = 11001; // [New in Capella] - uint64 next_withdrawal_validator_index = 11002 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; // [New in Capella] + uint64 next_withdrawal_validator_index = 11002 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // [New in Capella] repeated HistoricalSummary historical_summaries = 11003 [(ethereum.eth.ext.ssz_max) = "16777216"]; // [New in Capella] } diff --git a/proto/prysm/v1alpha1/blobs.pb.go b/proto/prysm/v1alpha1/blobs.pb.go index eb09a671986d..28a27f3187f1 100755 --- a/proto/prysm/v1alpha1/blobs.pb.go +++ b/proto/prysm/v1alpha1/blobs.pb.go @@ -7,14 +7,13 @@ package eth import ( - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -30,7 +29,7 @@ type BlobsSidecar struct { unknownFields protoimpl.UnknownFields BeaconBlockRoot []byte `protobuf:"bytes,1,opt,name=beacon_block_root,json=beaconBlockRoot,proto3" json:"beacon_block_root,omitempty" ssz-size:"32"` - BeaconBlockSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=beacon_block_slot,json=beaconBlockSlot,proto3" json:"beacon_block_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + BeaconBlockSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=beacon_block_slot,json=beaconBlockSlot,proto3" json:"beacon_block_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Blobs []*v1.Blob `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty" ssz-max:"16"` AggregatedProof []byte `protobuf:"bytes,4,opt,name=aggregated_proof,json=aggregatedProof,proto3" json:"aggregated_proof,omitempty" ssz-size:"48"` } @@ -74,11 +73,11 @@ func (x *BlobsSidecar) GetBeaconBlockRoot() []byte { return nil } -func (x *BlobsSidecar) GetBeaconBlockSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlobsSidecar) GetBeaconBlockSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.BeaconBlockSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BlobsSidecar) GetBlobs() []*v1.Blob { @@ -114,7 +113,7 @@ var file_proto_prysm_v1alpha1_blobs_proto_rawDesc = []byte{ 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0f, 0x62, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x36, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x18, @@ -128,7 +127,7 @@ var file_proto_prysm_v1alpha1_blobs_proto_rawDesc = []byte{ 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x0a, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, diff --git a/proto/prysm/v1alpha1/blobs.proto b/proto/prysm/v1alpha1/blobs.proto index 804364958d37..8dcea9a8f105 100644 --- a/proto/prysm/v1alpha1/blobs.proto +++ b/proto/prysm/v1alpha1/blobs.proto @@ -19,7 +19,7 @@ import "proto/eth/ext/options.proto"; import "proto/engine/v1/execution_engine.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "BlobsProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -31,7 +31,7 @@ message BlobsSidecar { // The beacon block root which corresponds to the beacon block. bytes beacon_block_root = 1 [(ethereum.eth.ext.ssz_size) = "32"]; // The beacon block slot which corresponds ot the beacon block. - uint64 beacon_block_slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 beacon_block_slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The blobs itself which contains data to be committed. repeated ethereum.engine.v1.Blob blobs = 3 [(ethereum.eth.ext.ssz_max) = "16"]; // The aggregated proof for blobs and commitments for validation. diff --git a/proto/prysm/v1alpha1/cloners.go b/proto/prysm/v1alpha1/cloners.go index a586a4c072cf..590bf67be96f 100644 --- a/proto/prysm/v1alpha1/cloners.go +++ b/proto/prysm/v1alpha1/cloners.go @@ -1,8 +1,8 @@ package eth import ( - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" ) // CopyETH1Data copies the provided eth1data object. diff --git a/proto/prysm/v1alpha1/cloners_test.go b/proto/prysm/v1alpha1/cloners_test.go index d833cddb00b1..c692b9afda76 100644 --- a/proto/prysm/v1alpha1/cloners_test.go +++ b/proto/prysm/v1alpha1/cloners_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestCopyETH1Data(t *testing.T) { diff --git a/proto/prysm/v1alpha1/debug.pb.go b/proto/prysm/v1alpha1/debug.pb.go index 63daffdf11d7..28e133cb2a4c 100755 --- a/proto/prysm/v1alpha1/debug.pb.go +++ b/proto/prysm/v1alpha1/debug.pb.go @@ -8,18 +8,17 @@ package eth import ( context "context" - reflect "reflect" - sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -84,7 +83,7 @@ type InclusionSlotRequest struct { unknownFields protoimpl.UnknownFields Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *InclusionSlotRequest) Reset() { @@ -126,11 +125,11 @@ func (x *InclusionSlotRequest) GetId() uint64 { return 0 } -func (x *InclusionSlotRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *InclusionSlotRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type InclusionSlotResponse struct { @@ -138,7 +137,7 @@ type InclusionSlotResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *InclusionSlotResponse) Reset() { @@ -173,11 +172,11 @@ func (*InclusionSlotResponse) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_debug_proto_rawDescGZIP(), []int{1} } -func (x *InclusionSlotResponse) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *InclusionSlotResponse) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type BeaconStateRequest struct { @@ -231,11 +230,11 @@ func (m *BeaconStateRequest) GetQueryFilter() isBeaconStateRequest_QueryFilter { return nil } -func (x *BeaconStateRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconStateRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x, ok := x.GetQueryFilter().(*BeaconStateRequest_Slot); ok { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconStateRequest) GetBlockRoot() []byte { @@ -250,7 +249,7 @@ type isBeaconStateRequest_QueryFilter interface { } type BeaconStateRequest_Slot struct { - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } type BeaconStateRequest_BlockRoot struct { @@ -843,21 +842,21 @@ var file_proto_prysm_v1alpha1_debug_proto_rawDesc = []byte{ 0x52, 0x02, 0x69, 0x64, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0x72, 0x0a, 0x15, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0xa2, 0x01, 0x0a, 0x12, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5b, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x1f, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, @@ -1033,7 +1032,7 @@ var file_proto_prysm_v1alpha1_debug_proto_rawDesc = []byte{ 0x68, 0x61, 0x31, 0x42, 0x0a, 0x44, 0x65, 0x62, 0x75, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, diff --git a/proto/prysm/v1alpha1/debug.pb.gw.go b/proto/prysm/v1alpha1/debug.pb.gw.go index afdf35c18f88..80804288085b 100755 --- a/proto/prysm/v1alpha1/debug.pb.gw.go +++ b/proto/prysm/v1alpha1/debug.pb.gw.go @@ -10,20 +10,19 @@ package eth import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/debug.proto b/proto/prysm/v1alpha1/debug.proto index 78f4252d7c71..9e6aa77aa9b3 100644 --- a/proto/prysm/v1alpha1/debug.proto +++ b/proto/prysm/v1alpha1/debug.proto @@ -9,7 +9,7 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; option csharp_namespace = "Ethereum.Eth.V1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "DebugProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -64,17 +64,17 @@ service Debug { message InclusionSlotRequest { uint64 id = 1; - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message InclusionSlotResponse { - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message BeaconStateRequest { oneof query_filter { // The slot corresponding to a desired beacon state. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The block root corresponding to a desired beacon state. bytes block_root = 2; diff --git a/proto/prysm/v1alpha1/finalized_block_root_container.pb.go b/proto/prysm/v1alpha1/finalized_block_root_container.pb.go index 20f04f5fb88c..f4dfb0cc8ef7 100755 --- a/proto/prysm/v1alpha1/finalized_block_root_container.pb.go +++ b/proto/prysm/v1alpha1/finalized_block_root_container.pb.go @@ -7,11 +7,10 @@ package eth import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -96,7 +95,7 @@ var file_proto_prysm_v1alpha1_finalized_block_root_container_proto_rawDesc = []b 0x6f, 0x6f, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, diff --git a/proto/prysm/v1alpha1/finalized_block_root_container.proto b/proto/prysm/v1alpha1/finalized_block_root_container.proto index a424af6f5cda..df5c0c98cbe1 100644 --- a/proto/prysm/v1alpha1/finalized_block_root_container.proto +++ b/proto/prysm/v1alpha1/finalized_block_root_container.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package ethereum.eth.v1alpha1; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "FinalizedBlockRootContainerProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go index d5ffbe223fdf..4912fecd5725 100644 --- a/proto/prysm/v1alpha1/generated.ssz.go +++ b/proto/prysm/v1alpha1/generated.ssz.go @@ -1,11 +1,11 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 7e32b259c438fd7514a400a345ba5c1bbdaf7dfb681c2608a94431700f2d606e +// Hash: da030c0ebc8b54fe7980b6bbe6d6795c74bab4f92ca977b2bc1c6d4fcf4ed25f package eth import ( ssz "github.com/prysmaticlabs/fastssz" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" ) // MarshalSSZ ssz marshals the Attestation object @@ -188,7 +188,7 @@ func (a *AggregateAttestationAndProof) UnmarshalSSZ(buf []byte) error { var o1 uint64 // Field (0) 'AggregatorIndex' - a.AggregatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) + a.AggregatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) // Offset (1) 'Aggregate' if o1 = ssz.ReadOffset(buf[8:12]); o1 > size { @@ -426,10 +426,10 @@ func (a *AttestationData) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - a.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + a.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'CommitteeIndex' - a.CommitteeIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(ssz.UnmarshallUint64(buf[8:16])) + a.CommitteeIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'BeaconBlockRoot' if cap(a.BeaconBlockRoot) == 0 { @@ -533,7 +533,7 @@ func (c *Checkpoint) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Epoch' - c.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) + c.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'Root' if cap(c.Root) == 0 { @@ -634,10 +634,10 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -898,10 +898,10 @@ func (b *BeaconBlockAltair) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -2392,10 +2392,10 @@ func (v *VoluntaryExit) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Epoch' - v.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) + v.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ValidatorIndex' - v.ValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + v.ValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) return err } @@ -2659,10 +2659,10 @@ func (b *BeaconBlockHeader) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -3227,10 +3227,10 @@ func (b *BeaconBlockBellatrix) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -4005,10 +4005,10 @@ func (b *BlindedBeaconBlockBellatrix) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -4783,10 +4783,10 @@ func (b *BeaconBlockCapella) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -5622,10 +5622,10 @@ func (b *BlindedBeaconBlockCapella) UnmarshalSSZ(buf []byte) error { var o4 uint64 // Field (0) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'ProposerIndex' - b.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) + b.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[8:16])) // Field (2) 'ParentRoot' if cap(b.ParentRoot) == 0 { @@ -7126,7 +7126,7 @@ func (b *BeaconState) UnmarshalSSZ(buf []byte) error { b.GenesisValidatorsRoot = append(b.GenesisValidatorsRoot, buf[8:40]...) // Field (2) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) // Field (3) 'Fork' if b.Fork == nil { @@ -7935,7 +7935,7 @@ func (b *BeaconStateAltair) UnmarshalSSZ(buf []byte) error { b.GenesisValidatorsRoot = append(b.GenesisValidatorsRoot, buf[8:40]...) // Field (2) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) // Field (3) 'Fork' if b.Fork == nil { @@ -8563,7 +8563,7 @@ func (f *Fork) UnmarshalSSZ(buf []byte) error { f.CurrentVersion = append(f.CurrentVersion, buf[4:8]...) // Field (2) 'Epoch' - f.Epoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[8:16])) + f.Epoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[8:16])) return err } @@ -8675,10 +8675,10 @@ func (p *PendingAttestation) UnmarshalSSZ(buf []byte) error { } // Field (2) 'InclusionDelay' - p.InclusionDelay = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[132:140])) + p.InclusionDelay = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[132:140])) // Field (3) 'ProposerIndex' - p.ProposerIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[140:148])) + p.ProposerIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[140:148])) // Field (0) 'AggregationBits' { @@ -9277,7 +9277,7 @@ func (s *SyncAggregatorSelectionData) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - s.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + s.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'SubcommitteeIndex' s.SubcommitteeIndex = ssz.UnmarshallUint64(buf[8:16]) @@ -9590,7 +9590,7 @@ func (b *BeaconStateBellatrix) UnmarshalSSZ(buf []byte) error { b.GenesisValidatorsRoot = append(b.GenesisValidatorsRoot, buf[8:40]...) // Field (2) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) // Field (3) 'Fork' if b.Fork == nil { @@ -10492,7 +10492,7 @@ func (b *BeaconStateCapella) UnmarshalSSZ(buf []byte) error { b.GenesisValidatorsRoot = append(b.GenesisValidatorsRoot, buf[8:40]...) // Field (2) 'Slot' - b.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) + b.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[40:48])) // Field (3) 'Fork' if b.Fork == nil { @@ -10648,7 +10648,7 @@ func (b *BeaconStateCapella) UnmarshalSSZ(buf []byte) error { b.NextWithdrawalIndex = ssz.UnmarshallUint64(buf[2736633:2736641]) // Field (26) 'NextWithdrawalValidatorIndex' - b.NextWithdrawalValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[2736641:2736649])) + b.NextWithdrawalValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[2736641:2736649])) // Offset (27) 'HistoricalSummaries' if o27 = ssz.ReadOffset(buf[2736649:2736653]); o27 > size || o24 > o27 { @@ -11407,7 +11407,7 @@ func (s *Status) UnmarshalSSZ(buf []byte) error { s.FinalizedRoot = append(s.FinalizedRoot, buf[4:36]...) // Field (2) 'FinalizedEpoch' - s.FinalizedEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[36:44])) + s.FinalizedEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[36:44])) // Field (3) 'HeadRoot' if cap(s.HeadRoot) == 0 { @@ -11416,7 +11416,7 @@ func (s *Status) UnmarshalSSZ(buf []byte) error { s.HeadRoot = append(s.HeadRoot, buf[44:76]...) // Field (4) 'HeadSlot' - s.HeadSlot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[76:84])) + s.HeadSlot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[76:84])) return err } @@ -11501,7 +11501,7 @@ func (b *BeaconBlocksByRangeRequest) UnmarshalSSZ(buf []byte) error { } // Field (0) 'StartSlot' - b.StartSlot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + b.StartSlot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'Count' b.Count = ssz.UnmarshallUint64(buf[8:16]) @@ -11594,7 +11594,7 @@ func (e *ENRForkID) UnmarshalSSZ(buf []byte) error { e.NextForkVersion = append(e.NextForkVersion, buf[4:8]...) // Field (2) 'NextForkEpoch' - e.NextForkEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[8:16])) + e.NextForkEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[8:16])) return err } @@ -11850,7 +11850,7 @@ func (s *SyncCommitteeMessage) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - s.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + s.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'BlockRoot' if cap(s.BlockRoot) == 0 { @@ -11859,7 +11859,7 @@ func (s *SyncCommitteeMessage) UnmarshalSSZ(buf []byte) error { s.BlockRoot = append(s.BlockRoot, buf[8:40]...) // Field (2) 'ValidatorIndex' - s.ValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[40:48])) + s.ValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[40:48])) // Field (3) 'Signature' if cap(s.Signature) == 0 { @@ -11961,7 +11961,7 @@ func (s *SyncCommitteeContribution) UnmarshalSSZ(buf []byte) error { } // Field (0) 'Slot' - s.Slot = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) + s.Slot = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'BlockRoot' if cap(s.BlockRoot) == 0 { @@ -12076,7 +12076,7 @@ func (c *ContributionAndProof) UnmarshalSSZ(buf []byte) error { } // Field (0) 'AggregatorIndex' - c.AggregatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) + c.AggregatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'Contribution' if c.Contribution == nil { @@ -12291,16 +12291,16 @@ func (v *Validator) UnmarshalSSZ(buf []byte) error { v.Slashed = ssz.UnmarshalBool(buf[88:89]) // Field (4) 'ActivationEligibilityEpoch' - v.ActivationEligibilityEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[89:97])) + v.ActivationEligibilityEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[89:97])) // Field (5) 'ActivationEpoch' - v.ActivationEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[97:105])) + v.ActivationEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[97:105])) // Field (6) 'ExitEpoch' - v.ExitEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[105:113])) + v.ExitEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[105:113])) // Field (7) 'WithdrawableEpoch' - v.WithdrawableEpoch = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[113:121])) + v.WithdrawableEpoch = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(ssz.UnmarshallUint64(buf[113:121])) return err } @@ -12398,7 +12398,7 @@ func (b *BLSToExecutionChange) UnmarshalSSZ(buf []byte) error { } // Field (0) 'ValidatorIndex' - b.ValidatorIndex = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) + b.ValidatorIndex = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(ssz.UnmarshallUint64(buf[0:8])) // Field (1) 'FromBlsPubkey' if cap(b.FromBlsPubkey) == 0 { diff --git a/proto/prysm/v1alpha1/health.pb.go b/proto/prysm/v1alpha1/health.pb.go index b7c04a3ac7f0..563791f185ea 100755 --- a/proto/prysm/v1alpha1/health.pb.go +++ b/proto/prysm/v1alpha1/health.pb.go @@ -8,9 +8,6 @@ package eth import ( context "context" - reflect "reflect" - sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -18,6 +15,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -101,7 +100,7 @@ var file_proto_prysm_v1alpha1_health_proto_rawDesc = []byte{ 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x0b, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, diff --git a/proto/prysm/v1alpha1/health.pb.gw.go b/proto/prysm/v1alpha1/health.pb.gw.go index b551228c022e..b7daf3ff229f 100755 --- a/proto/prysm/v1alpha1/health.pb.gw.go +++ b/proto/prysm/v1alpha1/health.pb.gw.go @@ -10,20 +10,19 @@ package eth import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/health.proto b/proto/prysm/v1alpha1/health.proto index 1beb96a29cfc..f2ba1c9ea7bf 100644 --- a/proto/prysm/v1alpha1/health.proto +++ b/proto/prysm/v1alpha1/health.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; option csharp_namespace = "Ethereum.Eth.V1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "HealthProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/prysm/v1alpha1/metadata/BUILD.bazel b/proto/prysm/v1alpha1/metadata/BUILD.bazel index e09d81098e26..516f55a5bbb7 100644 --- a/proto/prysm/v1alpha1/metadata/BUILD.bazel +++ b/proto/prysm/v1alpha1/metadata/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["metadata_interfaces.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/metadata", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/metadata", visibility = ["//visibility:public"], deps = [ "//proto/prysm/v1alpha1:go_default_library", diff --git a/proto/prysm/v1alpha1/metadata/metadata_interfaces.go b/proto/prysm/v1alpha1/metadata/metadata_interfaces.go index ec6527b89d28..d89617bbb140 100644 --- a/proto/prysm/v1alpha1/metadata/metadata_interfaces.go +++ b/proto/prysm/v1alpha1/metadata/metadata_interfaces.go @@ -3,7 +3,7 @@ package metadata import ( ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // Metadata returns the interface of a p2p metadata type. diff --git a/proto/prysm/v1alpha1/node.pb.go b/proto/prysm/v1alpha1/node.pb.go index e6ef848e12b8..0c2197ed3627 100755 --- a/proto/prysm/v1alpha1/node.pb.go +++ b/proto/prysm/v1alpha1/node.pb.go @@ -8,18 +8,17 @@ package eth import ( context "context" - reflect "reflect" - sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" timestamp "github.com/golang/protobuf/ptypes/timestamp" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -794,7 +793,7 @@ var file_proto_prysm_v1alpha1_node_proto_rawDesc = []byte{ 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, - 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, diff --git a/proto/prysm/v1alpha1/node.pb.gw.go b/proto/prysm/v1alpha1/node.pb.gw.go index 04980a7b2616..c91c4d08f4e1 100755 --- a/proto/prysm/v1alpha1/node.pb.gw.go +++ b/proto/prysm/v1alpha1/node.pb.gw.go @@ -10,20 +10,19 @@ package eth import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/node.proto b/proto/prysm/v1alpha1/node.proto index 0925d4b966b6..92e3c47ba3ee 100644 --- a/proto/prysm/v1alpha1/node.proto +++ b/proto/prysm/v1alpha1/node.proto @@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto"; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "NodeProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/prysm/v1alpha1/p2p_messages.pb.go b/proto/prysm/v1alpha1/p2p_messages.pb.go index f0aa3758a177..b1ddbb3e631b 100755 --- a/proto/prysm/v1alpha1/p2p_messages.pb.go +++ b/proto/prysm/v1alpha1/p2p_messages.pb.go @@ -7,15 +7,14 @@ package eth import ( - reflect "reflect" - sync "sync" - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -32,9 +31,9 @@ type Status struct { ForkDigest []byte `protobuf:"bytes,1,opt,name=fork_digest,json=forkDigest,proto3" json:"fork_digest,omitempty" ssz-size:"4"` FinalizedRoot []byte `protobuf:"bytes,2,opt,name=finalized_root,json=finalizedRoot,proto3" json:"finalized_root,omitempty" ssz-size:"32"` - FinalizedEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=finalized_epoch,json=finalizedEpoch,proto3" json:"finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + FinalizedEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=finalized_epoch,json=finalizedEpoch,proto3" json:"finalized_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` HeadRoot []byte `protobuf:"bytes,4,opt,name=head_root,json=headRoot,proto3" json:"head_root,omitempty" ssz-size:"32"` - HeadSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,5,opt,name=head_slot,json=headSlot,proto3" json:"head_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + HeadSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,5,opt,name=head_slot,json=headSlot,proto3" json:"head_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *Status) Reset() { @@ -83,11 +82,11 @@ func (x *Status) GetFinalizedRoot() []byte { return nil } -func (x *Status) GetFinalizedEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Status) GetFinalizedEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.FinalizedEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *Status) GetHeadRoot() []byte { @@ -97,11 +96,11 @@ func (x *Status) GetHeadRoot() []byte { return nil } -func (x *Status) GetHeadSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *Status) GetHeadSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.HeadSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type BeaconBlocksByRangeRequest struct { @@ -109,7 +108,7 @@ type BeaconBlocksByRangeRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - StartSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=start_slot,json=startSlot,proto3" json:"start_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + StartSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=start_slot,json=startSlot,proto3" json:"start_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` Count uint64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` Step uint64 `protobuf:"varint,3,opt,name=step,proto3" json:"step,omitempty"` } @@ -146,11 +145,11 @@ func (*BeaconBlocksByRangeRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_p2p_messages_proto_rawDescGZIP(), []int{1} } -func (x *BeaconBlocksByRangeRequest) GetStartSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BeaconBlocksByRangeRequest) GetStartSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.StartSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BeaconBlocksByRangeRequest) GetCount() uint64 { @@ -174,7 +173,7 @@ type ENRForkID struct { CurrentForkDigest []byte `protobuf:"bytes,1,opt,name=current_fork_digest,json=currentForkDigest,proto3" json:"current_fork_digest,omitempty" ssz-size:"4"` NextForkVersion []byte `protobuf:"bytes,2,opt,name=next_fork_version,json=nextForkVersion,proto3" json:"next_fork_version,omitempty" ssz-size:"4"` - NextForkEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=next_fork_epoch,json=nextForkEpoch,proto3" json:"next_fork_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + NextForkEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=next_fork_epoch,json=nextForkEpoch,proto3" json:"next_fork_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *ENRForkID) Reset() { @@ -223,11 +222,11 @@ func (x *ENRForkID) GetNextForkVersion() []byte { return nil } -func (x *ENRForkID) GetNextForkEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ENRForkID) GetNextForkEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.NextForkEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type MetaDataV0 struct { @@ -369,7 +368,7 @@ var file_proto_prysm_v1alpha1_p2p_messages_proto_rawDesc = []byte{ 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x23, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, @@ -378,7 +377,7 @@ var file_proto_prysm_v1alpha1_p2p_messages_proto_rawDesc = []byte{ 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x08, 0x68, 0x65, 0x61, 0x64, 0x53, 0x6c, 0x6f, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x1a, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x42, 0x79, 0x52, 0x61, @@ -386,7 +385,7 @@ var file_proto_prysm_v1alpha1_p2p_messages_proto_rawDesc = []byte{ 0x61, 0x72, 0x74, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, @@ -403,7 +402,7 @@ var file_proto_prysm_v1alpha1_p2p_messages_proto_rawDesc = []byte{ 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0d, 0x6e, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6b, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x22, 0x80, 0x01, 0x0a, 0x0a, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x56, @@ -433,7 +432,7 @@ var file_proto_prysm_v1alpha1_p2p_messages_proto_rawDesc = []byte{ 0x50, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, + 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, diff --git a/proto/prysm/v1alpha1/p2p_messages.proto b/proto/prysm/v1alpha1/p2p_messages.proto index 84c6146783e7..3844d2939b23 100644 --- a/proto/prysm/v1alpha1/p2p_messages.proto +++ b/proto/prysm/v1alpha1/p2p_messages.proto @@ -6,7 +6,7 @@ import "google/protobuf/descriptor.proto"; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "P2PMessagesProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -15,13 +15,13 @@ option php_namespace = "Ethereum\\Eth\\v1alpha1"; message Status { bytes fork_digest = 1 [(ethereum.eth.ext.ssz_size) = "4"]; bytes finalized_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 finalized_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 finalized_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; bytes head_root = 4 [(ethereum.eth.ext.ssz_size) = "32"]; - uint64 head_slot = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 head_slot = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message BeaconBlocksByRangeRequest { - uint64 start_slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 start_slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; uint64 count = 2; uint64 step = 3; } @@ -29,7 +29,7 @@ message BeaconBlocksByRangeRequest { message ENRForkID { bytes current_fork_digest = 1 [(ethereum.eth.ext.ssz_size) = "4"]; bytes next_fork_version = 2 [(ethereum.eth.ext.ssz_size) = "4"]; - uint64 next_fork_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 next_fork_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } /* Spec Definition: diff --git a/proto/prysm/v1alpha1/powchain.pb.go b/proto/prysm/v1alpha1/powchain.pb.go index 46cc686e35d5..9d8c309bc099 100755 --- a/proto/prysm/v1alpha1/powchain.pb.go +++ b/proto/prysm/v1alpha1/powchain.pb.go @@ -7,11 +7,10 @@ package eth import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -522,7 +521,7 @@ var file_proto_prysm_v1alpha1_powchain_proto_rawDesc = []byte{ 0x70, 0x68, 0x61, 0x31, 0x42, 0x0d, 0x50, 0x6f, 0x77, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, diff --git a/proto/prysm/v1alpha1/powchain.proto b/proto/prysm/v1alpha1/powchain.proto index db7217e8a709..0bf3a5a210db 100644 --- a/proto/prysm/v1alpha1/powchain.proto +++ b/proto/prysm/v1alpha1/powchain.proto @@ -6,7 +6,7 @@ import "proto/prysm/v1alpha1/beacon_block.proto"; import "proto/prysm/v1alpha1/beacon_state.proto"; option csharp_namespace = "Ethereum.Eth.V1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "PowchainProto"; option java_package = "org.ethereum.eth.v1alpha1"; diff --git a/proto/prysm/v1alpha1/slasher.pb.go b/proto/prysm/v1alpha1/slasher.pb.go index 91e3e19e3413..d834c4a994fe 100755 --- a/proto/prysm/v1alpha1/slasher.pb.go +++ b/proto/prysm/v1alpha1/slasher.pb.go @@ -8,17 +8,16 @@ package eth import ( context "context" - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -222,8 +221,8 @@ type HighestAttestation struct { unknownFields protoimpl.UnknownFields ValidatorIndex uint64 `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty"` - HighestSourceEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=highest_source_epoch,json=highestSourceEpoch,proto3" json:"highest_source_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - HighestTargetEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=highest_target_epoch,json=highestTargetEpoch,proto3" json:"highest_target_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + HighestSourceEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,2,opt,name=highest_source_epoch,json=highestSourceEpoch,proto3" json:"highest_source_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + HighestTargetEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=highest_target_epoch,json=highestTargetEpoch,proto3" json:"highest_target_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *HighestAttestation) Reset() { @@ -265,18 +264,18 @@ func (x *HighestAttestation) GetValidatorIndex() uint64 { return 0 } -func (x *HighestAttestation) GetHighestSourceEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *HighestAttestation) GetHighestSourceEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.HighestSourceEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *HighestAttestation) GetHighestTargetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *HighestAttestation) GetHighestTargetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.HighestTargetEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } var File_proto_prysm_v1alpha1_slasher_proto protoreflect.FileDescriptor @@ -326,14 +325,14 @@ var file_proto_prysm_v1alpha1_slasher_proto_rawDesc = []byte{ 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x12, 0x68, 0x69, 0x67, 0x68, 0x65, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x78, 0x0a, 0x14, 0x68, 0x69, 0x67, 0x68, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x12, 0x68, 0x69, 0x67, 0x68, 0x65, 0x73, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x45, 0x70, 0x6f, @@ -375,7 +374,7 @@ var file_proto_prysm_v1alpha1_slasher_proto_rawDesc = []byte{ 0x68, 0x61, 0x31, 0x42, 0x0c, 0x53, 0x6c, 0x61, 0x73, 0x68, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, diff --git a/proto/prysm/v1alpha1/slasher.pb.gw.go b/proto/prysm/v1alpha1/slasher.pb.gw.go index ec8350530384..465fe4f8c3ad 100755 --- a/proto/prysm/v1alpha1/slasher.pb.gw.go +++ b/proto/prysm/v1alpha1/slasher.pb.gw.go @@ -10,20 +10,19 @@ package eth import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/slasher.proto b/proto/prysm/v1alpha1/slasher.proto index d9901cb01af4..b668379b7863 100644 --- a/proto/prysm/v1alpha1/slasher.proto +++ b/proto/prysm/v1alpha1/slasher.proto @@ -21,7 +21,7 @@ import "proto/prysm/v1alpha1/beacon_block.proto"; import "google/api/annotations.proto"; option csharp_namespace = "Ethereum.Eth.V1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "SlasherProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -77,8 +77,8 @@ message HighestAttestation { uint64 validator_index = 1; uint64 highest_source_epoch = 2 [ (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch" ]; + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch" ]; uint64 highest_target_epoch = 3 [ (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch" ]; + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch" ]; } diff --git a/proto/prysm/v1alpha1/slashings/BUILD.bazel b/proto/prysm/v1alpha1/slashings/BUILD.bazel index 997e17f3dee6..18a8f8ce0ade 100644 --- a/proto/prysm/v1alpha1/slashings/BUILD.bazel +++ b/proto/prysm/v1alpha1/slashings/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "double_votes.go", "surround_votes.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/slashings", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/slashings", visibility = ["//visibility:public"], deps = [ "//config/params:go_default_library", diff --git a/proto/prysm/v1alpha1/slashings/double_votes.go b/proto/prysm/v1alpha1/slashings/double_votes.go index dcc23e69c13c..30c3b018b0bb 100644 --- a/proto/prysm/v1alpha1/slashings/double_votes.go +++ b/proto/prysm/v1alpha1/slashings/double_votes.go @@ -1,6 +1,6 @@ package slashings -import "github.com/prysmaticlabs/prysm/v3/config/params" +import "github.com/prysmaticlabs/prysm/v4/config/params" // SigningRootsDiffer verifies that an incoming vs. existing attestation has a different signing root. // If the existing signing root is empty, then we consider an attestation as different always. diff --git a/proto/prysm/v1alpha1/slashings/double_votes_test.go b/proto/prysm/v1alpha1/slashings/double_votes_test.go index 179058eee472..57769571de33 100644 --- a/proto/prysm/v1alpha1/slashings/double_votes_test.go +++ b/proto/prysm/v1alpha1/slashings/double_votes_test.go @@ -3,7 +3,7 @@ package slashings import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func TestSigningRootsDiffer(t *testing.T) { diff --git a/proto/prysm/v1alpha1/slashings/surround_votes.go b/proto/prysm/v1alpha1/slashings/surround_votes.go index 7a6e6a0ec713..d08805b5175b 100644 --- a/proto/prysm/v1alpha1/slashings/surround_votes.go +++ b/proto/prysm/v1alpha1/slashings/surround_votes.go @@ -1,6 +1,6 @@ package slashings -import ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" +import ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" // IsSurround checks if an attestation, a, is surrounding // another one, b, based on the Ethereum slashing conditions specified diff --git a/proto/prysm/v1alpha1/slashings/surround_votes_test.go b/proto/prysm/v1alpha1/slashings/surround_votes_test.go index b005940620a8..3dd7643d9a11 100644 --- a/proto/prysm/v1alpha1/slashings/surround_votes_test.go +++ b/proto/prysm/v1alpha1/slashings/surround_votes_test.go @@ -3,8 +3,8 @@ package slashings import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func TestIsSurround(t *testing.T) { diff --git a/proto/prysm/v1alpha1/swagger.proto b/proto/prysm/v1alpha1/swagger.proto index e7af4f8f8024..15aac378f3ec 100644 --- a/proto/prysm/v1alpha1/swagger.proto +++ b/proto/prysm/v1alpha1/swagger.proto @@ -20,7 +20,7 @@ package ethereum.eth.v1alpha1; import "protoc-gen-openapiv2/options/annotations.proto"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { diff --git a/proto/prysm/v1alpha1/sync_committee.pb.go b/proto/prysm/v1alpha1/sync_committee.pb.go index dfd8048c4dab..adb4d79c37ff 100755 --- a/proto/prysm/v1alpha1/sync_committee.pb.go +++ b/proto/prysm/v1alpha1/sync_committee.pb.go @@ -7,14 +7,13 @@ package eth import ( - reflect "reflect" - sync "sync" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -29,9 +28,9 @@ type SyncCommitteeMessage struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` BlockRoot []byte `protobuf:"bytes,2,opt,name=block_root,json=blockRoot,proto3" json:"block_root,omitempty" ssz-size:"32"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty" ssz-size:"96"` } @@ -67,11 +66,11 @@ func (*SyncCommitteeMessage) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_sync_committee_proto_rawDescGZIP(), []int{0} } -func (x *SyncCommitteeMessage) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncCommitteeMessage) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncCommitteeMessage) GetBlockRoot() []byte { @@ -81,11 +80,11 @@ func (x *SyncCommitteeMessage) GetBlockRoot() []byte { return nil } -func (x *SyncCommitteeMessage) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *SyncCommitteeMessage) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *SyncCommitteeMessage) GetSignature() []byte { @@ -100,7 +99,7 @@ type SyncCommitteeContribution struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` BlockRoot []byte `protobuf:"bytes,2,opt,name=block_root,json=blockRoot,proto3" json:"block_root,omitempty" ssz-size:"32"` SubcommitteeIndex uint64 `protobuf:"varint,3,opt,name=subcommittee_index,json=subcommitteeIndex,proto3" json:"subcommittee_index,omitempty"` AggregationBits github_com_prysmaticlabs_go_bitfield.Bitvector128 `protobuf:"bytes,4,opt,name=aggregation_bits,json=aggregationBits,proto3" json:"aggregation_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector128" ssz-size:"16"` @@ -139,11 +138,11 @@ func (*SyncCommitteeContribution) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_sync_committee_proto_rawDescGZIP(), []int{1} } -func (x *SyncCommitteeContribution) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncCommitteeContribution) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncCommitteeContribution) GetBlockRoot() []byte { @@ -179,7 +178,7 @@ type ContributionAndProof struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AggregatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + AggregatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=aggregator_index,json=aggregatorIndex,proto3" json:"aggregator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` Contribution *SyncCommitteeContribution `protobuf:"bytes,2,opt,name=contribution,proto3" json:"contribution,omitempty"` SelectionProof []byte `protobuf:"bytes,3,opt,name=selection_proof,json=selectionProof,proto3" json:"selection_proof,omitempty" ssz-size:"96"` } @@ -216,11 +215,11 @@ func (*ContributionAndProof) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_sync_committee_proto_rawDescGZIP(), []int{2} } -func (x *ContributionAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ContributionAndProof) GetAggregatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.AggregatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *ContributionAndProof) GetContribution() *SyncCommitteeContribution { @@ -305,7 +304,7 @@ var file_proto_prysm_v1alpha1_sync_committee_proto_rawDesc = []byte{ 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, @@ -314,7 +313,7 @@ var file_proto_prysm_v1alpha1_sync_committee_proto_rawDesc = []byte{ 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, @@ -325,7 +324,7 @@ var file_proto_prysm_v1alpha1_sync_committee_proto_rawDesc = []byte{ 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6f, 0x6f, @@ -348,7 +347,7 @@ var file_proto_prysm_v1alpha1_sync_committee_proto_rawDesc = []byte{ 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x54, 0x0a, 0x0c, @@ -374,7 +373,7 @@ var file_proto_prysm_v1alpha1_sync_committee_proto_rawDesc = []byte{ 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, 0x68, diff --git a/proto/prysm/v1alpha1/sync_committee.proto b/proto/prysm/v1alpha1/sync_committee.proto index a45a49e47ded..b613f4239d28 100644 --- a/proto/prysm/v1alpha1/sync_committee.proto +++ b/proto/prysm/v1alpha1/sync_committee.proto @@ -18,7 +18,7 @@ package ethereum.eth.v1alpha1; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "SyncCommitteeProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -27,13 +27,13 @@ option php_namespace = "Ethereum\\Eth\\v1alpha1"; // Sync committee object to support light client. message SyncCommitteeMessage { // Slot to which this contribution pertains. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 32 byte block root for this signature. bytes block_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; // Index of the validator that produced this signature. - uint64 validator_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Signature by the validator over the block root of `slot`. bytes signature = 4 [(ethereum.eth.ext.ssz_size) = "96"]; @@ -42,7 +42,7 @@ message SyncCommitteeMessage { // Aggregated sync committee object to support light client. message SyncCommitteeContribution { // Slot to which this contribution pertains. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 32 byte block root for this signature. bytes block_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; @@ -60,7 +60,7 @@ message SyncCommitteeContribution { // Aggregated sync committee signature object with selection proof to support light client. message ContributionAndProof { // Index of the aggregator that produced this proof. - uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 aggregator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; SyncCommitteeContribution contribution = 2; diff --git a/proto/prysm/v1alpha1/validator-client/BUILD.bazel b/proto/prysm/v1alpha1/validator-client/BUILD.bazel index 9dc699bbe9f0..52cf3f598c69 100644 --- a/proto/prysm/v1alpha1/validator-client/BUILD.bazel +++ b/proto/prysm/v1alpha1/validator-client/BUILD.bazel @@ -40,7 +40,7 @@ go_proto_library( compilers = [ "@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast_grpc", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client", proto = ":proto", visibility = ["//visibility:public"], deps = [ @@ -66,7 +66,7 @@ go_proto_library( "@com_github_grpc_ecosystem_grpc_gateway_v2//protoc-gen-grpc-gateway:go_gen_grpc_gateway", ], embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client", protos = [":proto"], visibility = ["//visibility:private"], deps = [ @@ -89,7 +89,7 @@ go_library( embed = [ ":go_grpc_gateway_library", ], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client", visibility = ["//visibility:public"], deps = [ "//proto/eth/ext:go_default_library", diff --git a/proto/prysm/v1alpha1/validator-client/keymanager.pb.go b/proto/prysm/v1alpha1/validator-client/keymanager.pb.go index ab2a1340cab6..fd81d77ba602 100755 --- a/proto/prysm/v1alpha1/validator-client/keymanager.pb.go +++ b/proto/prysm/v1alpha1/validator-client/keymanager.pb.go @@ -8,19 +8,18 @@ package validatorpb import ( context "context" - reflect "reflect" - sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -155,7 +154,7 @@ type SignRequest struct { // *SignRequest_BlockCapella // *SignRequest_BlindedBlockCapella Object isSignRequest_Object `protobuf_oneof:"object"` - SigningSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,6,opt,name=signing_slot,json=signingSlot,proto3" json:"signing_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + SigningSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,6,opt,name=signing_slot,json=signingSlot,proto3" json:"signing_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *SignRequest) Reset() { @@ -246,18 +245,18 @@ func (x *SignRequest) GetExit() *v1alpha1.VoluntaryExit { return nil } -func (x *SignRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SignRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x, ok := x.GetObject().(*SignRequest_Slot); ok { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *SignRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *SignRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x, ok := x.GetObject().(*SignRequest_Epoch); ok { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *SignRequest) GetBlockAltair() *v1alpha1.BeaconBlockAltair { @@ -323,11 +322,11 @@ func (x *SignRequest) GetBlindedBlockCapella() *v1alpha1.BlindedBeaconBlockCapel return nil } -func (x *SignRequest) GetSigningSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SignRequest) GetSigningSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.SigningSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type isSignRequest_Object interface { @@ -351,11 +350,11 @@ type SignRequest_Exit struct { } type SignRequest_Slot struct { - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,105,opt,name=slot,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,105,opt,name=slot,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } type SignRequest_Epoch struct { - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,106,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,106,opt,name=epoch,proto3,oneof" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } type SignRequest_BlockAltair struct { @@ -540,12 +539,12 @@ var file_proto_prysm_v1alpha1_validator_client_keymanager_proto_rawDesc = []byte 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x69, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, - 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, + 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x5e, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x6a, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x48, 0x00, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x4d, 0x0a, 0x0c, 0x62, 0x6c, @@ -604,7 +603,7 @@ var file_proto_prysm_v1alpha1_validator_client_keymanager_proto_rawDesc = []byte 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x53, 0x6c, 0x6f, 0x74, 0x42, 0x08, 0x0a, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4a, 0x04, 0x08, 0x04, @@ -644,7 +643,7 @@ var file_proto_prysm_v1alpha1_validator_client_keymanager_proto_rawDesc = []byte 0x2e, 0x76, 0x32, 0x42, 0x0f, 0x4b, 0x65, 0x79, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3b, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x70, 0x62, 0xaa, 0x02, 0x1e, 0x45, 0x74, diff --git a/proto/prysm/v1alpha1/validator-client/keymanager.pb.gw.go b/proto/prysm/v1alpha1/validator-client/keymanager.pb.gw.go index 42c3131e256f..c06d2a1eae17 100755 --- a/proto/prysm/v1alpha1/validator-client/keymanager.pb.gw.go +++ b/proto/prysm/v1alpha1/validator-client/keymanager.pb.gw.go @@ -10,20 +10,19 @@ package validatorpb import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/validator-client/keymanager.proto b/proto/prysm/v1alpha1/validator-client/keymanager.proto index dec311f7ef82..135a3789cfbc 100644 --- a/proto/prysm/v1alpha1/validator-client/keymanager.proto +++ b/proto/prysm/v1alpha1/validator-client/keymanager.proto @@ -10,7 +10,7 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; option csharp_namespace = "Ethereum.Validator.Accounts.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client;validatorpb"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client;validatorpb"; option java_multiple_files = true; option java_outer_classname = "KeymanagerProto"; option java_package = "org.ethereum.validator.accounts.v2"; @@ -66,8 +66,8 @@ message SignRequest { ethereum.eth.v1alpha1.AttestationData attestation_data = 102; ethereum.eth.v1alpha1.AggregateAttestationAndProof aggregate_attestation_and_proof = 103; ethereum.eth.v1alpha1.VoluntaryExit exit = 104; - uint64 slot = 105 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; - uint64 epoch = 106 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 slot = 105 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; + uint64 epoch = 106 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Altair objects. ethereum.eth.v1alpha1.BeaconBlockAltair block_altair = 107; @@ -87,7 +87,7 @@ message SignRequest { ethereum.eth.v1alpha1.BlindedBeaconBlockCapella blinded_block_capella = 115; } reserved 4, 5; // Reserving old, deleted fields. - uint64 signing_slot = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 signing_slot = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } // SignResponse returned by a RemoteSigner gRPC service. diff --git a/proto/prysm/v1alpha1/validator-client/web_api.pb.go b/proto/prysm/v1alpha1/validator-client/web_api.pb.go index 66df00c1004f..718ca7a11808 100755 --- a/proto/prysm/v1alpha1/validator-client/web_api.pb.go +++ b/proto/prysm/v1alpha1/validator-client/web_api.pb.go @@ -8,17 +8,16 @@ package validatorpb import ( context "context" - reflect "reflect" - sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -2208,7 +2207,7 @@ var file_proto_prysm_v1alpha1_validator_client_web_api_proto_rawDesc = []byte{ 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x08, 0x57, 0x65, 0x62, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x3b, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x70, 0x62, 0xaa, 0x02, 0x1e, 0x45, 0x74, 0x68, diff --git a/proto/prysm/v1alpha1/validator-client/web_api.pb.gw.go b/proto/prysm/v1alpha1/validator-client/web_api.pb.gw.go index 3930687ca61d..c12b29ec99f2 100755 --- a/proto/prysm/v1alpha1/validator-client/web_api.pb.gw.go +++ b/proto/prysm/v1alpha1/validator-client/web_api.pb.gw.go @@ -10,21 +10,20 @@ package validatorpb import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -34,7 +33,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/validator-client/web_api.proto b/proto/prysm/v1alpha1/validator-client/web_api.proto index c40fb68058f2..75a120b97536 100644 --- a/proto/prysm/v1alpha1/validator-client/web_api.proto +++ b/proto/prysm/v1alpha1/validator-client/web_api.proto @@ -8,7 +8,7 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; option csharp_namespace = "Ethereum.Validator.Accounts.V2"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client;validatorpb"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client;validatorpb"; option java_multiple_files = true; option java_outer_classname = "WebProto"; option java_package = "org.ethereum.validator.accounts.v2"; diff --git a/proto/prysm/v1alpha1/validator.pb.go b/proto/prysm/v1alpha1/validator.pb.go index 5a856d906edf..0d9e0196c4e4 100755 --- a/proto/prysm/v1alpha1/validator.pb.go +++ b/proto/prysm/v1alpha1/validator.pb.go @@ -8,18 +8,17 @@ package eth import ( context "context" - reflect "reflect" - sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -149,7 +148,7 @@ type SyncSubcommitteeIndexRequest struct { unknownFields protoimpl.UnknownFields PublicKey []byte `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" ssz-size:"48"` - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,2,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` } func (x *SyncSubcommitteeIndexRequest) Reset() { @@ -191,11 +190,11 @@ func (x *SyncSubcommitteeIndexRequest) GetPublicKey() []byte { return nil } -func (x *SyncSubcommitteeIndexRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncSubcommitteeIndexRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } type SyncCommitteeContributionRequest struct { @@ -203,7 +202,7 @@ type SyncCommitteeContributionRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` PublicKey []byte `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" spec-name:"pubkey" ssz-size:"48"` SubnetId uint64 `protobuf:"varint,3,opt,name=subnet_id,json=subnetId,proto3" json:"subnet_id,omitempty"` } @@ -240,11 +239,11 @@ func (*SyncCommitteeContributionRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{2} } -func (x *SyncCommitteeContributionRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *SyncCommitteeContributionRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *SyncCommitteeContributionRequest) GetPublicKey() []byte { @@ -266,7 +265,7 @@ type SyncSubcommitteeIndexResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,1,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,1,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` } func (x *SyncSubcommitteeIndexResponse) Reset() { @@ -301,11 +300,11 @@ func (*SyncSubcommitteeIndexResponse) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{3} } -func (x *SyncSubcommitteeIndexResponse) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *SyncSubcommitteeIndexResponse) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(nil) } // Deprecated: Do not use. @@ -423,7 +422,7 @@ type DomainRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Domain []byte `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` } @@ -459,11 +458,11 @@ func (*DomainRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{5} } -func (x *DomainRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *DomainRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *DomainRequest) GetDomain() []byte { @@ -784,7 +783,7 @@ type ValidatorIndexResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ValidatorIndexResponse) Reset() { @@ -819,11 +818,11 @@ func (*ValidatorIndexResponse) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{12} } -func (x *ValidatorIndexResponse) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorIndexResponse) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type ValidatorStatusRequest struct { @@ -880,8 +879,8 @@ type ValidatorStatusResponse struct { Status ValidatorStatus `protobuf:"varint,1,opt,name=status,proto3,enum=ethereum.eth.v1alpha1.ValidatorStatus" json:"status,omitempty"` Eth1DepositBlockNumber uint64 `protobuf:"varint,2,opt,name=eth1_deposit_block_number,json=eth1DepositBlockNumber,proto3" json:"eth1_deposit_block_number,omitempty"` - DepositInclusionSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=deposit_inclusion_slot,json=depositInclusionSlot,proto3" json:"deposit_inclusion_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ActivationEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,4,opt,name=activation_epoch,json=activationEpoch,proto3" json:"activation_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + DepositInclusionSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=deposit_inclusion_slot,json=depositInclusionSlot,proto3" json:"deposit_inclusion_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ActivationEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,4,opt,name=activation_epoch,json=activationEpoch,proto3" json:"activation_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` PositionInActivationQueue uint64 `protobuf:"varint,5,opt,name=position_in_activation_queue,json=positionInActivationQueue,proto3" json:"position_in_activation_queue,omitempty"` } @@ -931,18 +930,18 @@ func (x *ValidatorStatusResponse) GetEth1DepositBlockNumber() uint64 { return 0 } -func (x *ValidatorStatusResponse) GetDepositInclusionSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *ValidatorStatusResponse) GetDepositInclusionSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.DepositInclusionSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *ValidatorStatusResponse) GetActivationEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ValidatorStatusResponse) GetActivationEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ActivationEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ValidatorStatusResponse) GetPositionInActivationQueue() uint64 { @@ -1014,7 +1013,7 @@ type MultipleValidatorStatusResponse struct { PublicKeys [][]byte `protobuf:"bytes,1,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty" ssz-size:"?,48"` Statuses []*ValidatorStatusResponse `protobuf:"bytes,2,rep,name=statuses,proto3" json:"statuses,omitempty"` - Indices []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Indices []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,rep,packed,name=indices,proto3" json:"indices,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *MultipleValidatorStatusResponse) Reset() { @@ -1063,11 +1062,11 @@ func (x *MultipleValidatorStatusResponse) GetStatuses() []*ValidatorStatusRespon return nil } -func (x *MultipleValidatorStatusResponse) GetIndices() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *MultipleValidatorStatusResponse) GetIndices() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Indices } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } type DutiesRequest struct { @@ -1075,7 +1074,7 @@ type DutiesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` PublicKeys [][]byte `protobuf:"bytes,2,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty" ssz-size:"?,48"` } @@ -1111,11 +1110,11 @@ func (*DutiesRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{17} } -func (x *DutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *DutiesRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *DutiesRequest) GetPublicKeys() [][]byte { @@ -1195,7 +1194,7 @@ type BlockRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` RandaoReveal []byte `protobuf:"bytes,2,opt,name=randao_reveal,json=randaoReveal,proto3" json:"randao_reveal,omitempty" ssz-size:"48"` Graffiti []byte `protobuf:"bytes,3,opt,name=graffiti,proto3" json:"graffiti,omitempty" ssz-size:"32"` SkipMevBoost bool `protobuf:"varint,4,opt,name=skip_mev_boost,json=skipMevBoost,proto3" json:"skip_mev_boost,omitempty"` @@ -1233,11 +1232,11 @@ func (*BlockRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{19} } -func (x *BlockRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *BlockRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } func (x *BlockRequest) GetRandaoReveal() []byte { @@ -1360,8 +1359,8 @@ type AttestationDataRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` } func (x *AttestationDataRequest) Reset() { @@ -1396,18 +1395,18 @@ func (*AttestationDataRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{22} } -func (x *AttestationDataRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AttestationDataRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *AttestationDataRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AttestationDataRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } type AttestResponse struct { @@ -1462,8 +1461,8 @@ type AggregateSelectionRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` PublicKey []byte `protobuf:"bytes,3,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" spec-name:"pubkey" ssz-size:"48"` SlotSignature []byte `protobuf:"bytes,4,opt,name=slot_signature,json=slotSignature,proto3" json:"slot_signature,omitempty" ssz-size:"96"` } @@ -1500,18 +1499,18 @@ func (*AggregateSelectionRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{24} } -func (x *AggregateSelectionRequest) GetSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *AggregateSelectionRequest) GetSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *AggregateSelectionRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *AggregateSelectionRequest) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } func (x *AggregateSelectionRequest) GetPublicKey() []byte { @@ -1674,8 +1673,8 @@ type CommitteeSubnetsSubscribeRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Slots []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,1,rep,packed,name=slots,proto3" json:"slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - CommitteeIds []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,rep,packed,name=committee_ids,json=committeeIds,proto3" json:"committee_ids,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` + Slots []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,1,rep,packed,name=slots,proto3" json:"slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + CommitteeIds []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,rep,packed,name=committee_ids,json=committeeIds,proto3" json:"committee_ids,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` IsAggregator []bool `protobuf:"varint,3,rep,packed,name=is_aggregator,json=isAggregator,proto3" json:"is_aggregator,omitempty"` } @@ -1711,18 +1710,18 @@ func (*CommitteeSubnetsSubscribeRequest) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{28} } -func (x *CommitteeSubnetsSubscribeRequest) GetSlots() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *CommitteeSubnetsSubscribeRequest) GetSlots() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.Slots } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(nil) } -func (x *CommitteeSubnetsSubscribeRequest) GetCommitteeIds() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *CommitteeSubnetsSubscribeRequest) GetCommitteeIds() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIds } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(nil) } func (x *CommitteeSubnetsSubscribeRequest) GetIsAggregator() []bool { @@ -1741,10 +1740,10 @@ type Validator struct { WithdrawalCredentials []byte `protobuf:"bytes,2,opt,name=withdrawal_credentials,json=withdrawalCredentials,proto3" json:"withdrawal_credentials,omitempty" ssz-size:"32"` EffectiveBalance uint64 `protobuf:"varint,3,opt,name=effective_balance,json=effectiveBalance,proto3" json:"effective_balance,omitempty"` Slashed bool `protobuf:"varint,4,opt,name=slashed,proto3" json:"slashed,omitempty"` - ActivationEligibilityEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=activation_eligibility_epoch,json=activationEligibilityEpoch,proto3" json:"activation_eligibility_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - ActivationEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,6,opt,name=activation_epoch,json=activationEpoch,proto3" json:"activation_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - ExitEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=exit_epoch,json=exitEpoch,proto3" json:"exit_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` - WithdrawableEpoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,8,opt,name=withdrawable_epoch,json=withdrawableEpoch,proto3" json:"withdrawable_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + ActivationEligibilityEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,5,opt,name=activation_eligibility_epoch,json=activationEligibilityEpoch,proto3" json:"activation_eligibility_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + ActivationEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,6,opt,name=activation_epoch,json=activationEpoch,proto3" json:"activation_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + ExitEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,7,opt,name=exit_epoch,json=exitEpoch,proto3" json:"exit_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` + WithdrawableEpoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,8,opt,name=withdrawable_epoch,json=withdrawableEpoch,proto3" json:"withdrawable_epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` } func (x *Validator) Reset() { @@ -1807,32 +1806,32 @@ func (x *Validator) GetSlashed() bool { return false } -func (x *Validator) GetActivationEligibilityEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetActivationEligibilityEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ActivationEligibilityEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *Validator) GetActivationEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetActivationEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ActivationEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *Validator) GetExitEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetExitEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.ExitEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } -func (x *Validator) GetWithdrawableEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *Validator) GetWithdrawableEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.WithdrawableEpoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } type ValidatorParticipation struct { @@ -1966,8 +1965,8 @@ type ValidatorInfo struct { unknownFields protoimpl.UnknownFields PublicKey []byte `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` Status ValidatorStatus `protobuf:"varint,4,opt,name=status,proto3,enum=ethereum.eth.v1alpha1.ValidatorStatus" json:"status,omitempty"` TransitionTimestamp uint64 `protobuf:"varint,5,opt,name=transition_timestamp,json=transitionTimestamp,proto3" json:"transition_timestamp,omitempty"` Balance uint64 `protobuf:"varint,6,opt,name=balance,proto3" json:"balance,omitempty"` @@ -2013,18 +2012,18 @@ func (x *ValidatorInfo) GetPublicKey() []byte { return nil } -func (x *ValidatorInfo) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorInfo) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } -func (x *ValidatorInfo) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *ValidatorInfo) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *ValidatorInfo) GetStatus() ValidatorStatus { @@ -2345,7 +2344,7 @@ type ValidatorActivationResponse_Status struct { PublicKey []byte `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` Status *ValidatorStatusResponse `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` - Index github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + Index github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *ValidatorActivationResponse_Status) Reset() { @@ -2394,11 +2393,11 @@ func (x *ValidatorActivationResponse_Status) GetStatus() *ValidatorStatusRespons return nil } -func (x *ValidatorActivationResponse_Status) GetIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *ValidatorActivationResponse_Status) GetIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Index } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } type DutiesResponse_Duty struct { @@ -2406,13 +2405,13 @@ type DutiesResponse_Duty struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Committee []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=committee,proto3" json:"committee,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` - CommitteeIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"` - AttesterSlot github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` - ProposerSlots []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot `protobuf:"varint,4,rep,packed,name=proposer_slots,json=proposerSlots,proto3" json:"proposer_slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"` + Committee []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,rep,packed,name=committee,proto3" json:"committee,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` + CommitteeIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"` + AttesterSlot github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` + ProposerSlots []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot `protobuf:"varint,4,rep,packed,name=proposer_slots,json=proposerSlots,proto3" json:"proposer_slots,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"` PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" ssz-size:"48"` Status ValidatorStatus `protobuf:"varint,6,opt,name=status,proto3,enum=ethereum.eth.v1alpha1.ValidatorStatus" json:"status,omitempty"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,7,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` IsSyncCommittee bool `protobuf:"varint,8,opt,name=is_sync_committee,json=isSyncCommittee,proto3" json:"is_sync_committee,omitempty"` } @@ -2448,32 +2447,32 @@ func (*DutiesResponse_Duty) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_validator_proto_rawDescGZIP(), []int{18, 0} } -func (x *DutiesResponse_Duty) GetCommittee() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *DutiesResponse_Duty) GetCommittee() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.Committee } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(nil) } -func (x *DutiesResponse_Duty) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex { +func (x *DutiesResponse_Duty) GetCommitteeIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex { if x != nil { return x.CommitteeIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.CommitteeIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.CommitteeIndex(0) } -func (x *DutiesResponse_Duty) GetAttesterSlot() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *DutiesResponse_Duty) GetAttesterSlot() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.AttesterSlot } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(0) } -func (x *DutiesResponse_Duty) GetProposerSlots() []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot { +func (x *DutiesResponse_Duty) GetProposerSlots() []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot { if x != nil { return x.ProposerSlots } - return []github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Slot(nil) + return []github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Slot(nil) } func (x *DutiesResponse_Duty) GetPublicKey() []byte { @@ -2490,11 +2489,11 @@ func (x *DutiesResponse_Duty) GetStatus() ValidatorStatus { return ValidatorStatus_UNKNOWN_STATUS } -func (x *DutiesResponse_Duty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *DutiesResponse_Duty) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *DutiesResponse_Duty) GetIsSyncCommittee() bool { @@ -2510,7 +2509,7 @@ type DoppelGangerRequest_ValidatorRequest struct { unknownFields protoimpl.UnknownFields PublicKey []byte `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" spec-name:"pubkey" ssz-size:"48"` - Epoch github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"` + Epoch github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch `protobuf:"varint,3,opt,name=epoch,proto3" json:"epoch,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"` SignedRoot []byte `protobuf:"bytes,2,opt,name=signed_root,json=signedRoot,proto3" json:"signed_root,omitempty" ssz-size:"32"` } @@ -2553,11 +2552,11 @@ func (x *DoppelGangerRequest_ValidatorRequest) GetPublicKey() []byte { return nil } -func (x *DoppelGangerRequest_ValidatorRequest) GetEpoch() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch { +func (x *DoppelGangerRequest_ValidatorRequest) GetEpoch() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch { if x != nil { return x.Epoch } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) } func (x *DoppelGangerRequest_ValidatorRequest) GetSignedRoot() []byte { @@ -2628,7 +2627,7 @@ type PrepareBeaconProposerRequest_FeeRecipientContainer struct { unknownFields protoimpl.UnknownFields FeeRecipient []byte `protobuf:"bytes,1,opt,name=fee_recipient,json=feeRecipient,proto3" json:"fee_recipient,omitempty" ssz-size:"20"` - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,2,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` } func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) Reset() { @@ -2670,11 +2669,11 @@ func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) GetFeeRecipient() [ return nil } -func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *PrepareBeaconProposerRequest_FeeRecipientContainer) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } var File_proto_prysm_v1alpha1_validator_proto protoreflect.FileDescriptor @@ -2708,7 +2707,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x22, 0xcb, 0x01, 0x0a, 0x20, 0x53, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, @@ -2716,7 +2715,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2f, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, @@ -2729,7 +2728,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x12, 0x69, 0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0xfd, 0x02, 0x0a, 0x14, @@ -2761,7 +2760,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, + 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x64, 0x6f, 0x6d, @@ -2791,7 +2790,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x75, 0x73, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x91, 0x01, 0x0a, 0x12, 0x43, 0x68, @@ -2817,7 +2816,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x3f, 0x0a, 0x16, 0x56, @@ -2838,7 +2837,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x14, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x6c, 0x6f, 0x74, @@ -2846,7 +2845,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x70, 0x6f, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, - 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, @@ -2872,7 +2871,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x61, 0x74, 0x75, 0x73, 0x65, 0x73, 0x12, 0x69, 0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, + 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, @@ -2880,7 +2879,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x65, 0x73, 0x74, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x29, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x73, @@ -2906,7 +2905,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x0a, 0x04, 0x44, 0x75, 0x74, 0x79, 0x12, 0x6d, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, @@ -2914,21 +2913,21 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x6a, 0x0a, 0x0d, 0x61, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, + 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0c, 0x61, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x72, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x6c, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x70, 0x75, 0x62, @@ -2941,7 +2940,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x12, 0x78, 0x0a, 0x0f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, @@ -2952,7 +2951,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, - 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, + 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x2b, 0x0a, 0x0d, 0x72, 0x61, 0x6e, 0x64, 0x61, 0x6f, 0x5f, 0x72, 0x65, 0x76, @@ -2974,14 +2973,14 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, - 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, + 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x78, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, @@ -2994,14 +2993,14 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x59, 0x0a, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x04, 0x73, 0x6c, 0x6f, 0x74, 0x12, 0x78, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, - 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, @@ -3040,13 +3039,13 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x5b, 0x0a, 0x05, 0x73, 0x6c, 0x6f, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x42, 0x45, 0x82, 0xb5, 0x18, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x05, 0x73, 0x6c, 0x6f, 0x74, 0x73, 0x12, 0x74, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x65, 0x49, @@ -3069,7 +3068,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x1a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6c, 0x69, 0x67, 0x69, 0x62, 0x69, 0x6c, 0x69, @@ -3077,21 +3076,21 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, - 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, + 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x65, 0x0a, 0x0a, 0x65, 0x78, 0x69, 0x74, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x09, 0x65, 0x78, 0x69, 0x74, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x75, 0x0a, 0x12, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x11, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x22, 0x8e, 0x05, 0x0a, 0x16, 0x56, 0x61, 0x6c, @@ -3141,14 +3140,14 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x65, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, + 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x3e, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, @@ -3178,7 +3177,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x4b, 0x65, 0x79, 0x12, 0x5c, 0x0a, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x42, 0x46, 0x82, 0xb5, 0x18, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, - 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x52, 0x05, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x27, 0x0a, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x6f, 0x74, @@ -3219,7 +3218,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, - 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, + 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x4e, @@ -3511,7 +3510,7 @@ var file_proto_prysm_v1alpha1_validator_proto_rawDesc = []byte{ 0x61, 0x31, 0x42, 0x0e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, - 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, + 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x0f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x74, diff --git a/proto/prysm/v1alpha1/validator.pb.gw.go b/proto/prysm/v1alpha1/validator.pb.gw.go index faf1c1ba0212..237e42af0d8f 100755 --- a/proto/prysm/v1alpha1/validator.pb.gw.go +++ b/proto/prysm/v1alpha1/validator.pb.gw.go @@ -10,20 +10,19 @@ package eth import ( "context" - "io" - "net/http" - "github.com/golang/protobuf/ptypes/empty" emptypb "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" + "io" + "net/http" ) // Suppress "imported and not used" errors @@ -33,7 +32,7 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var _ = github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.Epoch(0) +var _ = github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.Epoch(0) var _ = emptypb.Empty{} var _ = empty.Empty{} diff --git a/proto/prysm/v1alpha1/validator.proto b/proto/prysm/v1alpha1/validator.proto index 9c122de338d9..542b1e4db3ea 100644 --- a/proto/prysm/v1alpha1/validator.proto +++ b/proto/prysm/v1alpha1/validator.proto @@ -25,7 +25,7 @@ import "proto/prysm/v1alpha1/sync_committee.proto"; import "proto/prysm/v1alpha1/attestation.proto"; option csharp_namespace = "Ethereum.Eth.V1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "ValidatorProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -324,12 +324,12 @@ message SyncSubcommitteeIndexRequest { // The validator's public key. bytes public_key = 1 [(ethereum.eth.ext.ssz_size) = "48"]; // The slot of validator's assignment. - uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; } message SyncCommitteeContributionRequest { // Slot for which the aggregation request applies. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 48 byte public key of the validator. bytes public_key = 2 [(ethereum.eth.ext.ssz_size) = "48", (ethereum.eth.ext.spec_name) = "pubkey"]; // Subnet ID of where this contribution and proof should be broadcast to. @@ -340,7 +340,7 @@ message SyncCommitteeContributionRequest { message SyncSubcommitteeIndexResponse { // The subcommittee index itself. // If the total validator count is not sufficient, there could be more than one index. - repeated uint64 indices = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + repeated uint64 indices = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; } // DEPRECATED: This endpoint StreamBlocks is superseded by the /eth/v1/events Beacon API endpoint @@ -364,7 +364,7 @@ message StreamBlocksResponse { message DomainRequest { // The epoch for which the domain is being requested. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // The bytes domain specified by the validator. bytes domain = 2; @@ -390,7 +390,7 @@ message ValidatorActivationResponse { ValidatorStatusResponse status = 2; // The validators index in the beacon state. - uint64 index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } // A list of validator statuses mapped 1-to-1 with the public keys // in the request. @@ -423,7 +423,7 @@ message ValidatorIndexRequest { message ValidatorIndexResponse { // The validator's index in the beacon chain state's validator registry. - uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message ValidatorStatusRequest { @@ -453,11 +453,11 @@ message ValidatorStatusResponse { // The slot in the beacon chain in which the validator's // deposit was included in a block. - uint64 deposit_inclusion_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 deposit_inclusion_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // The epoch in the beacon chain in which the validator // is determined as active. - uint64 activation_epoch = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 activation_epoch = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // The position in the activation queue of pending validators. uint64 position_in_activation_queue = 5; @@ -476,12 +476,12 @@ message MultipleValidatorStatusResponse { // A list of ValidatorStatusResponses mapped 1-to-1 with the public keys. repeated ValidatorStatusResponse statuses = 2; // A list of validator indices. - repeated uint64 indices = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 indices = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } message DutiesRequest { // Epoch at which validators should perform their duties. - uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Array of byte encoded BLS public keys. repeated bytes public_keys = 2 [(ethereum.eth.ext.ssz_size) = "?,48"]; @@ -496,16 +496,16 @@ message DutiesResponse { message Duty { // The committee a validator is assigned to. - repeated uint64 committee = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + repeated uint64 committee = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The index into the committee where the validator belongs in. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // Slot at which a validator must attest. - uint64 attester_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 attester_slot = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Slots at which a validator must propose a beacon chain block. - repeated uint64 proposer_slots = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + repeated uint64 proposer_slots = 4 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // 48 byte BLS public key for the validator who's assigned to perform a duty. bytes public_key = 5 [(ethereum.eth.ext.ssz_size) = "48"]; @@ -514,7 +514,7 @@ message DutiesResponse { ValidatorStatus status = 6; // The index of the validator in the beacon state. - uint64 validator_index = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // Whether the validator belongs in the sync committee and has to perform sync committee duty. bool is_sync_committee = 8; @@ -523,7 +523,7 @@ message DutiesResponse { message BlockRequest { // Slot for which the block should be proposed. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Validator's 32 byte randao reveal secret of the current epoch. bytes randao_reveal = 2 [(ethereum.eth.ext.ssz_size) = "48"]; @@ -547,10 +547,10 @@ message ProposeExitResponse { message AttestationDataRequest { // Slot for which the attestation should be created. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Committee index the attestation should be created for. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; } message AttestResponse { @@ -560,9 +560,9 @@ message AttestResponse { message AggregateSelectionRequest { // Slot for which the aggregation request applies. - uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + uint64 slot = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // Committee index of the validator at the given slot. - uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + uint64 committee_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // 48 byte public key of the validator. bytes public_key = 3 [(ethereum.eth.ext.ssz_size) = "48", (ethereum.eth.ext.spec_name) = "pubkey"]; // 96 byte signature of the validator on the slot. This is used as proof that the validator is @@ -587,9 +587,9 @@ message SignedAggregateSubmitResponse { message CommitteeSubnetsSubscribeRequest { // A list of intended slots to subscribe. - repeated uint64 slots = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Slot"]; + repeated uint64 slots = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Slot"]; // A list of intended committee ids to subscribe. It is mapped 1-to-1 with the slots - repeated uint64 committee_ids = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.CommitteeIndex"]; + repeated uint64 committee_ids = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.CommitteeIndex"]; // Whether to subscribe as an aggregator or by default attester. // It is mapped 1-to-1 with the slots and committee ids. // Subscribe as an aggregator means to join the subnet. @@ -614,24 +614,24 @@ message Validator { // Epoch when the validator became eligible for activation. This field may // be zero if the validator was present in the Ethereum proof of stake genesis. This // field is FAR_FUTURE_EPOCH if the validator has not been activated. - uint64 activation_eligibility_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 activation_eligibility_epoch = 5 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Epoch when the validator was activated. This field may be zero if the // validator was present in the Ethereum proof of stake genesis. This field is // FAR_FUTURE_EPOCH if the validator has not been activated. - uint64 activation_epoch = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 activation_epoch = 6 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Epoch when the validator was exited. This field is FAR_FUTURE_EPOCH if // the validator has not exited. // FAR_FUTURE_EPOCH is a constant defined by the official Ethereum Beacon Chain specification: // https://github.com/ethereum/consensus-specs/blob/v0.9.2/specs/core/0_beacon-chain.md#constants - uint64 exit_epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 exit_epoch = 7 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // Epoch when the validator is eligible to withdraw their funds. This field // is FAR_FUTURE_EPOCH if the validator has not exited. // FAR_FUTURE_EPOCH is a constant defined by the official Ethereum Beacon Chain specification: // https://github.com/ethereum/consensus-specs/blob/v0.9.2/specs/core/0_beacon-chain.md#constants - uint64 withdrawable_epoch = 8 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 withdrawable_epoch = 8 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; } // ValidatorParticipation stores participation metrics during a given epoch. @@ -669,10 +669,10 @@ message ValidatorInfo { bytes public_key = 1; // The validator's index in the beacon state. - uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The epoch for which the information pertains. - uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // The validator's current status. ValidatorStatus status = 4; @@ -706,7 +706,7 @@ message DoppelGangerRequest { // The validator's 48 byte BLS public key. bytes public_key = 1 [(ethereum.eth.ext.ssz_size) = "48", (ethereum.eth.ext.spec_name) = "pubkey"]; // The validator's last recorded epoch to attest. - uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.Epoch"]; + uint64 epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.Epoch"]; // The validator's last recorded signed root. bytes signed_root = 2 [(ethereum.eth.ext.ssz_size) = "32"]; } @@ -737,7 +737,7 @@ message PrepareBeaconProposerRequest { bytes fee_recipient = 1 [(ethereum.eth.ext.ssz_size) = "20"]; // The proposer validator index. - uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 2 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; } repeated FeeRecipientContainer recipients = 1; } diff --git a/proto/prysm/v1alpha1/withdrawals.pb.go b/proto/prysm/v1alpha1/withdrawals.pb.go index 9dc54d46ae89..90d2cfbd5402 100755 --- a/proto/prysm/v1alpha1/withdrawals.pb.go +++ b/proto/prysm/v1alpha1/withdrawals.pb.go @@ -7,13 +7,12 @@ package eth import ( - reflect "reflect" - sync "sync" - - github_com_prysmaticlabs_prysm_v3_consensus_types_primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - _ "github.com/prysmaticlabs/prysm/v3/proto/eth/ext" + github_com_prysmaticlabs_prysm_v4_consensus_types_primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + _ "github.com/prysmaticlabs/prysm/v4/proto/eth/ext" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -28,7 +27,7 @@ type BLSToExecutionChange struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ValidatorIndex github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"` + ValidatorIndex github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex `protobuf:"varint,1,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty" cast-type:"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"` FromBlsPubkey []byte `protobuf:"bytes,2,opt,name=from_bls_pubkey,json=fromBlsPubkey,proto3" json:"from_bls_pubkey,omitempty" ssz-size:"48"` ToExecutionAddress []byte `protobuf:"bytes,3,opt,name=to_execution_address,json=toExecutionAddress,proto3" json:"to_execution_address,omitempty" ssz-size:"20"` } @@ -65,11 +64,11 @@ func (*BLSToExecutionChange) Descriptor() ([]byte, []int) { return file_proto_prysm_v1alpha1_withdrawals_proto_rawDescGZIP(), []int{0} } -func (x *BLSToExecutionChange) GetValidatorIndex() github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex { +func (x *BLSToExecutionChange) GetValidatorIndex() github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex { if x != nil { return x.ValidatorIndex } - return github_com_prysmaticlabs_prysm_v3_consensus_types_primitives.ValidatorIndex(0) + return github_com_prysmaticlabs_prysm_v4_consensus_types_primitives.ValidatorIndex(0) } func (x *BLSToExecutionChange) GetFromBlsPubkey() []byte { @@ -155,7 +154,7 @@ var file_proto_prysm_v1alpha1_withdrawals_proto_rawDesc = []byte{ 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x4f, 0x82, 0xb5, 0x18, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, - 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, + 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, @@ -179,7 +178,7 @@ var file_proto_prysm_v1alpha1_withdrawals_proto_rawDesc = []byte{ 0x68, 0x61, 0x31, 0x42, 0x10, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, - 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x65, 0x74, 0x68, 0xaa, 0x02, 0x15, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x15, 0x45, 0x74, diff --git a/proto/prysm/v1alpha1/withdrawals.proto b/proto/prysm/v1alpha1/withdrawals.proto index 63150aaa608b..a81e57fbe879 100644 --- a/proto/prysm/v1alpha1/withdrawals.proto +++ b/proto/prysm/v1alpha1/withdrawals.proto @@ -18,7 +18,7 @@ package ethereum.eth.v1alpha1; import "proto/eth/ext/options.proto"; option csharp_namespace = "Ethereum.Eth.v1alpha1"; -option go_package = "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1;eth"; +option go_package = "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1;eth"; option java_multiple_files = true; option java_outer_classname = "WithdrawalsProto"; option java_package = "org.ethereum.eth.v1alpha1"; @@ -27,7 +27,7 @@ option php_namespace = "Ethereum\\Eth\\v1alpha1"; // The message requesting a BLS to execution withdrawal credentials change message BLSToExecutionChange { // The validator index requesting the change - uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives.ValidatorIndex"]; + uint64 validator_index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives.ValidatorIndex"]; // The public key of the BLS address requesting the change bytes from_bls_pubkey = 2 [(ethereum.eth.ext.ssz_size) = "48"]; diff --git a/proto/testing/BUILD.bazel b/proto/testing/BUILD.bazel index 4aeacf2df791..8aefd76d737b 100644 --- a/proto/testing/BUILD.bazel +++ b/proto/testing/BUILD.bazel @@ -18,7 +18,7 @@ proto_library( go_proto_library( name = "ethereum_testing_go_proto", compiler = "//:cast_proto_compiler", - importpath = "github.com/prysmaticlabs/prysm/v3/proto/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/testing", proto = ":testing_proto", visibility = ["//visibility:public"], deps = [ @@ -35,7 +35,7 @@ go_library( name = "go_default_library", testonly = True, embed = [":ethereum_testing_go_proto"], - importpath = "github.com/prysmaticlabs/prysm/v3/proto/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/proto/testing", visibility = ["//visibility:public"], ) diff --git a/proto/testing/tags_test.go b/proto/testing/tags_test.go index 9bef4c241044..122bc80c48bb 100644 --- a/proto/testing/tags_test.go +++ b/proto/testing/tags_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSSZTagSize(t *testing.T) { diff --git a/proto/testing/test.pb.go b/proto/testing/test.pb.go index 2cc60744cad1..9096dd1989ac 100755 --- a/proto/testing/test.pb.go +++ b/proto/testing/test.pb.go @@ -7,13 +7,12 @@ package testing import ( - reflect "reflect" - sync "sync" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" + reflect "reflect" + sync "sync" ) const ( diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel index 5b198a2c07c3..f2e5553d6ac4 100644 --- a/runtime/BUILD.bazel +++ b/runtime/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["service_registry.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime", visibility = ["//visibility:public"], deps = ["@com_github_sirupsen_logrus//:go_default_library"], ) diff --git a/runtime/debug/BUILD.bazel b/runtime/debug/BUILD.bazel index 12dce4f42195..acc4347ee936 100644 --- a/runtime/debug/BUILD.bazel +++ b/runtime/debug/BUILD.bazel @@ -15,7 +15,7 @@ go_library( ":use_cgosymbolizer": ["cgo_symbolizer.go"], "//conditions:default": [], }), - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/debug", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/debug", visibility = ["//visibility:public"], deps = [ "@com_github_fjl_memsize//memsizeui:go_default_library", diff --git a/runtime/fdlimits/BUILD.bazel b/runtime/fdlimits/BUILD.bazel index 8970d803ecb5..42a07932a45b 100644 --- a/runtime/fdlimits/BUILD.bazel +++ b/runtime/fdlimits/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["fdlimits.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/fdlimits", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/fdlimits", visibility = ["//visibility:public"], deps = [ "@com_github_ethereum_go_ethereum//common/fdlimit:go_default_library", diff --git a/runtime/fdlimits/fdlimits_test.go b/runtime/fdlimits/fdlimits_test.go index add4cebfa1e3..85b05b18b712 100644 --- a/runtime/fdlimits/fdlimits_test.go +++ b/runtime/fdlimits/fdlimits_test.go @@ -4,8 +4,8 @@ import ( "testing" gethLimit "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/prysmaticlabs/prysm/v3/runtime/fdlimits" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/runtime/fdlimits" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestSetMaxFdLimits(t *testing.T) { diff --git a/runtime/interop/BUILD.bazel b/runtime/interop/BUILD.bazel index c4139a78bca3..a21396c31671 100644 --- a/runtime/interop/BUILD.bazel +++ b/runtime/interop/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "generate_keys.go", "premined_genesis_state.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/interop", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/interop", visibility = ["//visibility:public"], deps = [ "//async:go_default_library", diff --git a/runtime/interop/generate_genesis_state.go b/runtime/interop/generate_genesis_state.go index ac4168a2ea84..ab500a97787f 100644 --- a/runtime/interop/generate_genesis_state.go +++ b/runtime/interop/generate_genesis_state.go @@ -7,17 +7,17 @@ import ( "sync" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - coreState "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + coreState "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time" ) var ( diff --git a/runtime/interop/generate_genesis_state_bellatrix.go b/runtime/interop/generate_genesis_state_bellatrix.go index 23a7fc65f466..6020a325387c 100644 --- a/runtime/interop/generate_genesis_state_bellatrix.go +++ b/runtime/interop/generate_genesis_state_bellatrix.go @@ -6,13 +6,13 @@ import ( "context" "github.com/pkg/errors" - coreState "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time" + coreState "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time" ) // GenerateGenesisStateBellatrix deterministically given a genesis time and number of validators. diff --git a/runtime/interop/generate_genesis_state_bellatrix_test.go b/runtime/interop/generate_genesis_state_bellatrix_test.go index 3aca9e47a7a9..980f2888bd82 100644 --- a/runtime/interop/generate_genesis_state_bellatrix_test.go +++ b/runtime/interop/generate_genesis_state_bellatrix_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenerateGenesisStateBellatrix(t *testing.T) { diff --git a/runtime/interop/generate_genesis_state_test.go b/runtime/interop/generate_genesis_state_test.go index be6ae0d8b728..bdb73c2b3c3b 100644 --- a/runtime/interop/generate_genesis_state_test.go +++ b/runtime/interop/generate_genesis_state_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenerateGenesisState(t *testing.T) { diff --git a/runtime/interop/generate_keys.go b/runtime/interop/generate_keys.go index ac5a3baf9f2e..1d7a1f451267 100644 --- a/runtime/interop/generate_keys.go +++ b/runtime/interop/generate_keys.go @@ -5,12 +5,12 @@ import ( "math/big" "sync" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" ) const ( diff --git a/runtime/interop/generate_keys_test.go b/runtime/interop/generate_keys_test.go index 21a6b8c6fa33..aaecb0728aea 100644 --- a/runtime/interop/generate_keys_test.go +++ b/runtime/interop/generate_keys_test.go @@ -8,9 +8,9 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/go-yaml/yaml" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type TestCase struct { diff --git a/runtime/interop/premined_genesis_state.go b/runtime/interop/premined_genesis_state.go index cffee57877e1..bba1dd63c855 100644 --- a/runtime/interop/premined_genesis_state.go +++ b/runtime/interop/premined_genesis_state.go @@ -5,11 +5,11 @@ import ( "time" "github.com/pkg/errors" - coreState "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - statenative "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + coreState "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + statenative "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // GeneratePreminedGenesisState deterministically given a genesis time and number of validators. diff --git a/runtime/logging/logrus-prefixed-formatter/BUILD.bazel b/runtime/logging/logrus-prefixed-formatter/BUILD.bazel index 2a5a10430555..9b75083b2fa9 100644 --- a/runtime/logging/logrus-prefixed-formatter/BUILD.bazel +++ b/runtime/logging/logrus-prefixed-formatter/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["formatter.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/logging/logrus-prefixed-formatter", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/logging/logrus-prefixed-formatter", visibility = ["//visibility:public"], deps = [ "@com_github_mgutz_ansi//:go_default_library", diff --git a/runtime/logging/logrus-prefixed-formatter/formatter_test.go b/runtime/logging/logrus-prefixed-formatter/formatter_test.go index bdca01124ed3..853be806296d 100644 --- a/runtime/logging/logrus-prefixed-formatter/formatter_test.go +++ b/runtime/logging/logrus-prefixed-formatter/formatter_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/pkg/errors" - . "github.com/prysmaticlabs/prysm/v3/runtime/logging/logrus-prefixed-formatter" - "github.com/prysmaticlabs/prysm/v3/testing/require" + prefixed "github.com/prysmaticlabs/prysm/v4/runtime/logging/logrus-prefixed-formatter" + "github.com/prysmaticlabs/prysm/v4/testing/require" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -15,13 +15,13 @@ import ( ) var _ = Describe("Formatter", func() { - var formatter *TextFormatter + var formatter *prefixed.TextFormatter var log *logrus.Logger var output *LogOutput BeforeEach(func() { output = new(LogOutput) - formatter = new(TextFormatter) + formatter = new(prefixed.TextFormatter) log = logrus.New() log.Out = output log.Formatter = formatter @@ -57,7 +57,7 @@ var _ = Describe("Formatter", func() { }) func TestFormatter_SuppressErrorStackTraces(t *testing.T) { - formatter := new(TextFormatter) + formatter := new(prefixed.TextFormatter) formatter.ForceFormatting = true log := logrus.New() log.Formatter = formatter @@ -73,7 +73,7 @@ func TestFormatter_SuppressErrorStackTraces(t *testing.T) { } func TestFormatter_EscapesControlCharacters(t *testing.T) { - formatter := new(TextFormatter) + formatter := new(prefixed.TextFormatter) formatter.ForceFormatting = true log := logrus.New() log.Formatter = formatter diff --git a/runtime/maxprocs/BUILD.bazel b/runtime/maxprocs/BUILD.bazel index 2026945181e9..daf2a6051bdc 100644 --- a/runtime/maxprocs/BUILD.bazel +++ b/runtime/maxprocs/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["maxprocs.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs", visibility = ["//visibility:public"], deps = [ "@com_github_sirupsen_logrus//:go_default_library", diff --git a/runtime/messagehandler/BUILD.bazel b/runtime/messagehandler/BUILD.bazel index 6c2b5d1ef022..a0d70a2311e9 100644 --- a/runtime/messagehandler/BUILD.bazel +++ b/runtime/messagehandler/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["messagehandler.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/messagehandler", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/messagehandler", visibility = ["//visibility:public"], deps = [ "@com_github_libp2p_go_libp2p_pubsub//:go_default_library", diff --git a/runtime/messagehandler/messagehandler_test.go b/runtime/messagehandler/messagehandler_test.go index c904e73f6aed..b3217da63571 100644 --- a/runtime/messagehandler/messagehandler_test.go +++ b/runtime/messagehandler/messagehandler_test.go @@ -5,8 +5,8 @@ import ( "testing" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/v3/runtime/messagehandler" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/runtime/messagehandler" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/runtime/prereqs/BUILD.bazel b/runtime/prereqs/BUILD.bazel index 840a62a2caf8..8488afae8fbc 100644 --- a/runtime/prereqs/BUILD.bazel +++ b/runtime/prereqs/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["prereq.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/prereqs", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/prereqs", visibility = ["//visibility:public"], deps = [ "@com_github_pkg_errors//:go_default_library", diff --git a/runtime/prereqs/prereq_test.go b/runtime/prereqs/prereq_test.go index 2484fd7aaa77..e9056749c776 100644 --- a/runtime/prereqs/prereq_test.go +++ b/runtime/prereqs/prereq_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/runtime/service_registry_test.go b/runtime/service_registry_test.go index 83691514edf3..08c28af44c4b 100644 --- a/runtime/service_registry_test.go +++ b/runtime/service_registry_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type mockService struct { diff --git a/runtime/tos/BUILD.bazel b/runtime/tos/BUILD.bazel index 19d2b7182e0a..ca4809bfb89f 100644 --- a/runtime/tos/BUILD.bazel +++ b/runtime/tos/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["tos.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/tos", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/tos", visibility = ["//visibility:public"], deps = [ "//cmd:go_default_library", diff --git a/runtime/tos/tos.go b/runtime/tos/tos.go index 9b1494843aba..c4aa541209dd 100644 --- a/runtime/tos/tos.go +++ b/runtime/tos/tos.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/logrusorgru/aurora" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/runtime/tos/tos_test.go b/runtime/tos/tos_test.go index 9761cd59d94b..a546a2721023 100644 --- a/runtime/tos/tos_test.go +++ b/runtime/tos/tos_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/urfave/cli/v2" ) diff --git a/runtime/version/BUILD.bazel b/runtime/version/BUILD.bazel index 351d3c207e0d..157ccc2b55ec 100644 --- a/runtime/version/BUILD.bazel +++ b/runtime/version/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "metrics.go", "version.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/runtime/version", + importpath = "github.com/prysmaticlabs/prysm/v4/runtime/version", visibility = ["//visibility:public"], x_defs = { "gitCommit": "{STABLE_GIT_COMMIT}", diff --git a/testing/assert/BUILD.bazel b/testing/assert/BUILD.bazel index d8dc015d8787..9b36c645a953 100644 --- a/testing/assert/BUILD.bazel +++ b/testing/assert/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["assertions.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/assert", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/assert", visibility = ["//visibility:public"], deps = [ "//testing/assertions:go_default_library", diff --git a/testing/assert/assertions.go b/testing/assert/assertions.go index 9a5ffd553177..21278c59f298 100644 --- a/testing/assert/assertions.go +++ b/testing/assert/assertions.go @@ -1,7 +1,7 @@ package assert import ( - "github.com/prysmaticlabs/prysm/v3/testing/assertions" + "github.com/prysmaticlabs/prysm/v4/testing/assertions" "github.com/sirupsen/logrus/hooks/test" ) diff --git a/testing/assertions/BUILD.bazel b/testing/assertions/BUILD.bazel index 16b0eda711f6..4c412e99502e 100644 --- a/testing/assertions/BUILD.bazel +++ b/testing/assertions/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["assertions.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/assertions", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/assertions", visibility = ["//visibility:public"], deps = [ "//encoding/ssz/equality:go_default_library", diff --git a/testing/assertions/assertions.go b/testing/assertions/assertions.go index e5ce3c1cdece..5a4af2385e49 100644 --- a/testing/assertions/assertions.go +++ b/testing/assertions/assertions.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/d4l3k/messagediff" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality" "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/proto" ) diff --git a/testing/assertions/assertions_test.go b/testing/assertions/assertions_test.go index 7e602e915a92..838f38c82733 100644 --- a/testing/assertions/assertions_test.go +++ b/testing/assertions/assertions_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - testpb "github.com/prysmaticlabs/prysm/v3/proto/testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/assertions" - "github.com/prysmaticlabs/prysm/v3/testing/require" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + testpb "github.com/prysmaticlabs/prysm/v4/proto/testing" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assertions" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/testing/benchmark/BUILD.bazel b/testing/benchmark/BUILD.bazel index 05487489947d..370b97b08153 100644 --- a/testing/benchmark/BUILD.bazel +++ b/testing/benchmark/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", srcs = ["pregen.go"], data = ["//testing/benchmark/benchmark_files:benchmark_data"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/benchmark", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/benchmark", visibility = ["//visibility:public"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/testing/benchmark/pregen.go b/testing/benchmark/pregen.go index 238a6566eae7..4b21c6a7c570 100644 --- a/testing/benchmark/pregen.go +++ b/testing/benchmark/pregen.go @@ -7,10 +7,10 @@ import ( "os" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ValidatorCount is for declaring how many validators the benchmarks will be diff --git a/testing/benchmark/pregen_test.go b/testing/benchmark/pregen_test.go index dee337f05bb1..1dd2ffb2736b 100644 --- a/testing/benchmark/pregen_test.go +++ b/testing/benchmark/pregen_test.go @@ -3,7 +3,7 @@ package benchmark import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestPreGenFullBlock(t *testing.T) { diff --git a/testing/bls/BUILD.bazel b/testing/bls/BUILD.bazel index 7d4f0be02913..ddedb9eb4108 100644 --- a/testing/bls/BUILD.bazel +++ b/testing/bls/BUILD.bazel @@ -46,6 +46,6 @@ go_library( "sign_test.yaml.go", "verify_test.yaml.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/bls", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/bls", visibility = ["//visibility:public"], ) diff --git a/testing/bls/aggregate_test.go b/testing/bls/aggregate_test.go index 6fb730892468..b69750a02c65 100644 --- a/testing/bls/aggregate_test.go +++ b/testing/bls/aggregate_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestAggregate(t *testing.T) { diff --git a/testing/bls/aggregate_verify_test.go b/testing/bls/aggregate_verify_test.go index 3412f0a6a89f..dc7a874793e9 100644 --- a/testing/bls/aggregate_verify_test.go +++ b/testing/bls/aggregate_verify_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestAggregateVerify(t *testing.T) { diff --git a/testing/bls/batch_verify_test.go b/testing/bls/batch_verify_test.go index 3228589fffbe..35ddc57da58e 100644 --- a/testing/bls/batch_verify_test.go +++ b/testing/bls/batch_verify_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBatchVerify(t *testing.T) { diff --git a/testing/bls/deserialization_G1_test.go b/testing/bls/deserialization_G1_test.go index a850585ffe98..b98f72fcb85e 100644 --- a/testing/bls/deserialization_G1_test.go +++ b/testing/bls/deserialization_G1_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDeserializationG1(t *testing.T) { diff --git a/testing/bls/deserialization_G2_test.go b/testing/bls/deserialization_G2_test.go index 47b59d42e538..5b63f739cd45 100644 --- a/testing/bls/deserialization_G2_test.go +++ b/testing/bls/deserialization_G2_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDeserializationG2(t *testing.T) { diff --git a/testing/bls/fast_aggregate_verify_test.go b/testing/bls/fast_aggregate_verify_test.go index 4055dabf0009..f671c8392e92 100644 --- a/testing/bls/fast_aggregate_verify_test.go +++ b/testing/bls/fast_aggregate_verify_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestFastAggregateVerify(t *testing.T) { diff --git a/testing/bls/hash_to_G2_test.go b/testing/bls/hash_to_G2_test.go index 41cdacb175f9..daa44b71cc80 100644 --- a/testing/bls/hash_to_G2_test.go +++ b/testing/bls/hash_to_G2_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" blst "github.com/supranational/blst/bindings/go" ) diff --git a/testing/bls/sign_test.go b/testing/bls/sign_test.go index d50d0713c5d6..a4104e5919e7 100644 --- a/testing/bls/sign_test.go +++ b/testing/bls/sign_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSign(t *testing.T) { diff --git a/testing/bls/utils/BUILD.bazel b/testing/bls/utils/BUILD.bazel index f372d391964e..533b138a6a48 100644 --- a/testing/bls/utils/BUILD.bazel +++ b/testing/bls/utils/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["utils.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/bls/utils", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/bls/utils", visibility = ["//testing/bls:__subpackages__"], deps = [ "//io/file:go_default_library", diff --git a/testing/bls/utils/utils.go b/testing/bls/utils/utils.go index 9805fc5fa983..7ceb802e2761 100644 --- a/testing/bls/utils/utils.go +++ b/testing/bls/utils/utils.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func RetrieveFiles(name string, t *testing.T) ([]string, [][]byte) { diff --git a/testing/bls/verify_test.go b/testing/bls/verify_test.go index 1d01d5049aff..7bfcdbcfba2b 100644 --- a/testing/bls/verify_test.go +++ b/testing/bls/verify_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/bls/utils" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/bls/utils" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestVerify(t *testing.T) { diff --git a/testing/endtoend/component_handler_test.go b/testing/endtoend/component_handler_test.go index b06e9e5bb96d..f58850e24d78 100644 --- a/testing/endtoend/component_handler_test.go +++ b/testing/endtoend/component_handler_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components/eth1" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components/eth1" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "golang.org/x/sync/errgroup" ) diff --git a/testing/endtoend/components/BUILD.bazel b/testing/endtoend/components/BUILD.bazel index e2782c58ed10..6d71d8bafa34 100644 --- a/testing/endtoend/components/BUILD.bazel +++ b/testing/endtoend/components/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "//testing/endtoend/static-files/eth1:eth1data", "@lighthouse//:lighthouse_bin", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components", visibility = ["//testing/endtoend:__subpackages__"], deps = [ "//beacon-chain/state:go_default_library", diff --git a/testing/endtoend/components/beacon_node.go b/testing/endtoend/components/beacon_node.go index d2f68af9c554..c390b012b81d 100644 --- a/testing/endtoend/components/beacon_node.go +++ b/testing/endtoend/components/beacon_node.go @@ -14,17 +14,17 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - cmdshared "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/flags" - "github.com/prysmaticlabs/prysm/v3/cmd/beacon-chain/sync/genesis" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + cmdshared "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/v4/cmd/beacon-chain/sync/genesis" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) var _ e2etypes.ComponentRunner = (*BeaconNode)(nil) diff --git a/testing/endtoend/components/boot_node.go b/testing/endtoend/components/boot_node.go index 51d896d28056..29509c050081 100644 --- a/testing/endtoend/components/boot_node.go +++ b/testing/endtoend/components/boot_node.go @@ -10,9 +10,9 @@ import ( "syscall" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) var _ e2etypes.ComponentRunner = (*BootNode)(nil) diff --git a/testing/endtoend/components/eth1/BUILD.bazel b/testing/endtoend/components/eth1/BUILD.bazel index d5994a296265..baad417e1b81 100644 --- a/testing/endtoend/components/eth1/BUILD.bazel +++ b/testing/endtoend/components/eth1/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "proxy.go", "transactions.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components/eth1", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components/eth1", visibility = ["//testing/endtoend:__subpackages__"], deps = [ "//beacon-chain/execution/testing:go_default_library", diff --git a/testing/endtoend/components/eth1/depositor.go b/testing/endtoend/components/eth1/depositor.go index 7e2b4f1f6491..8e8d4d74e00c 100644 --- a/testing/endtoend/components/eth1/depositor.go +++ b/testing/endtoend/components/eth1/depositor.go @@ -14,13 +14,13 @@ import ( gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/params" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/util" log "github.com/sirupsen/logrus" ) diff --git a/testing/endtoend/components/eth1/depositor_test.go b/testing/endtoend/components/eth1/depositor_test.go index 0ddd8dbf8699..d97a06afa31c 100644 --- a/testing/endtoend/components/eth1/depositor_test.go +++ b/testing/endtoend/components/eth1/depositor_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestComputeDeposits(t *testing.T) { diff --git a/testing/endtoend/components/eth1/helpers.go b/testing/endtoend/components/eth1/helpers.go index 82e7128b36b1..b14bcc7fb8e5 100644 --- a/testing/endtoend/components/eth1/helpers.go +++ b/testing/endtoend/components/eth1/helpers.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/keystore" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) // NetworkId is the ID of the ETH1 chain. diff --git a/testing/endtoend/components/eth1/miner.go b/testing/endtoend/components/eth1/miner.go index fd9a76a7b4c8..ac3d50da5f6c 100644 --- a/testing/endtoend/components/eth1/miner.go +++ b/testing/endtoend/components/eth1/miner.go @@ -16,13 +16,13 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - contracts "github.com/prysmaticlabs/prysm/v3/contracts/deposit" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + contracts "github.com/prysmaticlabs/prysm/v4/contracts/deposit" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" log "github.com/sirupsen/logrus" ) diff --git a/testing/endtoend/components/eth1/node.go b/testing/endtoend/components/eth1/node.go index 22998ddbf76a..7412a9009a29 100644 --- a/testing/endtoend/components/eth1/node.go +++ b/testing/endtoend/components/eth1/node.go @@ -13,12 +13,12 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution/testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution/testing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" log "github.com/sirupsen/logrus" ) diff --git a/testing/endtoend/components/eth1/node_set.go b/testing/endtoend/components/eth1/node_set.go index 9cff0b835657..3ba9368093c5 100644 --- a/testing/endtoend/components/eth1/node_set.go +++ b/testing/endtoend/components/eth1/node_set.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) // NodeSet represents a set of Eth1 nodes, none of which is a mining node. diff --git a/testing/endtoend/components/eth1/proxy.go b/testing/endtoend/components/eth1/proxy.go index f14b0cce5963..65425fb90f2e 100644 --- a/testing/endtoend/components/eth1/proxy.go +++ b/testing/endtoend/components/eth1/proxy.go @@ -10,11 +10,11 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - proxy "github.com/prysmaticlabs/prysm/v3/testing/middleware/engine-api-proxy" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + proxy "github.com/prysmaticlabs/prysm/v4/testing/middleware/engine-api-proxy" log "github.com/sirupsen/logrus" ) diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index bc593524f9c6..180b78d21022 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -16,9 +16,9 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" ) diff --git a/testing/endtoend/components/lighthouse_beacon.go b/testing/endtoend/components/lighthouse_beacon.go index 96da1eca96c7..a658e28124c5 100644 --- a/testing/endtoend/components/lighthouse_beacon.go +++ b/testing/endtoend/components/lighthouse_beacon.go @@ -13,11 +13,11 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) var _ e2etypes.ComponentRunner = (*LighthouseBeaconNode)(nil) diff --git a/testing/endtoend/components/lighthouse_validator.go b/testing/endtoend/components/lighthouse_validator.go index 9cbc1a7a5e9c..a5faf8b48081 100644 --- a/testing/endtoend/components/lighthouse_validator.go +++ b/testing/endtoend/components/lighthouse_validator.go @@ -14,14 +14,14 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/google/uuid" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" "golang.org/x/sync/errgroup" ) diff --git a/testing/endtoend/components/tracing_sink.go b/testing/endtoend/components/tracing_sink.go index f6c5b6de4f59..768af2149ce1 100644 --- a/testing/endtoend/components/tracing_sink.go +++ b/testing/endtoend/components/tracing_sink.go @@ -12,9 +12,9 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) var _ types.ComponentRunner = &TracingSink{} diff --git a/testing/endtoend/components/validator.go b/testing/endtoend/components/validator.go index 5ae0a58f10bd..d14121467356 100644 --- a/testing/endtoend/components/validator.go +++ b/testing/endtoend/components/validator.go @@ -15,17 +15,17 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - cmdshared "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validator_service_config "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + cmdshared "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validator_service_config "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) const DefaultFeeRecipientAddress = "0x099FB65722e7b2455043bfebF6177f1D2E9738d9" diff --git a/testing/endtoend/components/web3remotesigner.go b/testing/endtoend/components/web3remotesigner.go index 3006a3024157..45f28f91cdc6 100644 --- a/testing/endtoend/components/web3remotesigner.go +++ b/testing/endtoend/components/web3remotesigner.go @@ -18,12 +18,12 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "gopkg.in/yaml.v2" ) diff --git a/testing/endtoend/components/web3remotesigner_test.go b/testing/endtoend/components/web3remotesigner_test.go index a358f4a4653e..c22f150814d3 100644 --- a/testing/endtoend/components/web3remotesigner_test.go +++ b/testing/endtoend/components/web3remotesigner_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components" - e2eparams "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components" + e2eparams "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestWeb3RemoteSigner_StartsAndReturnsPublicKeys(t *testing.T) { diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index 818d7bb59b7a..83a7da2f340a 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -6,12 +6,12 @@ import ( "strconv" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ev "github.com/prysmaticlabs/prysm/v3/testing/endtoend/evaluators" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/evaluators/beaconapi_evaluators" - e2eParams "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + ev "github.com/prysmaticlabs/prysm/v4/testing/endtoend/evaluators" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/evaluators/beaconapi_evaluators" + e2eParams "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func e2eMinimal(t *testing.T, v int, cfgo ...types.E2EConfigOpt) *testRunner { diff --git a/testing/endtoend/endtoend_test.go b/testing/endtoend/endtoend_test.go index 12dc7ccef736..dc0e09718dca 100644 --- a/testing/endtoend/endtoend_test.go +++ b/testing/endtoend/endtoend_test.go @@ -15,28 +15,28 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/api/client/beacon" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/file" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + "github.com/prysmaticlabs/prysm/v4/api/client/beacon" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/file" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components/eth1" - ev "github.com/prysmaticlabs/prysm/v3/testing/endtoend/evaluators" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components/eth1" + ev "github.com/prysmaticlabs/prysm/v4/testing/endtoend/evaluators" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/require" log "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/testing/endtoend/evaluators/BUILD.bazel b/testing/endtoend/evaluators/BUILD.bazel index 309664f7f85b..6c33cbe2da43 100644 --- a/testing/endtoend/evaluators/BUILD.bazel +++ b/testing/endtoend/evaluators/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "slashing.go", "validator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/evaluators", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/evaluators", visibility = ["//testing/endtoend:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/endtoend/evaluators/api_gateway_v1alpha1.go b/testing/endtoend/evaluators/api_gateway_v1alpha1.go index e53685c87455..61a93d7a13ec 100644 --- a/testing/endtoend/evaluators/api_gateway_v1alpha1.go +++ b/testing/endtoend/evaluators/api_gateway_v1alpha1.go @@ -9,10 +9,10 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/api_middleware.go b/testing/endtoend/evaluators/api_middleware.go index 215c6ccdb9e8..4883994e6a9a 100644 --- a/testing/endtoend/evaluators/api_middleware.go +++ b/testing/endtoend/evaluators/api_middleware.go @@ -11,14 +11,14 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/beaconapi_evaluators/BUILD.bazel b/testing/endtoend/evaluators/beaconapi_evaluators/BUILD.bazel index da16bcf40540..e3b9e5e6eb33 100644 --- a/testing/endtoend/evaluators/beaconapi_evaluators/BUILD.bazel +++ b/testing/endtoend/evaluators/beaconapi_evaluators/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "beacon_api_verify.go", "util.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/evaluators/beaconapi_evaluators", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/evaluators/beaconapi_evaluators", visibility = ["//testing/endtoend:__subpackages__"], deps = [ "//beacon-chain/rpc/apimiddleware:go_default_library", diff --git a/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api.go b/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api.go index adac4e8f8cc5..ff02f9048c10 100644 --- a/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api.go +++ b/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api.go @@ -12,14 +12,14 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api_verify.go b/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api_verify.go index 09ff116b4c1f..7adb68474a2c 100644 --- a/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api_verify.go +++ b/testing/endtoend/evaluators/beaconapi_evaluators/beacon_api_verify.go @@ -1,8 +1,8 @@ package beaconapi_evaluators import ( - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/beaconapi_evaluators/util.go b/testing/endtoend/evaluators/beaconapi_evaluators/util.go index 1871e28c47b7..25a1bde81604 100644 --- a/testing/endtoend/evaluators/beaconapi_evaluators/util.go +++ b/testing/endtoend/evaluators/beaconapi_evaluators/util.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" log "github.com/sirupsen/logrus" ) diff --git a/testing/endtoend/evaluators/data.go b/testing/endtoend/evaluators/data.go index 7cf697d13065..7cc73a1f2f99 100644 --- a/testing/endtoend/evaluators/data.go +++ b/testing/endtoend/evaluators/data.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/execution_engine.go b/testing/endtoend/evaluators/execution_engine.go index 8d487e435210..c2b6e8f3501d 100644 --- a/testing/endtoend/evaluators/execution_engine.go +++ b/testing/endtoend/evaluators/execution_engine.go @@ -5,14 +5,14 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/fee_recipient.go b/testing/endtoend/evaluators/fee_recipient.go index d036a782ec0e..bbf77c843087 100644 --- a/testing/endtoend/evaluators/fee_recipient.go +++ b/testing/endtoend/evaluators/fee_recipient.go @@ -10,14 +10,14 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/components" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/components" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" log "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/testing/endtoend/evaluators/finality.go b/testing/endtoend/evaluators/finality.go index 6c6279c0bc25..0fa97d5793a6 100644 --- a/testing/endtoend/evaluators/finality.go +++ b/testing/endtoend/evaluators/finality.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/endtoend/evaluators/fork.go b/testing/endtoend/evaluators/fork.go index 0b9215fe4682..54d4499be03b 100644 --- a/testing/endtoend/evaluators/fork.go +++ b/testing/endtoend/evaluators/fork.go @@ -5,14 +5,14 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc" ) diff --git a/testing/endtoend/evaluators/metrics.go b/testing/endtoend/evaluators/metrics.go index 8153c10cdffc..1b96944e2db4 100644 --- a/testing/endtoend/evaluators/metrics.go +++ b/testing/endtoend/evaluators/metrics.go @@ -11,13 +11,13 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p" - "github.com/prysmaticlabs/prysm/v3/network/forks" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/v4/network/forks" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/endtoend/evaluators/node.go b/testing/endtoend/evaluators/node.go index c38fe970e698..5e881b29eaa0 100644 --- a/testing/endtoend/evaluators/node.go +++ b/testing/endtoend/evaluators/node.go @@ -11,11 +11,11 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/endtoend/evaluators/operations.go b/testing/endtoend/evaluators/operations.go index 5e3a08d1556b..8a75cb19d72a 100644 --- a/testing/endtoend/evaluators/operations.go +++ b/testing/endtoend/evaluators/operations.go @@ -8,22 +8,22 @@ import ( "strings" "github.com/pkg/errors" - corehelpers "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/detect" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/util" + corehelpers "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/detect" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/util" "golang.org/x/exp/rand" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/testing/endtoend/evaluators/peers.go b/testing/endtoend/evaluators/peers.go index 75c6d426fbba..a55a99f60df5 100644 --- a/testing/endtoend/evaluators/peers.go +++ b/testing/endtoend/evaluators/peers.go @@ -4,9 +4,9 @@ import ( "context" "github.com/pkg/errors" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/endtoend/evaluators/slashing.go b/testing/endtoend/evaluators/slashing.go index aacda5f538c9..f2fbc27edf31 100644 --- a/testing/endtoend/evaluators/slashing.go +++ b/testing/endtoend/evaluators/slashing.go @@ -6,19 +6,19 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - e2eTypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + e2eTypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/endtoend/evaluators/validator.go b/testing/endtoend/evaluators/validator.go index 56a7a25c7966..d3acb501fde9 100644 --- a/testing/endtoend/evaluators/validator.go +++ b/testing/endtoend/evaluators/validator.go @@ -5,20 +5,20 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers" - e2eparams "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers" + e2eparams "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/time/slots" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/endtoend/helpers/BUILD.bazel b/testing/endtoend/helpers/BUILD.bazel index c5a76201d491..5c11a7fb8d82 100644 --- a/testing/endtoend/helpers/BUILD.bazel +++ b/testing/endtoend/helpers/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "helpers.go", "keystore.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/helpers", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/helpers", visibility = ["//testing/endtoend:__subpackages__"], deps = [ "//config/params:go_default_library", diff --git a/testing/endtoend/helpers/epochTimer.go b/testing/endtoend/helpers/epochTimer.go index 82e3a7d82c80..3f60a636e669 100644 --- a/testing/endtoend/helpers/epochTimer.go +++ b/testing/endtoend/helpers/epochTimer.go @@ -3,7 +3,7 @@ package helpers import ( "time" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) // EpochTicker is a special ticker for timing epoch changes. diff --git a/testing/endtoend/helpers/helpers.go b/testing/endtoend/helpers/helpers.go index cc13dcd35d66..66a397ec689c 100644 --- a/testing/endtoend/helpers/helpers.go +++ b/testing/endtoend/helpers/helpers.go @@ -20,11 +20,11 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - e2e "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - e2etypes "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + e2e "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + e2etypes "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/testing/endtoend/mainnet_e2e_test.go b/testing/endtoend/mainnet_e2e_test.go index 9d550f1749e9..1fbce68a5792 100644 --- a/testing/endtoend/mainnet_e2e_test.go +++ b/testing/endtoend/mainnet_e2e_test.go @@ -3,9 +3,9 @@ package endtoend import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) // Run mainnet e2e config with the current release validator against latest beacon node. diff --git a/testing/endtoend/mainnet_scenario_e2e_test.go b/testing/endtoend/mainnet_scenario_e2e_test.go index 3f11d95e4afa..a9c97a44b23e 100644 --- a/testing/endtoend/mainnet_scenario_e2e_test.go +++ b/testing/endtoend/mainnet_scenario_e2e_test.go @@ -3,9 +3,9 @@ package endtoend import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) func TestEndToEnd_MultiScenarioRun_Multiclient(t *testing.T) { diff --git a/testing/endtoend/minimal_e2e_test.go b/testing/endtoend/minimal_e2e_test.go index 0dc8712f4a4a..c563593117bc 100644 --- a/testing/endtoend/minimal_e2e_test.go +++ b/testing/endtoend/minimal_e2e_test.go @@ -3,8 +3,8 @@ package endtoend import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) func TestEndToEnd_MinimalConfig(t *testing.T) { diff --git a/testing/endtoend/minimal_scenario_e2e_test.go b/testing/endtoend/minimal_scenario_e2e_test.go index 3a2ce3ee3802..02de57545d1e 100644 --- a/testing/endtoend/minimal_scenario_e2e_test.go +++ b/testing/endtoend/minimal_scenario_e2e_test.go @@ -3,8 +3,8 @@ package endtoend import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" ) func TestEndToEnd_MultiScenarioRun(t *testing.T) { diff --git a/testing/endtoend/minimal_slashing_e2e_test.go b/testing/endtoend/minimal_slashing_e2e_test.go index ac84e3475c54..f41eb2884d8b 100644 --- a/testing/endtoend/minimal_slashing_e2e_test.go +++ b/testing/endtoend/minimal_slashing_e2e_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ev "github.com/prysmaticlabs/prysm/v3/testing/endtoend/evaluators" - e2eParams "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params" - "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + ev "github.com/prysmaticlabs/prysm/v4/testing/endtoend/evaluators" + e2eParams "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params" + "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestEndToEnd_Slasher_MinimalConfig(t *testing.T) { diff --git a/testing/endtoend/params/BUILD.bazel b/testing/endtoend/params/BUILD.bazel index d5187d32a4f1..4f1129c27657 100644 --- a/testing/endtoend/params/BUILD.bazel +++ b/testing/endtoend/params/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "const.go", "params.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/params", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/params", visibility = ["//visibility:public"], deps = [ "//io/file:go_default_library", diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go index 67273f89fc19..73067784ea03 100644 --- a/testing/endtoend/params/params.go +++ b/testing/endtoend/params/params.go @@ -17,7 +17,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/bazelbuild/rules_go/go/tools/bazel" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/io/file" ) // params struct defines the parameters needed for running E2E tests to properly handle test sharding. diff --git a/testing/endtoend/params/params_test.go b/testing/endtoend/params/params_test.go index 11f3858d2d6d..b987781538e9 100644 --- a/testing/endtoend/params/params_test.go +++ b/testing/endtoend/params/params_test.go @@ -3,8 +3,8 @@ package params import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_port(t *testing.T) { diff --git a/testing/endtoend/policies/BUILD.bazel b/testing/endtoend/policies/BUILD.bazel index 3041fce8ec6d..91646a9fd3af 100644 --- a/testing/endtoend/policies/BUILD.bazel +++ b/testing/endtoend/policies/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["policies.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/policies", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/policies", visibility = ["//visibility:public"], deps = ["//consensus-types/primitives:go_default_library"], ) diff --git a/testing/endtoend/policies/policies.go b/testing/endtoend/policies/policies.go index 31c0385d5721..b5886de0a9c0 100644 --- a/testing/endtoend/policies/policies.go +++ b/testing/endtoend/policies/policies.go @@ -1,6 +1,6 @@ package policies -import "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" +import "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" // AfterNthEpoch runs for every epoch after the provided epoch. func AfterNthEpoch(afterEpoch primitives.Epoch) func(epoch primitives.Epoch) bool { diff --git a/testing/endtoend/slasher_simulator_e2e_test.go b/testing/endtoend/slasher_simulator_e2e_test.go index a383486b7258..87baea5c67dd 100644 --- a/testing/endtoend/slasher_simulator_e2e_test.go +++ b/testing/endtoend/slasher_simulator_e2e_test.go @@ -6,17 +6,17 @@ import ( "strconv" "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockslashings "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings/mock" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - slashersimulator "github.com/prysmaticlabs/prysm/v3/testing/slasher/simulator" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockslashings "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings/mock" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + slashersimulator "github.com/prysmaticlabs/prysm/v4/testing/slasher/simulator" + "github.com/prysmaticlabs/prysm/v4/testing/util" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/testing/endtoend/types/BUILD.bazel b/testing/endtoend/types/BUILD.bazel index 81cfd4bd4930..8c2bd716d8f3 100644 --- a/testing/endtoend/types/BUILD.bazel +++ b/testing/endtoend/types/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "fork.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/endtoend/types", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/endtoend/types", visibility = ["//testing/endtoend:__subpackages__"], deps = [ "//config/params:go_default_library", diff --git a/testing/endtoend/types/fork.go b/testing/endtoend/types/fork.go index e617126b79b8..aaca99b69352 100644 --- a/testing/endtoend/types/fork.go +++ b/testing/endtoend/types/fork.go @@ -3,8 +3,8 @@ package types import ( "fmt" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) func StartAt(v int, c *params.BeaconChainConfig) *params.BeaconChainConfig { diff --git a/testing/endtoend/types/types.go b/testing/endtoend/types/types.go index ba5afa58fda1..3ac1e3b52954 100644 --- a/testing/endtoend/types/types.go +++ b/testing/endtoend/types/types.go @@ -6,9 +6,9 @@ import ( "context" "os" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/grpc" ) diff --git a/testing/middleware/engine-api-proxy/BUILD.bazel b/testing/middleware/engine-api-proxy/BUILD.bazel index c28d6a51c7e5..bd9c715d53da 100644 --- a/testing/middleware/engine-api-proxy/BUILD.bazel +++ b/testing/middleware/engine-api-proxy/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "options.go", "proxy.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/middleware/engine-api-proxy", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/middleware/engine-api-proxy", visibility = ["//visibility:public"], deps = [ "//network:go_default_library", diff --git a/testing/middleware/engine-api-proxy/proxy.go b/testing/middleware/engine-api-proxy/proxy.go index 9b5886220ee9..176a3886de71 100644 --- a/testing/middleware/engine-api-proxy/proxy.go +++ b/testing/middleware/engine-api-proxy/proxy.go @@ -17,7 +17,7 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/network" + "github.com/prysmaticlabs/prysm/v4/network" "github.com/sirupsen/logrus" ) diff --git a/testing/middleware/engine-api-proxy/proxy_test.go b/testing/middleware/engine-api-proxy/proxy_test.go index 9daf24863e93..46ca9b828589 100644 --- a/testing/middleware/engine-api-proxy/proxy_test.go +++ b/testing/middleware/engine-api-proxy/proxy_test.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rpc" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/testing/mock/BUILD.bazel b/testing/mock/BUILD.bazel index ecf2a3df6f50..f48b94ebafd2 100644 --- a/testing/mock/BUILD.bazel +++ b/testing/mock/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "slasher_client_mock.go", "validator_client_mock.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/mock", visibility = ["//visibility:public"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/testing/mock/beacon_altair_validator_client_mock.go b/testing/mock/beacon_altair_validator_client_mock.go index bcf750e4f7e3..0ed036e67ce1 100644 --- a/testing/mock/beacon_altair_validator_client_mock.go +++ b/testing/mock/beacon_altair_validator_client_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" metadata "google.golang.org/grpc/metadata" ) diff --git a/testing/mock/beacon_altair_validator_server_mock.go b/testing/mock/beacon_altair_validator_server_mock.go index 94f39858e986..f3e07b4674a1 100644 --- a/testing/mock/beacon_altair_validator_server_mock.go +++ b/testing/mock/beacon_altair_validator_server_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" metadata "google.golang.org/grpc/metadata" ) diff --git a/testing/mock/beacon_chain_service_mock.go b/testing/mock/beacon_chain_service_mock.go index 3e281733e434..7ec78f832c57 100644 --- a/testing/mock/beacon_chain_service_mock.go +++ b/testing/mock/beacon_chain_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 (interfaces: BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" metadata "google.golang.org/grpc/metadata" ) diff --git a/testing/mock/beacon_service_mock.go b/testing/mock/beacon_service_mock.go index 7802d5c74705..ca3750896d3e 100644 --- a/testing/mock/beacon_service_mock.go +++ b/testing/mock/beacon_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 (interfaces: BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/testing/mock/beacon_validator_client_mock.go b/testing/mock/beacon_validator_client_mock.go index 0b4fdbfd6a65..b2321a60e6b5 100644 --- a/testing/mock/beacon_validator_client_mock.go +++ b/testing/mock/beacon_validator_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/testing/mock/beacon_validator_server_mock.go b/testing/mock/beacon_validator_server_mock.go index 6a9f3b3fe8c3..01cfdaec7232 100644 --- a/testing/mock/beacon_validator_server_mock.go +++ b/testing/mock/beacon_validator_server_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/mock/event_service_mock.go b/testing/mock/event_service_mock.go index 2a449503d262..3a1278332b47 100644 --- a/testing/mock/event_service_mock.go +++ b/testing/mock/event_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/eth/service (interfaces: EventsClient,Events_StreamEventsClient,Events_StreamEventsServer) +// Source: github.com/prysmaticlabs/prysm/v4/proto/eth/service (interfaces: EventsClient,Events_StreamEventsClient,Events_StreamEventsServer) // Package mock is a generated GoMock package. package mock @@ -10,8 +10,8 @@ import ( gomock "github.com/golang/mock/gomock" gateway "github.com/grpc-ecosystem/grpc-gateway/v2/proto/gateway" - service "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" + service "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" ) diff --git a/testing/mock/keymanager_mock.go b/testing/mock/keymanager_mock.go index 03f45b23015d..ffb342130542 100644 --- a/testing/mock/keymanager_mock.go +++ b/testing/mock/keymanager_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client (interfaces: RemoteSignerClient) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client (interfaces: RemoteSignerClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/mock/node_service_mock.go b/testing/mock/node_service_mock.go index 2e0dcf194497..ab8b62dfcdd8 100644 --- a/testing/mock/node_service_mock.go +++ b/testing/mock/node_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: NodeClient) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 (interfaces: NodeClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/mock/slasher_client_mock.go b/testing/mock/slasher_client_mock.go index a7e693c1fd60..c0b0b6729605 100644 --- a/testing/mock/slasher_client_mock.go +++ b/testing/mock/slasher_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: SlasherClient) +// Source: github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1 (interfaces: SlasherClient) // Package mock is a generated GoMock package. package mock @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" grpc "google.golang.org/grpc" ) diff --git a/testing/mock/validator_client_mock.go b/testing/mock/validator_client_mock.go index 0c4e7fd17ae1..542d0af96bc3 100644 --- a/testing/mock/validator_client_mock.go +++ b/testing/mock/validator_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/prysm/v3/validator/client/iface (interfaces: ValidatorClient) +// Source: github.com/prysmaticlabs/prysm/v4/validator/client/iface (interfaces: ValidatorClient) // Package mock is a generated GoMock package. package mock @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/require/BUILD.bazel b/testing/require/BUILD.bazel index 2b5f73748a21..0a2301909959 100644 --- a/testing/require/BUILD.bazel +++ b/testing/require/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["requires.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/require", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/require", visibility = ["//visibility:public"], deps = [ "//testing/assertions:go_default_library", diff --git a/testing/require/requires.go b/testing/require/requires.go index 0ec15cdc203a..84008c1a3f62 100644 --- a/testing/require/requires.go +++ b/testing/require/requires.go @@ -1,7 +1,7 @@ package require import ( - "github.com/prysmaticlabs/prysm/v3/testing/assertions" + "github.com/prysmaticlabs/prysm/v4/testing/assertions" "github.com/sirupsen/logrus/hooks/test" ) diff --git a/testing/slasher/simulator/BUILD.bazel b/testing/slasher/simulator/BUILD.bazel index 7fc78dd3de09..be1c40c5f541 100644 --- a/testing/slasher/simulator/BUILD.bazel +++ b/testing/slasher/simulator/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "block_generator.go", "simulator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/slasher/simulator", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/slasher/simulator", visibility = [ "//testing/endtoend:__subpackages__", ], diff --git a/testing/slasher/simulator/attestation_generator.go b/testing/slasher/simulator/attestation_generator.go index e2d9ba80137d..1a4719f91458 100644 --- a/testing/slasher/simulator/attestation_generator.go +++ b/testing/slasher/simulator/attestation_generator.go @@ -4,16 +4,16 @@ import ( "context" "math" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/testing/slasher/simulator/attestation_generator_test.go b/testing/slasher/simulator/attestation_generator_test.go index f53624f791de..b7096ca5f6a7 100644 --- a/testing/slasher/simulator/attestation_generator_test.go +++ b/testing/slasher/simulator/attestation_generator_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/slashings" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/slashings" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenerateAttestationsForSlot_Slashing(t *testing.T) { diff --git a/testing/slasher/simulator/block_generator.go b/testing/slasher/simulator/block_generator.go index 2d83a529996a..38059f62dda7 100644 --- a/testing/slasher/simulator/block_generator.go +++ b/testing/slasher/simulator/block_generator.go @@ -3,14 +3,14 @@ package simulator import ( "context" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (s *Simulator) generateBlockHeadersForSlot( diff --git a/testing/slasher/simulator/block_generator_test.go b/testing/slasher/simulator/block_generator_test.go index 5c8d4bc7e727..9c6900982aae 100644 --- a/testing/slasher/simulator/block_generator_test.go +++ b/testing/slasher/simulator/block_generator_test.go @@ -5,7 +5,7 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenerateBlockHeadersForSlot_Slashing(t *testing.T) { diff --git a/testing/slasher/simulator/simulator.go b/testing/slasher/simulator/simulator.go index 0624cd215e3e..b4ff3106caf7 100644 --- a/testing/slasher/simulator/simulator.go +++ b/testing/slasher/simulator/simulator.go @@ -5,20 +5,20 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed" - statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/slashings" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/slasher" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/sync" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed" + statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/slashings" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/slasher" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/testing/slasher/simulator/simulator_test.go b/testing/slasher/simulator/simulator_test.go index 3f653c9dde6d..392c6d71b546 100644 --- a/testing/slasher/simulator/simulator_test.go +++ b/testing/slasher/simulator/simulator_test.go @@ -3,14 +3,14 @@ package simulator import ( "testing" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - dbtest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - mockstategen "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen/mock" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + dbtest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + mockstategen "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen/mock" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func setupService(t *testing.T, params *Parameters) *Simulator { diff --git a/testing/spectest/general/phase0/bls/BUILD.bazel b/testing/spectest/general/phase0/bls/BUILD.bazel index 2a6de2be68f5..40a922d10c59 100644 --- a/testing/spectest/general/phase0/bls/BUILD.bazel +++ b/testing/spectest/general/phase0/bls/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "sign_test.yaml.go", "verify_test.yaml.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/general/phase0/bls", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/general/phase0/bls", visibility = ["//visibility:public"], ) diff --git a/testing/spectest/general/phase0/bls/aggregate_test.go b/testing/spectest/general/phase0/bls/aggregate_test.go index 52a86bfca00a..2d719f8c3b67 100644 --- a/testing/spectest/general/phase0/bls/aggregate_test.go +++ b/testing/spectest/general/phase0/bls/aggregate_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestAggregate(t *testing.T) { diff --git a/testing/spectest/general/phase0/bls/aggregate_verify_test.go b/testing/spectest/general/phase0/bls/aggregate_verify_test.go index 1574dd172f3c..2ac41eef7969 100644 --- a/testing/spectest/general/phase0/bls/aggregate_verify_test.go +++ b/testing/spectest/general/phase0/bls/aggregate_verify_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestAggregateVerify(t *testing.T) { diff --git a/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go b/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go index a91fac5be349..fd14d543fbaa 100644 --- a/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go +++ b/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestFastAggregateVerify(t *testing.T) { diff --git a/testing/spectest/general/phase0/bls/sign_test.go b/testing/spectest/general/phase0/bls/sign_test.go index a99b80fb707c..bb37fac88f6e 100644 --- a/testing/spectest/general/phase0/bls/sign_test.go +++ b/testing/spectest/general/phase0/bls/sign_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestSign(t *testing.T) { diff --git a/testing/spectest/general/phase0/bls/verify_test.go b/testing/spectest/general/phase0/bls/verify_test.go index c2ca45fc26f5..6ccd96cd7be2 100644 --- a/testing/spectest/general/phase0/bls/verify_test.go +++ b/testing/spectest/general/phase0/bls/verify_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/bls/common" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/bls/common" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestVerify(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go index 4602a5781380..2da62ab74782 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go index 2d6d2d29cc97..031f7fec97e2 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go b/testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go index a0590df20ffe..f2f9e6ec389c 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_HistoricalRootsUpdate(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go index 25d385db92ab..ece9ff094c98 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_InactivityUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go index 8fa1be7fea2f..596b7fa4b60a 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go index ba3bf20447e0..cc3fa4ed2386 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_ParticipationFlag(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go index dd7a40a385cd..3099616aaa2c 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go index ee716ca83254..c3d954051e50 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go index 07c2d919af13..54cef0b5163f 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go index 86bbd04b0fa1..21e9c682df78 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/epoch_processing/slashings_test.go b/testing/spectest/mainnet/altair/epoch_processing/slashings_test.go index 7ce779e9ad71..d4bf647619eb 100644 --- a/testing/spectest/mainnet/altair/epoch_processing/slashings_test.go +++ b/testing/spectest/mainnet/altair/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMainnet_Altair_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/finality/finality_test.go b/testing/spectest/mainnet/altair/finality/finality_test.go index 44f76b4c9228..235014672c0f 100644 --- a/testing/spectest/mainnet/altair/finality/finality_test.go +++ b/testing/spectest/mainnet/altair/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/finality" ) func TestMainnet_Altair_Finality(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go b/testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go index 8129b6fde0cd..d739a0c214f7 100644 --- a/testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go +++ b/testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go @@ -3,7 +3,7 @@ package fork_helper import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/fork" ) func TestMainnet_Altair_UpgradeToAltair(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/fork_transition/transition_test.go b/testing/spectest/mainnet/altair/fork_transition/transition_test.go index 9071a474ce5d..d00b0c02ab31 100644 --- a/testing/spectest/mainnet/altair/fork_transition/transition_test.go +++ b/testing/spectest/mainnet/altair/fork_transition/transition_test.go @@ -3,7 +3,7 @@ package fork_transition import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/fork" ) func TestMainnet_Altair_Transition(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go index 186c7c2cf242..be5d4c43be4a 100644 --- a/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go +++ b/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go @@ -3,8 +3,8 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice" ) func TestMainnet_Altair_Forkchoice(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/attestation_test.go b/testing/spectest/mainnet/altair/operations/attestation_test.go index 4635db21f6f1..fa8e70b989a7 100644 --- a/testing/spectest/mainnet/altair/operations/attestation_test.go +++ b/testing/spectest/mainnet/altair/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/attester_slashing_test.go b/testing/spectest/mainnet/altair/operations/attester_slashing_test.go index 6e037e4d6ae0..950d8f4fc1ac 100644 --- a/testing/spectest/mainnet/altair/operations/attester_slashing_test.go +++ b/testing/spectest/mainnet/altair/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/block_header_test.go b/testing/spectest/mainnet/altair/operations/block_header_test.go index 096a251b3dec..7a3c0495d118 100644 --- a/testing/spectest/mainnet/altair/operations/block_header_test.go +++ b/testing/spectest/mainnet/altair/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/deposit_test.go b/testing/spectest/mainnet/altair/operations/deposit_test.go index 2b553a891e11..8018ebc12690 100644 --- a/testing/spectest/mainnet/altair/operations/deposit_test.go +++ b/testing/spectest/mainnet/altair/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/proposer_slashing_test.go b/testing/spectest/mainnet/altair/operations/proposer_slashing_test.go index b715a9c3c315..1517c6743443 100644 --- a/testing/spectest/mainnet/altair/operations/proposer_slashing_test.go +++ b/testing/spectest/mainnet/altair/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/sync_committee_test.go b/testing/spectest/mainnet/altair/operations/sync_committee_test.go index 4b88db5256e5..d21657f090a0 100644 --- a/testing/spectest/mainnet/altair/operations/sync_committee_test.go +++ b/testing/spectest/mainnet/altair/operations/sync_committee_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_SyncCommittee(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/operations/voluntary_exit_test.go b/testing/spectest/mainnet/altair/operations/voluntary_exit_test.go index 831542402880..f173cc62f95d 100644 --- a/testing/spectest/mainnet/altair/operations/voluntary_exit_test.go +++ b/testing/spectest/mainnet/altair/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMainnet_Altair_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/random/random_test.go b/testing/spectest/mainnet/altair/random/random_test.go index 3e99295b32bc..169eac9df462 100644 --- a/testing/spectest/mainnet/altair/random/random_test.go +++ b/testing/spectest/mainnet/altair/random/random_test.go @@ -3,7 +3,7 @@ package random import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity" ) func TestMainnet_Altair_Random(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/rewards/rewards_test.go b/testing/spectest/mainnet/altair/rewards/rewards_test.go index ff58b28d53b3..5b7c8ace1aa1 100644 --- a/testing/spectest/mainnet/altair/rewards/rewards_test.go +++ b/testing/spectest/mainnet/altair/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/rewards" ) func TestMainnet_Altair_Rewards(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/sanity/blocks_test.go b/testing/spectest/mainnet/altair/sanity/blocks_test.go index 65b8e08639bf..92140f37b8f9 100644 --- a/testing/spectest/mainnet/altair/sanity/blocks_test.go +++ b/testing/spectest/mainnet/altair/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity" ) func TestMainnet_Altair_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/sanity/slots_test.go b/testing/spectest/mainnet/altair/sanity/slots_test.go index b93ce27476a8..56a9397fb204 100644 --- a/testing/spectest/mainnet/altair/sanity/slots_test.go +++ b/testing/spectest/mainnet/altair/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity" ) func TestMainnet_Altair_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go index bba5702dff1b..0d6260734aea 100644 --- a/testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go +++ b/testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/ssz_static" ) func TestMainnet_Altair_SSZStatic(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go index 0de95a765bfc..49c1fc51a1af 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go index bb62b4724fb3..dfa6df625e5d 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go index 628774852ef6..757403931ac4 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_HistoricalRootsUpdate(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go index 09af397d5c69..c0205f6bd4c8 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_InactivityUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go index 5045adae0d6c..29706fc8723e 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go index ab3e939a1ab3..69a0433b2def 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_ParticipationFlag(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go index 5a3063ceff41..93d0c703ad31 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go index 57f595c8b29d..1c58628dbd88 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go index 29cb7ff131a8..008661b68769 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go index 863237c7831a..b04bb9456f5f 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go b/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go index 2b817d0d89af..8e76ab985ee3 100644 --- a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go +++ b/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMainnet_Bellatrix_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/finality/finality_test.go b/testing/spectest/mainnet/bellatrix/finality/finality_test.go index 4fd075badc4e..d5af7d718cee 100644 --- a/testing/spectest/mainnet/bellatrix/finality/finality_test.go +++ b/testing/spectest/mainnet/bellatrix/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/finality" ) func TestMainnet_Bellatrix_Finality(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go b/testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go index 8e5f1e18289a..7368a1acbcdd 100644 --- a/testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go +++ b/testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go @@ -3,7 +3,7 @@ package fork_helper import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/fork" ) func TestMainnet_Bellatrix_UpgradeToBellatrix(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go b/testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go index 8ed24df5e7c4..57622e1d9a39 100644 --- a/testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go +++ b/testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go @@ -3,7 +3,7 @@ package fork_transition import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/fork" ) func TestMainnet_Bellatrix_Transition(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go index 095c83972a59..6e4d73568902 100644 --- a/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go +++ b/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go @@ -3,8 +3,8 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice" ) func TestMainnet_Bellatrix_Forkchoice(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/attestation_test.go b/testing/spectest/mainnet/bellatrix/operations/attestation_test.go index 1b9aa1f07a48..265fad4e43a1 100644 --- a/testing/spectest/mainnet/bellatrix/operations/attestation_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go b/testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go index 28cb50739308..85be01e295d0 100644 --- a/testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/block_header_test.go b/testing/spectest/mainnet/bellatrix/operations/block_header_test.go index 5fb4d103db7d..f61120c3da20 100644 --- a/testing/spectest/mainnet/bellatrix/operations/block_header_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/deposit_test.go b/testing/spectest/mainnet/bellatrix/operations/deposit_test.go index 9e0ed8214eb7..9bf96a1c1259 100644 --- a/testing/spectest/mainnet/bellatrix/operations/deposit_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go b/testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go index 2d3d0d811d2e..981fcab0d2ef 100644 --- a/testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go b/testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go index 7b7fd85e5b64..7a9033018caa 100644 --- a/testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_SyncCommittee(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go b/testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go index 43f26162e737..e06aad9a5c74 100644 --- a/testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go +++ b/testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMainnet_Bellatrix_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/rewards/rewards_test.go b/testing/spectest/mainnet/bellatrix/rewards/rewards_test.go index ff09f75de081..e8c34d81176f 100644 --- a/testing/spectest/mainnet/bellatrix/rewards/rewards_test.go +++ b/testing/spectest/mainnet/bellatrix/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/rewards" ) func TestMainnet_Bellatrix_Rewards(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/sanity/blocks_test.go b/testing/spectest/mainnet/bellatrix/sanity/blocks_test.go index eab4566ad398..5741644c1448 100644 --- a/testing/spectest/mainnet/bellatrix/sanity/blocks_test.go +++ b/testing/spectest/mainnet/bellatrix/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/sanity" ) func TestMainnet_Bellatrix_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/sanity/slots_test.go b/testing/spectest/mainnet/bellatrix/sanity/slots_test.go index 7ff0ae94ac73..782751c715f5 100644 --- a/testing/spectest/mainnet/bellatrix/sanity/slots_test.go +++ b/testing/spectest/mainnet/bellatrix/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/sanity" ) func TestMainnet_Bellatrix_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go index bef5dd40efa2..cf4bdc5bc23f 100644 --- a/testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go +++ b/testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/ssz_static" ) func TestMainnet_Bellatrix_SSZStatic(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go index 6ee861862b7f..d9aa8bc50296 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go index f7bd4e7bb0e5..7fc6c420bdfc 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go b/testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go index 9f2276a2db0a..d60ae4c61bc9 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_HistoricalSummariesUpdate(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go index ce757a5ea9f6..cff2075c1974 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_InactivityUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go index 4a550782b579..61d00c3d1b1a 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go index 3f80c00141ce..38e63fc4c04c 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_ParticipationFlag(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go index 6cff53115456..6f565ceeb5fa 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go index 216bc41b1c94..77da993f3aee 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go index 4253321f035f..f19a114010a3 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go index 141e6ad31596..d20908e7d8ac 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/epoch_processing/slashings_test.go b/testing/spectest/mainnet/capella/epoch_processing/slashings_test.go index 6dc7b082f5a8..2db1f1274e85 100644 --- a/testing/spectest/mainnet/capella/epoch_processing/slashings_test.go +++ b/testing/spectest/mainnet/capella/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMainnet_Capella_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/finality/finality_test.go b/testing/spectest/mainnet/capella/finality/finality_test.go index 9cd7a743248e..7a64cdbb08a9 100644 --- a/testing/spectest/mainnet/capella/finality/finality_test.go +++ b/testing/spectest/mainnet/capella/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/finality" ) func TestMainnet_Capella_Finality(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go b/testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go index 7461ed380622..253c0f76f6a2 100644 --- a/testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go +++ b/testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go @@ -3,7 +3,7 @@ package fork_helper import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/fork" ) func TestMainnet_Capella_UpgradeToCapella(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/fork_transition/transition_test.go b/testing/spectest/mainnet/capella/fork_transition/transition_test.go index 0862aa8f8701..f07f1af6a1ae 100644 --- a/testing/spectest/mainnet/capella/fork_transition/transition_test.go +++ b/testing/spectest/mainnet/capella/fork_transition/transition_test.go @@ -3,7 +3,7 @@ package fork_transition import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/fork" ) func TestMainnet_Capella_Transition(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go index 535e633b9063..f9de5ccee5b2 100644 --- a/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go +++ b/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go @@ -3,8 +3,8 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice" ) func TestMainnet_Capella_Forkchoice(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/attestation_test.go b/testing/spectest/mainnet/capella/operations/attestation_test.go index 48d8611cc3f3..538692cf8ad9 100644 --- a/testing/spectest/mainnet/capella/operations/attestation_test.go +++ b/testing/spectest/mainnet/capella/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/attester_slashing_test.go b/testing/spectest/mainnet/capella/operations/attester_slashing_test.go index 987477ad7d29..f447219f1b85 100644 --- a/testing/spectest/mainnet/capella/operations/attester_slashing_test.go +++ b/testing/spectest/mainnet/capella/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/block_header_test.go b/testing/spectest/mainnet/capella/operations/block_header_test.go index da08f0d967d4..d3f45fe06824 100644 --- a/testing/spectest/mainnet/capella/operations/block_header_test.go +++ b/testing/spectest/mainnet/capella/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/deposit_test.go b/testing/spectest/mainnet/capella/operations/deposit_test.go index bcae9030895c..6a50bb86604c 100644 --- a/testing/spectest/mainnet/capella/operations/deposit_test.go +++ b/testing/spectest/mainnet/capella/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/proposer_slashing_test.go b/testing/spectest/mainnet/capella/operations/proposer_slashing_test.go index b00e9f5d5ae1..7039ffae9e4f 100644 --- a/testing/spectest/mainnet/capella/operations/proposer_slashing_test.go +++ b/testing/spectest/mainnet/capella/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/sync_committee_test.go b/testing/spectest/mainnet/capella/operations/sync_committee_test.go index f975d5526405..651a4096da8f 100644 --- a/testing/spectest/mainnet/capella/operations/sync_committee_test.go +++ b/testing/spectest/mainnet/capella/operations/sync_committee_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_SyncCommittee(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/operations/voluntary_exit_test.go b/testing/spectest/mainnet/capella/operations/voluntary_exit_test.go index a68581737a91..ea891e628b90 100644 --- a/testing/spectest/mainnet/capella/operations/voluntary_exit_test.go +++ b/testing/spectest/mainnet/capella/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMainnet_Capella_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/rewards/rewards_test.go b/testing/spectest/mainnet/capella/rewards/rewards_test.go index ea9067acf97e..7741d3f913da 100644 --- a/testing/spectest/mainnet/capella/rewards/rewards_test.go +++ b/testing/spectest/mainnet/capella/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/rewards" ) func TestMainnet_Capella_Rewards(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/sanity/blocks_test.go b/testing/spectest/mainnet/capella/sanity/blocks_test.go index b470517f1972..864f3e13046e 100644 --- a/testing/spectest/mainnet/capella/sanity/blocks_test.go +++ b/testing/spectest/mainnet/capella/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/sanity" ) func TestMainnet_Capella_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/sanity/slots_test.go b/testing/spectest/mainnet/capella/sanity/slots_test.go index 738dbf6c57b0..b571608fcf6a 100644 --- a/testing/spectest/mainnet/capella/sanity/slots_test.go +++ b/testing/spectest/mainnet/capella/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/sanity" ) func TestMainnet_Capella_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go index aab569c83b64..cbb45fee45b2 100644 --- a/testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go +++ b/testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/ssz_static" ) func TestMainnet_Capella_SSZStatic(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go index 1eb9e80fb526..b7251d528040 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go b/testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go index 86f18374102f..c61c832769e0 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func TestMain(m *testing.M) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go index 017ebd407329..204a9fef3ef8 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go b/testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go index cc96fbec5f8f..a0e4dd15c6a3 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_HistoricalRootsUpdate(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go index f02e4426443d..7d2807c6dd5f 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go b/testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go index ff066b54c33a..25cf7cbbca86 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_ParticipationRecordUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go index 05833995157e..3cdbab572f3e 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go index e1c050189fde..b726a74669fe 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go index aeb14cdb67e5..cb700afaa335 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go index b25804900612..aee2d436f125 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go b/testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go index 19341e8f7d75..6c0210351ddc 100644 --- a/testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go +++ b/testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMainnet_Phase0_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/finality/finality_test.go b/testing/spectest/mainnet/phase0/finality/finality_test.go index 7b8901b75a82..bff19cdbaea4 100644 --- a/testing/spectest/mainnet/phase0/finality/finality_test.go +++ b/testing/spectest/mainnet/phase0/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/finality" ) func TestMainnet_Phase0_Finality(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/operations/attestation_test.go b/testing/spectest/mainnet/phase0/operations/attestation_test.go index eebf5e172322..86cc9a13e1b8 100644 --- a/testing/spectest/mainnet/phase0/operations/attestation_test.go +++ b/testing/spectest/mainnet/phase0/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMainnet_Phase0_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/operations/attester_slashing_test.go b/testing/spectest/mainnet/phase0/operations/attester_slashing_test.go index cf12bceab54f..cb2525fb75d8 100644 --- a/testing/spectest/mainnet/phase0/operations/attester_slashing_test.go +++ b/testing/spectest/mainnet/phase0/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMainnet_Phase0_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/operations/block_header_test.go b/testing/spectest/mainnet/phase0/operations/block_header_test.go index de9bad438e8f..07b230f9c212 100644 --- a/testing/spectest/mainnet/phase0/operations/block_header_test.go +++ b/testing/spectest/mainnet/phase0/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMainnet_Phase0_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/operations/deposit_test.go b/testing/spectest/mainnet/phase0/operations/deposit_test.go index e715929d6f0c..ae7e04635f83 100644 --- a/testing/spectest/mainnet/phase0/operations/deposit_test.go +++ b/testing/spectest/mainnet/phase0/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMainnet_Phase0_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go b/testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go index 6810ceb721b7..24a2254dd73d 100644 --- a/testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go +++ b/testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMainnet_Phase0_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go b/testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go index b274c9b2f72c..4c06039b2c65 100644 --- a/testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go +++ b/testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMainnet_Phase0_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/random/random_test.go b/testing/spectest/mainnet/phase0/random/random_test.go index b3f1e11150b4..27f337938cc8 100644 --- a/testing/spectest/mainnet/phase0/random/random_test.go +++ b/testing/spectest/mainnet/phase0/random/random_test.go @@ -3,7 +3,7 @@ package random import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity" ) func TestMainnet_Phase0_Random(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/rewards/rewards_test.go b/testing/spectest/mainnet/phase0/rewards/rewards_test.go index c7e66bcb1f5e..bc7401910f2f 100644 --- a/testing/spectest/mainnet/phase0/rewards/rewards_test.go +++ b/testing/spectest/mainnet/phase0/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/rewards" ) func TestMainnet_Phase0_Rewards(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/sanity/blocks_test.go b/testing/spectest/mainnet/phase0/sanity/blocks_test.go index 80eb6338b808..30c95ea06ab9 100644 --- a/testing/spectest/mainnet/phase0/sanity/blocks_test.go +++ b/testing/spectest/mainnet/phase0/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity" ) func TestMainnet_Phase0_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/sanity/slots_test.go b/testing/spectest/mainnet/phase0/sanity/slots_test.go index fe9531d86540..b51727a0aa23 100644 --- a/testing/spectest/mainnet/phase0/sanity/slots_test.go +++ b/testing/spectest/mainnet/phase0/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity" ) func TestMainnet_Phase0_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go b/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go index 1e4a1cfc09b0..a1af6ee4ea97 100644 --- a/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go +++ b/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go @@ -3,7 +3,7 @@ package shuffle import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/shuffling/core/shuffle" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/shuffling/core/shuffle" ) func TestMainnet_Phase0_Shuffling_Core_Shuffle(t *testing.T) { diff --git a/testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go index 29489aa01b64..23d04b0dd593 100644 --- a/testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go +++ b/testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/ssz_static" ) func TestMainnet_Phase0_SSZStatic(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go index 1ac8e581ecfa..161ffcf35233 100644 --- a/testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go index 5d80739d84be..a0562d665387 100644 --- a/testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go b/testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go index e7c3e17239e2..a8a5414c8800 100644 --- a/testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_HistoricalRootsUpdate(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go index c3b3ae994669..40a2763af333 100644 --- a/testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_InactivityUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go index 6e1fa03cdba3..9f2bfe635c1b 100644 --- a/testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go index 87dfdb8b94cf..9a700a394a03 100644 --- a/testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_ParticipationFlag(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go index 5b5a48476cb9..51be46c2c8de 100644 --- a/testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go index b6cf9676a5c7..a8d623585993 100644 --- a/testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go index 0cc6170f543b..5f256df558bd 100644 --- a/testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go index 9b1bf0c64f9b..b9abaaa054e1 100644 --- a/testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/minimal/altair/epoch_processing/slashings_test.go b/testing/spectest/minimal/altair/epoch_processing/slashings_test.go index 7ea4ebb1f898..1b36de8c5bd4 100644 --- a/testing/spectest/minimal/altair/epoch_processing/slashings_test.go +++ b/testing/spectest/minimal/altair/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing" ) func TestMinimal_Altair_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/minimal/altair/finality/finality_test.go b/testing/spectest/minimal/altair/finality/finality_test.go index 98b8f555ce25..b6a1547d4f39 100644 --- a/testing/spectest/minimal/altair/finality/finality_test.go +++ b/testing/spectest/minimal/altair/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/finality" ) func TestMinimal_Altair_Finality(t *testing.T) { diff --git a/testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go b/testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go index bf4ea221a5b4..25169027a7b8 100644 --- a/testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go +++ b/testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go @@ -3,7 +3,7 @@ package fork import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/fork" ) func TestMinimal_Altair_UpgradeToAltair(t *testing.T) { diff --git a/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go b/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go index 6d6bdebcdc0d..1efba9c36457 100644 --- a/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go +++ b/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go @@ -3,8 +3,8 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice" ) func TestMinimal_Altair_Forkchoice(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/attestation_test.go b/testing/spectest/minimal/altair/operations/attestation_test.go index 38003522f27e..d685cec80b33 100644 --- a/testing/spectest/minimal/altair/operations/attestation_test.go +++ b/testing/spectest/minimal/altair/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/attester_slashing_test.go b/testing/spectest/minimal/altair/operations/attester_slashing_test.go index eec7a225910e..634b46d897f2 100644 --- a/testing/spectest/minimal/altair/operations/attester_slashing_test.go +++ b/testing/spectest/minimal/altair/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/block_header_test.go b/testing/spectest/minimal/altair/operations/block_header_test.go index 3e9566a27022..cfe0ed7eb548 100644 --- a/testing/spectest/minimal/altair/operations/block_header_test.go +++ b/testing/spectest/minimal/altair/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/deposit_test.go b/testing/spectest/minimal/altair/operations/deposit_test.go index 30d702ddb696..4f1c1980e240 100644 --- a/testing/spectest/minimal/altair/operations/deposit_test.go +++ b/testing/spectest/minimal/altair/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/proposer_slashing_test.go b/testing/spectest/minimal/altair/operations/proposer_slashing_test.go index 68cee0458f19..1e5ddc399140 100644 --- a/testing/spectest/minimal/altair/operations/proposer_slashing_test.go +++ b/testing/spectest/minimal/altair/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/sync_committee_test.go b/testing/spectest/minimal/altair/operations/sync_committee_test.go index c76688afac14..6abdac6fcf27 100644 --- a/testing/spectest/minimal/altair/operations/sync_committee_test.go +++ b/testing/spectest/minimal/altair/operations/sync_committee_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_SyncCommittee(t *testing.T) { diff --git a/testing/spectest/minimal/altair/operations/voluntary_exit_test.go b/testing/spectest/minimal/altair/operations/voluntary_exit_test.go index 31d4c10d3ecb..2420e7127d87 100644 --- a/testing/spectest/minimal/altair/operations/voluntary_exit_test.go +++ b/testing/spectest/minimal/altair/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations" ) func TestMinimal_Altair_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/minimal/altair/random/random_test.go b/testing/spectest/minimal/altair/random/random_test.go index fd79655138fb..9f4a0d9a6835 100644 --- a/testing/spectest/minimal/altair/random/random_test.go +++ b/testing/spectest/minimal/altair/random/random_test.go @@ -3,7 +3,7 @@ package random import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity" ) func TestMinimal_Altair_Random(t *testing.T) { diff --git a/testing/spectest/minimal/altair/rewards/rewards_test.go b/testing/spectest/minimal/altair/rewards/rewards_test.go index 9df3ca593cbc..417ac6e7b75b 100644 --- a/testing/spectest/minimal/altair/rewards/rewards_test.go +++ b/testing/spectest/minimal/altair/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/rewards" ) func TestMinimal_Altair_Rewards(t *testing.T) { diff --git a/testing/spectest/minimal/altair/sanity/blocks_test.go b/testing/spectest/minimal/altair/sanity/blocks_test.go index 067643b2f35f..424afa6701dd 100644 --- a/testing/spectest/minimal/altair/sanity/blocks_test.go +++ b/testing/spectest/minimal/altair/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity" ) func TestMinimal_Altair_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/minimal/altair/sanity/slots_test.go b/testing/spectest/minimal/altair/sanity/slots_test.go index 2711b815a53f..a259e4e5908f 100644 --- a/testing/spectest/minimal/altair/sanity/slots_test.go +++ b/testing/spectest/minimal/altair/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity" ) func TestMinimal_Altair_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/minimal/altair/ssz_static/ssz_static_test.go b/testing/spectest/minimal/altair/ssz_static/ssz_static_test.go index 29464e5bf207..d201ece6f44e 100644 --- a/testing/spectest/minimal/altair/ssz_static/ssz_static_test.go +++ b/testing/spectest/minimal/altair/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/ssz_static" ) func TestMinimal_Altair_SSZStatic(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go index 9f2bf4310848..2f748a9faea6 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go index c06f46f1809d..b9190da203d9 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go index 0a54bc305202..eea899f535f9 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_HistoricalRootsUpdate(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go index 56d87dc81dcd..5940b545764a 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_InactivityUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go index 2ca6f4f40a95..5715833271b4 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go index 886d66843df1..c7c4efe7de13 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_ParticipationFlag(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go index 075c9d7c34f9..970d3ea10330 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go index 058ee14facc3..283e5766a46d 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go index fbecd3e5668e..02fc5043b5cc 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go index ef5cd871800b..657239908808 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go b/testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go index c0e95c30360c..e1fc5b5d2dfb 100644 --- a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go +++ b/testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing" ) func TestMinimal_Bellatrix_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/finality/finality_test.go b/testing/spectest/minimal/bellatrix/finality/finality_test.go index e7e7ecc6ba02..1e08ba2b5f2b 100644 --- a/testing/spectest/minimal/bellatrix/finality/finality_test.go +++ b/testing/spectest/minimal/bellatrix/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/finality" ) func TestMinimal_Bellatrix_Finality(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go b/testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go index 123f4222a7df..5b0c020ea96c 100644 --- a/testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go +++ b/testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go @@ -3,7 +3,7 @@ package fork import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/fork" ) func TestMinimal_Bellatrix_UpgradeToBellatrix(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go b/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go index 5cc2d5c80fc4..2d55364be6e6 100644 --- a/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go +++ b/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go @@ -3,8 +3,8 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice" ) func TestMinimal_Bellatrix_Forkchoice(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/attestation_test.go b/testing/spectest/minimal/bellatrix/operations/attestation_test.go index fea47a2ab30d..b27140d7c067 100644 --- a/testing/spectest/minimal/bellatrix/operations/attestation_test.go +++ b/testing/spectest/minimal/bellatrix/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go b/testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go index 610cd84be789..24be676918f9 100644 --- a/testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go +++ b/testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/block_header_test.go b/testing/spectest/minimal/bellatrix/operations/block_header_test.go index 14f9af9c0a64..2b7bc405d169 100644 --- a/testing/spectest/minimal/bellatrix/operations/block_header_test.go +++ b/testing/spectest/minimal/bellatrix/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/deposit_test.go b/testing/spectest/minimal/bellatrix/operations/deposit_test.go index 92dbe3eb0431..36cefca4e6b5 100644 --- a/testing/spectest/minimal/bellatrix/operations/deposit_test.go +++ b/testing/spectest/minimal/bellatrix/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go b/testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go index e6439a4c4741..f2008c8cd37f 100644 --- a/testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go +++ b/testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/sync_committee_test.go b/testing/spectest/minimal/bellatrix/operations/sync_committee_test.go index a9c50077a9d3..8b00f0883ace 100644 --- a/testing/spectest/minimal/bellatrix/operations/sync_committee_test.go +++ b/testing/spectest/minimal/bellatrix/operations/sync_committee_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_SyncCommittee(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go b/testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go index 95b04fc12d39..339c93460173 100644 --- a/testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go +++ b/testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations" ) func TestMinimal_Bellatrix_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/rewards/rewards_test.go b/testing/spectest/minimal/bellatrix/rewards/rewards_test.go index e3df2759c122..5c8423e9b961 100644 --- a/testing/spectest/minimal/bellatrix/rewards/rewards_test.go +++ b/testing/spectest/minimal/bellatrix/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/rewards" ) func TestMinimal_Bellatrix_Rewards(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/sanity/blocks_test.go b/testing/spectest/minimal/bellatrix/sanity/blocks_test.go index 0af4ba15e0c2..acf719103512 100644 --- a/testing/spectest/minimal/bellatrix/sanity/blocks_test.go +++ b/testing/spectest/minimal/bellatrix/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/sanity" ) func TestMinimal_Bellatrix_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/sanity/slots_test.go b/testing/spectest/minimal/bellatrix/sanity/slots_test.go index f7bcec5ac2a6..3916cb6f1f20 100644 --- a/testing/spectest/minimal/bellatrix/sanity/slots_test.go +++ b/testing/spectest/minimal/bellatrix/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/sanity" ) func TestMinimal_Bellatrix_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go b/testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go index 9dda27ac4138..fce06ba2a867 100644 --- a/testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go +++ b/testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/ssz_static" ) func TestMinimal_Bellatrix_SSZStatic(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go index 95e0b5298355..5a1e6dcffb30 100644 --- a/testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go index c17f95cb84f1..31e7bcede998 100644 --- a/testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go b/testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go index 0cc80c6b4efb..00f4c8d0e46e 100644 --- a/testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_HistoricalSummariesUpdate(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go index 368ce0e9417d..d37261aa434b 100644 --- a/testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_InactivityUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go index 8e0401069325..1428bd36f435 100644 --- a/testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go index e565ba91882b..15943f818149 100644 --- a/testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_ParticipationFlag(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go index 8e318f1dfd90..3e6d70791120 100644 --- a/testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go index 10267ac2789a..696df9324ca0 100644 --- a/testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go index 3434b0bf97be..ba5b03ef0340 100644 --- a/testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go index b208e2305dc4..f368cfc5a06c 100644 --- a/testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/minimal/capella/epoch_processing/slashings_test.go b/testing/spectest/minimal/capella/epoch_processing/slashings_test.go index 9d90af5bcc38..bca8a7e2d03f 100644 --- a/testing/spectest/minimal/capella/epoch_processing/slashings_test.go +++ b/testing/spectest/minimal/capella/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing" ) func TestMinimal_Capella_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/minimal/capella/finality/finality_test.go b/testing/spectest/minimal/capella/finality/finality_test.go index ba50ab407959..c04f80c12b99 100644 --- a/testing/spectest/minimal/capella/finality/finality_test.go +++ b/testing/spectest/minimal/capella/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/finality" ) func TestMinimal_Capella_Finality(t *testing.T) { diff --git a/testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go b/testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go index 729b2c1fabd7..06b246ca8472 100644 --- a/testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go +++ b/testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go @@ -3,7 +3,7 @@ package fork import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/fork" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/fork" ) func TestMinimal_Capella_UpgradeToCapella(t *testing.T) { diff --git a/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go b/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go index 9cca8428c8a0..a67eb0cb78c6 100644 --- a/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go +++ b/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go @@ -3,8 +3,8 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice" ) func TestMinimal_Capella_Forkchoice(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/attestation_test.go b/testing/spectest/minimal/capella/operations/attestation_test.go index ea66ae205301..93fb3027da2c 100644 --- a/testing/spectest/minimal/capella/operations/attestation_test.go +++ b/testing/spectest/minimal/capella/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/attester_slashing_test.go b/testing/spectest/minimal/capella/operations/attester_slashing_test.go index f2e2b37e0e7f..3f130f06a768 100644 --- a/testing/spectest/minimal/capella/operations/attester_slashing_test.go +++ b/testing/spectest/minimal/capella/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/block_header_test.go b/testing/spectest/minimal/capella/operations/block_header_test.go index 5526dbe14ba4..aee351d39610 100644 --- a/testing/spectest/minimal/capella/operations/block_header_test.go +++ b/testing/spectest/minimal/capella/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go b/testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go index a9c2fe2fa36a..0fc7774077f3 100644 --- a/testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go +++ b/testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_BLSToExecutionChange(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/deposit_test.go b/testing/spectest/minimal/capella/operations/deposit_test.go index ac7505ecf1fa..2c86aa511b29 100644 --- a/testing/spectest/minimal/capella/operations/deposit_test.go +++ b/testing/spectest/minimal/capella/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/proposer_slashing_test.go b/testing/spectest/minimal/capella/operations/proposer_slashing_test.go index 7b0af46926de..990140af9d94 100644 --- a/testing/spectest/minimal/capella/operations/proposer_slashing_test.go +++ b/testing/spectest/minimal/capella/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/sync_committee_test.go b/testing/spectest/minimal/capella/operations/sync_committee_test.go index 99a4cdbe212d..964f9d07f224 100644 --- a/testing/spectest/minimal/capella/operations/sync_committee_test.go +++ b/testing/spectest/minimal/capella/operations/sync_committee_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_SyncCommittee(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/voluntary_exit_test.go b/testing/spectest/minimal/capella/operations/voluntary_exit_test.go index df315a5a7c34..ff6b71404ac9 100644 --- a/testing/spectest/minimal/capella/operations/voluntary_exit_test.go +++ b/testing/spectest/minimal/capella/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/minimal/capella/operations/withdrawals_test.go b/testing/spectest/minimal/capella/operations/withdrawals_test.go index 2ddb97338f59..0487600f74da 100644 --- a/testing/spectest/minimal/capella/operations/withdrawals_test.go +++ b/testing/spectest/minimal/capella/operations/withdrawals_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations" ) func TestMinimal_Capella_Operations_Withdrawals(t *testing.T) { diff --git a/testing/spectest/minimal/capella/rewards/rewards_test.go b/testing/spectest/minimal/capella/rewards/rewards_test.go index 961f6a2d516e..50422a382cf8 100644 --- a/testing/spectest/minimal/capella/rewards/rewards_test.go +++ b/testing/spectest/minimal/capella/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/rewards" ) func TestMinimal_Capella_Rewards(t *testing.T) { diff --git a/testing/spectest/minimal/capella/sanity/blocks_test.go b/testing/spectest/minimal/capella/sanity/blocks_test.go index cf72bed332ad..cfd4949e8345 100644 --- a/testing/spectest/minimal/capella/sanity/blocks_test.go +++ b/testing/spectest/minimal/capella/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/sanity" ) func TestMinimal_Capella_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/minimal/capella/sanity/slots_test.go b/testing/spectest/minimal/capella/sanity/slots_test.go index 3072d2801f2b..e4ee659740db 100644 --- a/testing/spectest/minimal/capella/sanity/slots_test.go +++ b/testing/spectest/minimal/capella/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/sanity" ) func TestMinimal_Capella_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/minimal/capella/ssz_static/ssz_static_test.go b/testing/spectest/minimal/capella/ssz_static/ssz_static_test.go index a487c6eaa12f..5b05cf3c7eb0 100644 --- a/testing/spectest/minimal/capella/ssz_static/ssz_static_test.go +++ b/testing/spectest/minimal/capella/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/ssz_static" ) func TestMinimal_Capella_SSZStatic(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go index 2a308e2029ab..c4e0158a3688 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_EffectiveBalanceUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go b/testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go index 86f18374102f..c61c832769e0 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func TestMain(m *testing.M) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go index c12751482091..0d3751f8c418 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_Eth1DataReset(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go b/testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go index 125e3a1d12cf..cbc79909c842 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_HistoricalRootsUpdate(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go index 07338044640d..2942a57afff9 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_JustificationAndFinalization(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go b/testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go index dc330ab50440..33b6fa88f378 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_ParticipationRecordUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go index be0324a4eefb..480d01815d66 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_RandaoMixesReset(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go index 5db3e39824d0..8552662d1c0b 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_ResetRegistryUpdates(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go index cf90f5e6f8f8..9dd6975cc237 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_RewardsAndPenalties(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go index b34047b1e4e5..ad80d5371ef8 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_SlashingsReset(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/epoch_processing/slashings_test.go b/testing/spectest/minimal/phase0/epoch_processing/slashings_test.go index 875bd8cf29dc..4dbb63ae66f4 100644 --- a/testing/spectest/minimal/phase0/epoch_processing/slashings_test.go +++ b/testing/spectest/minimal/phase0/epoch_processing/slashings_test.go @@ -3,7 +3,7 @@ package epoch_processing import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing" ) func TestMinimal_Phase0_EpochProcessing_Slashings(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/finality/finality_test.go b/testing/spectest/minimal/phase0/finality/finality_test.go index fff17dd66c38..076799b935e2 100644 --- a/testing/spectest/minimal/phase0/finality/finality_test.go +++ b/testing/spectest/minimal/phase0/finality/finality_test.go @@ -3,7 +3,7 @@ package finality import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/finality" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/finality" ) func TestMinimal_Phase0_Finality(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/operations/attestation_test.go b/testing/spectest/minimal/phase0/operations/attestation_test.go index d890a63ffe41..8b0966ba27a9 100644 --- a/testing/spectest/minimal/phase0/operations/attestation_test.go +++ b/testing/spectest/minimal/phase0/operations/attestation_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMinimal_Phase0_Operations_Attestation(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/operations/attester_slashing_test.go b/testing/spectest/minimal/phase0/operations/attester_slashing_test.go index 510ab942d2b3..b8f9543ebe37 100644 --- a/testing/spectest/minimal/phase0/operations/attester_slashing_test.go +++ b/testing/spectest/minimal/phase0/operations/attester_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMinimal_Phase0_Operations_AttesterSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/operations/block_header_test.go b/testing/spectest/minimal/phase0/operations/block_header_test.go index 9844ef5d92e9..25b28dbc8f9d 100644 --- a/testing/spectest/minimal/phase0/operations/block_header_test.go +++ b/testing/spectest/minimal/phase0/operations/block_header_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMinimal_Phase0_Operations_BlockHeader(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/operations/deposit_test.go b/testing/spectest/minimal/phase0/operations/deposit_test.go index 2b34472c206c..65410b7b9756 100644 --- a/testing/spectest/minimal/phase0/operations/deposit_test.go +++ b/testing/spectest/minimal/phase0/operations/deposit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMinimal_Phase0_Operations_Deposit(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/operations/proposer_slashing_test.go b/testing/spectest/minimal/phase0/operations/proposer_slashing_test.go index 87126b1736b1..64ecb8ef570f 100644 --- a/testing/spectest/minimal/phase0/operations/proposer_slashing_test.go +++ b/testing/spectest/minimal/phase0/operations/proposer_slashing_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMinimal_Phase0_Operations_ProposerSlashing(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/operations/voluntary_exit_test.go b/testing/spectest/minimal/phase0/operations/voluntary_exit_test.go index 5aeda8b4a871..42dd2c19670e 100644 --- a/testing/spectest/minimal/phase0/operations/voluntary_exit_test.go +++ b/testing/spectest/minimal/phase0/operations/voluntary_exit_test.go @@ -3,7 +3,7 @@ package operations import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations" ) func TestMinimal_Phase0_Operations_VoluntaryExit(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/random/random_test.go b/testing/spectest/minimal/phase0/random/random_test.go index e9cce05ac7f1..b04410aa655c 100644 --- a/testing/spectest/minimal/phase0/random/random_test.go +++ b/testing/spectest/minimal/phase0/random/random_test.go @@ -3,7 +3,7 @@ package random import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity" ) func TestMinimal_Phase0_Random(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/rewards/rewards_test.go b/testing/spectest/minimal/phase0/rewards/rewards_test.go index 9462b180bd00..563fd8e121c3 100644 --- a/testing/spectest/minimal/phase0/rewards/rewards_test.go +++ b/testing/spectest/minimal/phase0/rewards/rewards_test.go @@ -3,7 +3,7 @@ package rewards import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/rewards" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/rewards" ) func TestMinimal_Phase0_Rewards(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/sanity/blocks_test.go b/testing/spectest/minimal/phase0/sanity/blocks_test.go index 5fec609d3060..af9b0799f841 100644 --- a/testing/spectest/minimal/phase0/sanity/blocks_test.go +++ b/testing/spectest/minimal/phase0/sanity/blocks_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity" ) func TestMinimal_Phase0_Sanity_Blocks(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/sanity/slots_test.go b/testing/spectest/minimal/phase0/sanity/slots_test.go index b2f3e22f0d89..725045bba617 100644 --- a/testing/spectest/minimal/phase0/sanity/slots_test.go +++ b/testing/spectest/minimal/phase0/sanity/slots_test.go @@ -3,7 +3,7 @@ package sanity import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity" ) func TestMinimal_Phase0_Sanity_Slots(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go b/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go index 273e945a2c20..898d9d4f62fe 100644 --- a/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go +++ b/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go @@ -3,7 +3,7 @@ package shuffle import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/shuffling/core/shuffle" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/shuffling/core/shuffle" ) func TestMinimal_Phase0_Shuffling_Core_Shuffle(t *testing.T) { diff --git a/testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go b/testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go index a97b4091f5fd..f1d302adea52 100644 --- a/testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go +++ b/testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go @@ -3,7 +3,7 @@ package ssz_static import ( "testing" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/ssz_static" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/ssz_static" ) func TestMinimal_Phase0_SSZStatic(t *testing.T) { diff --git a/testing/spectest/shared/altair/epoch_processing/BUILD.bazel b/testing/spectest/shared/altair/epoch_processing/BUILD.bazel index 73e188f8607a..00e87d9a3b38 100644 --- a/testing/spectest/shared/altair/epoch_processing/BUILD.bazel +++ b/testing/spectest/shared/altair/epoch_processing/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "slashings.go", "slashings_reset.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/epoch_processing", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/epoch_processing", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/altair/epoch_processing/effective_balance_updates.go b/testing/spectest/shared/altair/epoch_processing/effective_balance_updates.go index 374472519c0d..40758ebc643f 100644 --- a/testing/spectest/shared/altair/epoch_processing/effective_balance_updates.go +++ b/testing/spectest/shared/altair/epoch_processing/effective_balance_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEffectiveBalanceUpdatesTests executes "epoch_processing/effective_balance_updates" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/eth1_data_reset.go b/testing/spectest/shared/altair/epoch_processing/eth1_data_reset.go index f6b67982f31c..8c5e404e2bf8 100644 --- a/testing/spectest/shared/altair/epoch_processing/eth1_data_reset.go +++ b/testing/spectest/shared/altair/epoch_processing/eth1_data_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEth1DataResetTests executes "epoch_processing/eth1_data_reset" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/helpers.go b/testing/spectest/shared/altair/epoch_processing/helpers.go index 7ac65e0acbf9..fbd5837b1a28 100644 --- a/testing/spectest/shared/altair/epoch_processing/helpers.go +++ b/testing/spectest/shared/altair/epoch_processing/helpers.go @@ -8,11 +8,11 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/altair/epoch_processing/historical_roots_update.go b/testing/spectest/shared/altair/epoch_processing/historical_roots_update.go index f6991b616fa3..21ded8b36d03 100644 --- a/testing/spectest/shared/altair/epoch_processing/historical_roots_update.go +++ b/testing/spectest/shared/altair/epoch_processing/historical_roots_update.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunHistoricalRootsUpdateTests executes "epoch_processing/historical_roots_update" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/inactivity_updates.go b/testing/spectest/shared/altair/epoch_processing/inactivity_updates.go index 2ab3e460d5d1..0506bb229475 100644 --- a/testing/spectest/shared/altair/epoch_processing/inactivity_updates.go +++ b/testing/spectest/shared/altair/epoch_processing/inactivity_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunInactivityUpdatesTest executes "epoch_processing/inactivity_updates" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/justification_and_finalization.go b/testing/spectest/shared/altair/epoch_processing/justification_and_finalization.go index b618cd5dbaa8..e6d0e2d71e91 100644 --- a/testing/spectest/shared/altair/epoch_processing/justification_and_finalization.go +++ b/testing/spectest/shared/altair/epoch_processing/justification_and_finalization.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunJustificationAndFinalizationTests executes "epoch_processing/justification_and_finalization" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/participation_flag_updates.go b/testing/spectest/shared/altair/epoch_processing/participation_flag_updates.go index c9320d788b6c..d501513d99a1 100644 --- a/testing/spectest/shared/altair/epoch_processing/participation_flag_updates.go +++ b/testing/spectest/shared/altair/epoch_processing/participation_flag_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunParticipationFlagUpdatesTests executes "epoch_processing/participation_flag_updates" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/randao_mixes_reset.go b/testing/spectest/shared/altair/epoch_processing/randao_mixes_reset.go index ce013e17c943..cc5703efd6e0 100644 --- a/testing/spectest/shared/altair/epoch_processing/randao_mixes_reset.go +++ b/testing/spectest/shared/altair/epoch_processing/randao_mixes_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRandaoMixesResetTests executes "epoch_processing/randao_mixes_reset" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/registry_updates.go b/testing/spectest/shared/altair/epoch_processing/registry_updates.go index 6e6aff3c286d..6bdff80fba89 100644 --- a/testing/spectest/shared/altair/epoch_processing/registry_updates.go +++ b/testing/spectest/shared/altair/epoch_processing/registry_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRegistryUpdatesTests executes "epoch_processing/registry_updates" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/rewards_and_penalties.go b/testing/spectest/shared/altair/epoch_processing/rewards_and_penalties.go index e02954bb0269..e8296e2e9783 100644 --- a/testing/spectest/shared/altair/epoch_processing/rewards_and_penalties.go +++ b/testing/spectest/shared/altair/epoch_processing/rewards_and_penalties.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRewardsAndPenaltiesTests executes "epoch_processing/rewards_and_penalties" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/slashings.go b/testing/spectest/shared/altair/epoch_processing/slashings.go index 88fc1718576f..521548a38273 100644 --- a/testing/spectest/shared/altair/epoch_processing/slashings.go +++ b/testing/spectest/shared/altair/epoch_processing/slashings.go @@ -4,12 +4,12 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsTests executes "epoch_processing/slashings" tests. diff --git a/testing/spectest/shared/altair/epoch_processing/slashings_reset.go b/testing/spectest/shared/altair/epoch_processing/slashings_reset.go index 907aef339538..23160c69a41b 100644 --- a/testing/spectest/shared/altair/epoch_processing/slashings_reset.go +++ b/testing/spectest/shared/altair/epoch_processing/slashings_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsResetTests executes "epoch_processing/slashings_reset" tests. diff --git a/testing/spectest/shared/altair/finality/BUILD.bazel b/testing/spectest/shared/altair/finality/BUILD.bazel index 1d2eab01a6d8..470c5cef6870 100644 --- a/testing/spectest/shared/altair/finality/BUILD.bazel +++ b/testing/spectest/shared/altair/finality/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["finality.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/finality", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/finality", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/altair/finality/finality.go b/testing/spectest/shared/altair/finality/finality.go index 10911538f162..f3bb41d40ecc 100644 --- a/testing/spectest/shared/altair/finality/finality.go +++ b/testing/spectest/shared/altair/finality/finality.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/altair/fork/BUILD.bazel b/testing/spectest/shared/altair/fork/BUILD.bazel index ae9801544aff..d660a3257bad 100644 --- a/testing/spectest/shared/altair/fork/BUILD.bazel +++ b/testing/spectest/shared/altair/fork/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "transition.go", "upgrade_to_altair.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/fork", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/fork", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/altair/fork/transition.go b/testing/spectest/shared/altair/fork/transition.go index 97abcdd51ef8..a958e3da4a3d 100644 --- a/testing/spectest/shared/altair/fork/transition.go +++ b/testing/spectest/shared/altair/fork/transition.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/altair/fork/upgrade_to_altair.go b/testing/spectest/shared/altair/fork/upgrade_to_altair.go index 08fdca0e5856..7ae795c91627 100644 --- a/testing/spectest/shared/altair/fork/upgrade_to_altair.go +++ b/testing/spectest/shared/altair/fork/upgrade_to_altair.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/altair/operations/BUILD.bazel b/testing/spectest/shared/altair/operations/BUILD.bazel index 5e8a2f9e2dc1..a28c902184c9 100644 --- a/testing/spectest/shared/altair/operations/BUILD.bazel +++ b/testing/spectest/shared/altair/operations/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "sync_committee.go", "voluntary_exit.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/operations", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/operations", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/altair/operations/attestation.go b/testing/spectest/shared/altair/operations/attestation.go index f0d689350ac3..564db42c2597 100644 --- a/testing/spectest/shared/altair/operations/attestation.go +++ b/testing/spectest/shared/altair/operations/attestation.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunAttestationTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/altair/operations/attester_slashing.go b/testing/spectest/shared/altair/operations/attester_slashing.go index c3660216ee56..159a83a69cf9 100644 --- a/testing/spectest/shared/altair/operations/attester_slashing.go +++ b/testing/spectest/shared/altair/operations/attester_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunAttesterSlashingTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/altair/operations/block_header.go b/testing/spectest/shared/altair/operations/block_header.go index d03a281c1f80..e7cb4dce1ab4 100644 --- a/testing/spectest/shared/altair/operations/block_header.go +++ b/testing/spectest/shared/altair/operations/block_header.go @@ -9,13 +9,13 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/altair/operations/deposit.go b/testing/spectest/shared/altair/operations/deposit.go index 8f3e151a69a2..309f5e1dad50 100644 --- a/testing/spectest/shared/altair/operations/deposit.go +++ b/testing/spectest/shared/altair/operations/deposit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunDepositTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/altair/operations/helpers.go b/testing/spectest/shared/altair/operations/helpers.go index 3d0cd3889cb8..ed5be4cc6325 100644 --- a/testing/spectest/shared/altair/operations/helpers.go +++ b/testing/spectest/shared/altair/operations/helpers.go @@ -9,14 +9,14 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/altair/operations/proposer_slashing.go b/testing/spectest/shared/altair/operations/proposer_slashing.go index ddea86530a16..bc7a2fbb83ca 100644 --- a/testing/spectest/shared/altair/operations/proposer_slashing.go +++ b/testing/spectest/shared/altair/operations/proposer_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunProposerSlashingTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/altair/operations/sync_committee.go b/testing/spectest/shared/altair/operations/sync_committee.go index 8151572f2810..be145b120c58 100644 --- a/testing/spectest/shared/altair/operations/sync_committee.go +++ b/testing/spectest/shared/altair/operations/sync_committee.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunSyncCommitteeTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/altair/operations/voluntary_exit.go b/testing/spectest/shared/altair/operations/voluntary_exit.go index 6c4830c4970f..50930499f74a 100644 --- a/testing/spectest/shared/altair/operations/voluntary_exit.go +++ b/testing/spectest/shared/altair/operations/voluntary_exit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunVoluntaryExitTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/altair/rewards/BUILD.bazel b/testing/spectest/shared/altair/rewards/BUILD.bazel index e9602b0fcad5..2d9438c94370 100644 --- a/testing/spectest/shared/altair/rewards/BUILD.bazel +++ b/testing/spectest/shared/altair/rewards/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["rewards_penalties.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/rewards", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/rewards", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/altair/rewards/rewards_penalties.go b/testing/spectest/shared/altair/rewards/rewards_penalties.go index 225ecfdaa7d9..9922d2281bd6 100644 --- a/testing/spectest/shared/altair/rewards/rewards_penalties.go +++ b/testing/spectest/shared/altair/rewards/rewards_penalties.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // Delta contains list of rewards and penalties. diff --git a/testing/spectest/shared/altair/sanity/BUILD.bazel b/testing/spectest/shared/altair/sanity/BUILD.bazel index fe0c5e00ec49..fb9754c5e5a7 100644 --- a/testing/spectest/shared/altair/sanity/BUILD.bazel +++ b/testing/spectest/shared/altair/sanity/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "block_processing.yaml.go", "slot_processing.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/sanity", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/sanity", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/altair/sanity/block_processing.go b/testing/spectest/shared/altair/sanity/block_processing.go index 8db840379e01..41d8cd3f86ef 100644 --- a/testing/spectest/shared/altair/sanity/block_processing.go +++ b/testing/spectest/shared/altair/sanity/block_processing.go @@ -11,15 +11,15 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/d4l3k/messagediff" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/altair/sanity/slot_processing.go b/testing/spectest/shared/altair/sanity/slot_processing.go index 7a2283eb93b0..c69e2f1f4fbc 100644 --- a/testing/spectest/shared/altair/sanity/slot_processing.go +++ b/testing/spectest/shared/altair/sanity/slot_processing.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/altair/ssz_static/BUILD.bazel b/testing/spectest/shared/altair/ssz_static/BUILD.bazel index 30ea4ba2ebd6..06ab17dd67d2 100644 --- a/testing/spectest/shared/altair/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/altair/ssz_static/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["ssz_static.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/altair/ssz_static", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/altair/ssz_static", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/state/state-native:go_default_library", diff --git a/testing/spectest/shared/altair/ssz_static/ssz_static.go b/testing/spectest/shared/altair/ssz_static/ssz_static.go index fa89c8a53c02..c68a6cc592ff 100644 --- a/testing/spectest/shared/altair/ssz_static/ssz_static.go +++ b/testing/spectest/shared/altair/ssz_static/ssz_static.go @@ -6,10 +6,10 @@ import ( "testing" fssz "github.com/prysmaticlabs/fastssz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - common "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/ssz_static" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + common "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/ssz_static" ) // RunSSZStaticTests executes "ssz_static" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/BUILD.bazel b/testing/spectest/shared/bellatrix/epoch_processing/BUILD.bazel index 66d4aead4333..e4716cbd8269 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/epoch_processing/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "slashings.go", "slashings_reset.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/epoch_processing", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/epoch_processing", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/bellatrix/epoch_processing/effective_balance_updates.go b/testing/spectest/shared/bellatrix/epoch_processing/effective_balance_updates.go index 63389ada410d..a42064ec8dc3 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/effective_balance_updates.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/effective_balance_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEffectiveBalanceUpdatesTests executes "epoch_processing/effective_balance_updates" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/eth1_data_reset.go b/testing/spectest/shared/bellatrix/epoch_processing/eth1_data_reset.go index d3a1bbf8f0dd..323ab5e78821 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/eth1_data_reset.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/eth1_data_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEth1DataResetTests executes "epoch_processing/eth1_data_reset" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/helpers.go b/testing/spectest/shared/bellatrix/epoch_processing/helpers.go index 5d5dbfe4b432..435064d5b387 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/helpers.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/helpers.go @@ -8,11 +8,11 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/bellatrix/epoch_processing/historical_roots_update.go b/testing/spectest/shared/bellatrix/epoch_processing/historical_roots_update.go index 716a709b940f..1796e9d59805 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/historical_roots_update.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/historical_roots_update.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunHistoricalRootsUpdateTests executes "epoch_processing/historical_roots_update" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/inactivity_updates.go b/testing/spectest/shared/bellatrix/epoch_processing/inactivity_updates.go index ef68ced67b20..de1a94e642cc 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/inactivity_updates.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/inactivity_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunInactivityUpdatesTest executes "epoch_processing/inactivity_updates" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/justification_and_finalization.go b/testing/spectest/shared/bellatrix/epoch_processing/justification_and_finalization.go index 94b65d609b0a..b82841b82541 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/justification_and_finalization.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/justification_and_finalization.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunJustificationAndFinalizationTests executes "epoch_processing/justification_and_finalization" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/participation_flag_updates.go b/testing/spectest/shared/bellatrix/epoch_processing/participation_flag_updates.go index 030350143495..bddd275b6e90 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/participation_flag_updates.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/participation_flag_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunParticipationFlagUpdatesTests executes "epoch_processing/participation_flag_updates" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/randao_mixes_reset.go b/testing/spectest/shared/bellatrix/epoch_processing/randao_mixes_reset.go index 2a6cc6d862ce..3cee1138bc4a 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/randao_mixes_reset.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/randao_mixes_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRandaoMixesResetTests executes "epoch_processing/randao_mixes_reset" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/registry_updates.go b/testing/spectest/shared/bellatrix/epoch_processing/registry_updates.go index 913ecd1ed121..94a168695570 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/registry_updates.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/registry_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRegistryUpdatesTests executes "epoch_processing/registry_updates" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/rewards_and_penalties.go b/testing/spectest/shared/bellatrix/epoch_processing/rewards_and_penalties.go index 775b83474305..ae46f93e4fd7 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/rewards_and_penalties.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/rewards_and_penalties.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRewardsAndPenaltiesTests executes "epoch_processing/rewards_and_penalties" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/slashings.go b/testing/spectest/shared/bellatrix/epoch_processing/slashings.go index 64ce4573cb96..a7ec1638acaf 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/slashings.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/slashings.go @@ -4,12 +4,12 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsTests executes "epoch_processing/slashings" tests. diff --git a/testing/spectest/shared/bellatrix/epoch_processing/slashings_reset.go b/testing/spectest/shared/bellatrix/epoch_processing/slashings_reset.go index fc7be233c769..aca6f933f104 100644 --- a/testing/spectest/shared/bellatrix/epoch_processing/slashings_reset.go +++ b/testing/spectest/shared/bellatrix/epoch_processing/slashings_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsResetTests executes "epoch_processing/slashings_reset" tests. diff --git a/testing/spectest/shared/bellatrix/finality/BUILD.bazel b/testing/spectest/shared/bellatrix/finality/BUILD.bazel index 9cbcbde1386c..28357eed4f18 100644 --- a/testing/spectest/shared/bellatrix/finality/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/finality/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["finality.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/finality", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/finality", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/bellatrix/finality/finality.go b/testing/spectest/shared/bellatrix/finality/finality.go index 348c476e3f5d..64b5df4928d6 100644 --- a/testing/spectest/shared/bellatrix/finality/finality.go +++ b/testing/spectest/shared/bellatrix/finality/finality.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/bellatrix/fork/BUILD.bazel b/testing/spectest/shared/bellatrix/fork/BUILD.bazel index e7fa60a55096..8303ec2f6101 100644 --- a/testing/spectest/shared/bellatrix/fork/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/fork/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "transition.go", "upgrade_to_bellatrix.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/fork", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/fork", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/execution:go_default_library", diff --git a/testing/spectest/shared/bellatrix/fork/transition.go b/testing/spectest/shared/bellatrix/fork/transition.go index 3aec6900fc10..12b7bb665ccb 100644 --- a/testing/spectest/shared/bellatrix/fork/transition.go +++ b/testing/spectest/shared/bellatrix/fork/transition.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) type ForkConfig struct { diff --git a/testing/spectest/shared/bellatrix/fork/upgrade_to_bellatrix.go b/testing/spectest/shared/bellatrix/fork/upgrade_to_bellatrix.go index 6c3e76d82997..dd715dbfa07c 100644 --- a/testing/spectest/shared/bellatrix/fork/upgrade_to_bellatrix.go +++ b/testing/spectest/shared/bellatrix/fork/upgrade_to_bellatrix.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/bellatrix/operations/BUILD.bazel b/testing/spectest/shared/bellatrix/operations/BUILD.bazel index 3f96bd8d1b9e..fd73d38ee243 100644 --- a/testing/spectest/shared/bellatrix/operations/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/operations/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "sync_committee.go", "voluntary_exit.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/operations", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/operations", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/bellatrix/operations/attestation.go b/testing/spectest/shared/bellatrix/operations/attestation.go index 51d09ae8332c..1b3a4098bf39 100644 --- a/testing/spectest/shared/bellatrix/operations/attestation.go +++ b/testing/spectest/shared/bellatrix/operations/attestation.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunAttestationTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/bellatrix/operations/attester_slashing.go b/testing/spectest/shared/bellatrix/operations/attester_slashing.go index 061710707c2a..66e9ece33fed 100644 --- a/testing/spectest/shared/bellatrix/operations/attester_slashing.go +++ b/testing/spectest/shared/bellatrix/operations/attester_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunAttesterSlashingTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/bellatrix/operations/block_header.go b/testing/spectest/shared/bellatrix/operations/block_header.go index ea3609d7deb0..cd44beda0e59 100644 --- a/testing/spectest/shared/bellatrix/operations/block_header.go +++ b/testing/spectest/shared/bellatrix/operations/block_header.go @@ -9,13 +9,13 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/bellatrix/operations/deposit.go b/testing/spectest/shared/bellatrix/operations/deposit.go index 73de3c60c282..7e440d1829f1 100644 --- a/testing/spectest/shared/bellatrix/operations/deposit.go +++ b/testing/spectest/shared/bellatrix/operations/deposit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunDepositTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/bellatrix/operations/helpers.go b/testing/spectest/shared/bellatrix/operations/helpers.go index 119e5ee30404..7837b4b1cc67 100644 --- a/testing/spectest/shared/bellatrix/operations/helpers.go +++ b/testing/spectest/shared/bellatrix/operations/helpers.go @@ -9,14 +9,14 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/bellatrix/operations/proposer_slashing.go b/testing/spectest/shared/bellatrix/operations/proposer_slashing.go index d05f6adcd690..95b7eb8495c1 100644 --- a/testing/spectest/shared/bellatrix/operations/proposer_slashing.go +++ b/testing/spectest/shared/bellatrix/operations/proposer_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunProposerSlashingTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/bellatrix/operations/sync_committee.go b/testing/spectest/shared/bellatrix/operations/sync_committee.go index a02ed5428680..e1842ecab65a 100644 --- a/testing/spectest/shared/bellatrix/operations/sync_committee.go +++ b/testing/spectest/shared/bellatrix/operations/sync_committee.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunSyncCommitteeTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/bellatrix/operations/voluntary_exit.go b/testing/spectest/shared/bellatrix/operations/voluntary_exit.go index cd1963f43d12..9d9ad0379fda 100644 --- a/testing/spectest/shared/bellatrix/operations/voluntary_exit.go +++ b/testing/spectest/shared/bellatrix/operations/voluntary_exit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunVoluntaryExitTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/bellatrix/rewards/BUILD.bazel b/testing/spectest/shared/bellatrix/rewards/BUILD.bazel index 00bdeb3bc1d4..4d68147f46da 100644 --- a/testing/spectest/shared/bellatrix/rewards/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/rewards/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["rewards_penalties.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/rewards", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/rewards", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/bellatrix/rewards/rewards_penalties.go b/testing/spectest/shared/bellatrix/rewards/rewards_penalties.go index 3d6bc7f68840..e72ae4d2c857 100644 --- a/testing/spectest/shared/bellatrix/rewards/rewards_penalties.go +++ b/testing/spectest/shared/bellatrix/rewards/rewards_penalties.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // Delta contains list of rewards and penalties. diff --git a/testing/spectest/shared/bellatrix/sanity/BUILD.bazel b/testing/spectest/shared/bellatrix/sanity/BUILD.bazel index 22641333e7bd..31fc55cf153a 100644 --- a/testing/spectest/shared/bellatrix/sanity/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/sanity/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "block_processing.yaml.go", "slot_processing.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/sanity", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/sanity", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/bellatrix/sanity/block_processing.go b/testing/spectest/shared/bellatrix/sanity/block_processing.go index 5e30f5e1f2e7..65d3179edb2f 100644 --- a/testing/spectest/shared/bellatrix/sanity/block_processing.go +++ b/testing/spectest/shared/bellatrix/sanity/block_processing.go @@ -11,15 +11,15 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/d4l3k/messagediff" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/bellatrix/sanity/slot_processing.go b/testing/spectest/shared/bellatrix/sanity/slot_processing.go index 31d43a72c6d3..3732cd8cc37e 100644 --- a/testing/spectest/shared/bellatrix/sanity/slot_processing.go +++ b/testing/spectest/shared/bellatrix/sanity/slot_processing.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel b/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel index 06a0388ef7b4..4e584f517bb3 100644 --- a/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["ssz_static.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/bellatrix/ssz_static", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/bellatrix/ssz_static", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/state/state-native:go_default_library", diff --git a/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go b/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go index 33fc0fb54f97..bfc6b9ec1047 100644 --- a/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go +++ b/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go @@ -6,11 +6,11 @@ import ( "testing" fssz "github.com/prysmaticlabs/fastssz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - common "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/ssz_static" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + common "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/ssz_static" ) // RunSSZStaticTests executes "ssz_static" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/BUILD.bazel b/testing/spectest/shared/capella/epoch_processing/BUILD.bazel index 18f79e6f63ab..35d138b11dc8 100644 --- a/testing/spectest/shared/capella/epoch_processing/BUILD.bazel +++ b/testing/spectest/shared/capella/epoch_processing/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "slashings.go", "slashings_reset.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/epoch_processing", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/epoch_processing", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/capella/epoch_processing/effective_balance_updates.go b/testing/spectest/shared/capella/epoch_processing/effective_balance_updates.go index c9632cb8a02a..2bd6563177f0 100644 --- a/testing/spectest/shared/capella/epoch_processing/effective_balance_updates.go +++ b/testing/spectest/shared/capella/epoch_processing/effective_balance_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEffectiveBalanceUpdatesTests executes "epoch_processing/effective_balance_updates" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/eth1_data_reset.go b/testing/spectest/shared/capella/epoch_processing/eth1_data_reset.go index 9d2e0fc7b474..3e8634c958ac 100644 --- a/testing/spectest/shared/capella/epoch_processing/eth1_data_reset.go +++ b/testing/spectest/shared/capella/epoch_processing/eth1_data_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEth1DataResetTests executes "epoch_processing/eth1_data_reset" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/helpers.go b/testing/spectest/shared/capella/epoch_processing/helpers.go index ac830fa074c4..9e29bd10232e 100644 --- a/testing/spectest/shared/capella/epoch_processing/helpers.go +++ b/testing/spectest/shared/capella/epoch_processing/helpers.go @@ -8,11 +8,11 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/capella/epoch_processing/historical_summaries_update.go b/testing/spectest/shared/capella/epoch_processing/historical_summaries_update.go index 1a3274d2b8df..be3eec54b10f 100644 --- a/testing/spectest/shared/capella/epoch_processing/historical_summaries_update.go +++ b/testing/spectest/shared/capella/epoch_processing/historical_summaries_update.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunHistoricalSummariesUpdateTests executes "epoch_processing/historical_summaries_update" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/inactivity_updates.go b/testing/spectest/shared/capella/epoch_processing/inactivity_updates.go index 9d4cbb3172dc..07c1dac996f5 100644 --- a/testing/spectest/shared/capella/epoch_processing/inactivity_updates.go +++ b/testing/spectest/shared/capella/epoch_processing/inactivity_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunInactivityUpdatesTest executes "epoch_processing/inactivity_updates" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/justification_and_finalization.go b/testing/spectest/shared/capella/epoch_processing/justification_and_finalization.go index 851addc2887a..676f59b923b8 100644 --- a/testing/spectest/shared/capella/epoch_processing/justification_and_finalization.go +++ b/testing/spectest/shared/capella/epoch_processing/justification_and_finalization.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunJustificationAndFinalizationTests executes "epoch_processing/justification_and_finalization" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/participation_flag_updates.go b/testing/spectest/shared/capella/epoch_processing/participation_flag_updates.go index 19953e23db44..4812a0eed9a7 100644 --- a/testing/spectest/shared/capella/epoch_processing/participation_flag_updates.go +++ b/testing/spectest/shared/capella/epoch_processing/participation_flag_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunParticipationFlagUpdatesTests executes "epoch_processing/participation_flag_updates" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/randao_mixes_reset.go b/testing/spectest/shared/capella/epoch_processing/randao_mixes_reset.go index a20abdfbef21..2733edb5923e 100644 --- a/testing/spectest/shared/capella/epoch_processing/randao_mixes_reset.go +++ b/testing/spectest/shared/capella/epoch_processing/randao_mixes_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRandaoMixesResetTests executes "epoch_processing/randao_mixes_reset" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/registry_updates.go b/testing/spectest/shared/capella/epoch_processing/registry_updates.go index f13e9e7cb294..9da140186e2a 100644 --- a/testing/spectest/shared/capella/epoch_processing/registry_updates.go +++ b/testing/spectest/shared/capella/epoch_processing/registry_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRegistryUpdatesTests executes "epoch_processing/registry_updates" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/rewards_and_penalties.go b/testing/spectest/shared/capella/epoch_processing/rewards_and_penalties.go index f2242962a807..038981080c0a 100644 --- a/testing/spectest/shared/capella/epoch_processing/rewards_and_penalties.go +++ b/testing/spectest/shared/capella/epoch_processing/rewards_and_penalties.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRewardsAndPenaltiesTests executes "epoch_processing/rewards_and_penalties" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/slashings.go b/testing/spectest/shared/capella/epoch_processing/slashings.go index 809d90fdcdc7..d54589509925 100644 --- a/testing/spectest/shared/capella/epoch_processing/slashings.go +++ b/testing/spectest/shared/capella/epoch_processing/slashings.go @@ -4,12 +4,12 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsTests executes "epoch_processing/slashings" tests. diff --git a/testing/spectest/shared/capella/epoch_processing/slashings_reset.go b/testing/spectest/shared/capella/epoch_processing/slashings_reset.go index 910cb7ccbb67..d1d34c48ca69 100644 --- a/testing/spectest/shared/capella/epoch_processing/slashings_reset.go +++ b/testing/spectest/shared/capella/epoch_processing/slashings_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsResetTests executes "epoch_processing/slashings_reset" tests. diff --git a/testing/spectest/shared/capella/finality/BUILD.bazel b/testing/spectest/shared/capella/finality/BUILD.bazel index 5b0f23da3713..4fb340a60384 100644 --- a/testing/spectest/shared/capella/finality/BUILD.bazel +++ b/testing/spectest/shared/capella/finality/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["finality.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/finality", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/finality", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/capella/finality/finality.go b/testing/spectest/shared/capella/finality/finality.go index dead4b04d972..a7ffcf85e017 100644 --- a/testing/spectest/shared/capella/finality/finality.go +++ b/testing/spectest/shared/capella/finality/finality.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/capella/fork/BUILD.bazel b/testing/spectest/shared/capella/fork/BUILD.bazel index 7575718c6953..87da7f726702 100644 --- a/testing/spectest/shared/capella/fork/BUILD.bazel +++ b/testing/spectest/shared/capella/fork/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "transition.go", "upgrade_to_capella.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/fork", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/fork", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/capella:go_default_library", diff --git a/testing/spectest/shared/capella/fork/transition.go b/testing/spectest/shared/capella/fork/transition.go index 1830c4a2620b..e076948547b8 100644 --- a/testing/spectest/shared/capella/fork/transition.go +++ b/testing/spectest/shared/capella/fork/transition.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) type ForkConfig struct { diff --git a/testing/spectest/shared/capella/fork/upgrade_to_capella.go b/testing/spectest/shared/capella/fork/upgrade_to_capella.go index beddf5bf352e..04707be4bc01 100644 --- a/testing/spectest/shared/capella/fork/upgrade_to_capella.go +++ b/testing/spectest/shared/capella/fork/upgrade_to_capella.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/capella/operations/BUILD.bazel b/testing/spectest/shared/capella/operations/BUILD.bazel index d3c5c2aaac3a..9f1f6fc65cd4 100644 --- a/testing/spectest/shared/capella/operations/BUILD.bazel +++ b/testing/spectest/shared/capella/operations/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "voluntary_exit.go", "withdrawals.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/operations", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/operations", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/capella/operations/attestation.go b/testing/spectest/shared/capella/operations/attestation.go index 893d9d537999..fa085b8ddf82 100644 --- a/testing/spectest/shared/capella/operations/attestation.go +++ b/testing/spectest/shared/capella/operations/attestation.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunAttestationTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/attester_slashing.go b/testing/spectest/shared/capella/operations/attester_slashing.go index 262fa9841ae7..eddae67897a6 100644 --- a/testing/spectest/shared/capella/operations/attester_slashing.go +++ b/testing/spectest/shared/capella/operations/attester_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunAttesterSlashingTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/block_header.go b/testing/spectest/shared/capella/operations/block_header.go index f23710bea50e..0104625308cb 100644 --- a/testing/spectest/shared/capella/operations/block_header.go +++ b/testing/spectest/shared/capella/operations/block_header.go @@ -9,13 +9,13 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/capella/operations/bls_to_execution_changes.go b/testing/spectest/shared/capella/operations/bls_to_execution_changes.go index 523830014a06..ead7295c79e8 100644 --- a/testing/spectest/shared/capella/operations/bls_to_execution_changes.go +++ b/testing/spectest/shared/capella/operations/bls_to_execution_changes.go @@ -7,13 +7,13 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunBLSToExecutionChangeTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/deposit.go b/testing/spectest/shared/capella/operations/deposit.go index b0cf745fec48..8684c6cf1a36 100644 --- a/testing/spectest/shared/capella/operations/deposit.go +++ b/testing/spectest/shared/capella/operations/deposit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunDepositTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/helpers.go b/testing/spectest/shared/capella/operations/helpers.go index 4454c89965a1..55f78b9b847b 100644 --- a/testing/spectest/shared/capella/operations/helpers.go +++ b/testing/spectest/shared/capella/operations/helpers.go @@ -9,14 +9,14 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/capella/operations/proposer_slashing.go b/testing/spectest/shared/capella/operations/proposer_slashing.go index 3a373119f20b..da46494ff81f 100644 --- a/testing/spectest/shared/capella/operations/proposer_slashing.go +++ b/testing/spectest/shared/capella/operations/proposer_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunProposerSlashingTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/sync_committee.go b/testing/spectest/shared/capella/operations/sync_committee.go index 8ecaad250ea0..e08923902bbb 100644 --- a/testing/spectest/shared/capella/operations/sync_committee.go +++ b/testing/spectest/shared/capella/operations/sync_committee.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunSyncCommitteeTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/voluntary_exit.go b/testing/spectest/shared/capella/operations/voluntary_exit.go index b6db2e9cb27d..9a3d09faa8d1 100644 --- a/testing/spectest/shared/capella/operations/voluntary_exit.go +++ b/testing/spectest/shared/capella/operations/voluntary_exit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunVoluntaryExitTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/operations/withdrawals.go b/testing/spectest/shared/capella/operations/withdrawals.go index 66be6e201a71..0c288fb615d9 100644 --- a/testing/spectest/shared/capella/operations/withdrawals.go +++ b/testing/spectest/shared/capella/operations/withdrawals.go @@ -7,15 +7,15 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func RunWithdrawalsTest(t *testing.T, config string) { diff --git a/testing/spectest/shared/capella/rewards/BUILD.bazel b/testing/spectest/shared/capella/rewards/BUILD.bazel index 821e123218a4..0c0551900efa 100644 --- a/testing/spectest/shared/capella/rewards/BUILD.bazel +++ b/testing/spectest/shared/capella/rewards/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["rewards_penalties.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/rewards", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/rewards", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/spectest/shared/capella/rewards/rewards_penalties.go b/testing/spectest/shared/capella/rewards/rewards_penalties.go index 0a6ec8ac5403..f1929301f8a6 100644 --- a/testing/spectest/shared/capella/rewards/rewards_penalties.go +++ b/testing/spectest/shared/capella/rewards/rewards_penalties.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // Delta contains list of rewards and penalties. diff --git a/testing/spectest/shared/capella/sanity/BUILD.bazel b/testing/spectest/shared/capella/sanity/BUILD.bazel index 5f84f9132d15..f41842d50ff0 100644 --- a/testing/spectest/shared/capella/sanity/BUILD.bazel +++ b/testing/spectest/shared/capella/sanity/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "block_processing.yaml.go", "slot_processing.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/sanity", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/sanity", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/capella/sanity/block_processing.go b/testing/spectest/shared/capella/sanity/block_processing.go index 8199990870ee..72301118a57e 100644 --- a/testing/spectest/shared/capella/sanity/block_processing.go +++ b/testing/spectest/shared/capella/sanity/block_processing.go @@ -10,15 +10,15 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/capella/sanity/slot_processing.go b/testing/spectest/shared/capella/sanity/slot_processing.go index b547bcc0514a..fa4ff1bf68cc 100644 --- a/testing/spectest/shared/capella/sanity/slot_processing.go +++ b/testing/spectest/shared/capella/sanity/slot_processing.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/capella/ssz_static/BUILD.bazel b/testing/spectest/shared/capella/ssz_static/BUILD.bazel index df8bd2b3dead..bbcc9cbffc98 100644 --- a/testing/spectest/shared/capella/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/capella/ssz_static/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["ssz_static.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/capella/ssz_static", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/capella/ssz_static", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/state/state-native:go_default_library", diff --git a/testing/spectest/shared/capella/ssz_static/ssz_static.go b/testing/spectest/shared/capella/ssz_static/ssz_static.go index 8fe83834947a..018bca3cd31c 100644 --- a/testing/spectest/shared/capella/ssz_static/ssz_static.go +++ b/testing/spectest/shared/capella/ssz_static/ssz_static.go @@ -6,11 +6,11 @@ import ( "testing" fssz "github.com/prysmaticlabs/fastssz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - common "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/ssz_static" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + common "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/ssz_static" ) // RunSSZStaticTests executes "ssz_static" tests. diff --git a/testing/spectest/shared/common/forkchoice/BUILD.bazel b/testing/spectest/shared/common/forkchoice/BUILD.bazel index 05a70edb63d8..5a5ea8400bf4 100644 --- a/testing/spectest/shared/common/forkchoice/BUILD.bazel +++ b/testing/spectest/shared/common/forkchoice/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "service.go", "type.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/forkchoice", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/forkchoice", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/testing/spectest/shared/common/forkchoice/builder.go b/testing/spectest/shared/common/forkchoice/builder.go index 997f94a89ab7..1e3fc413cd10 100644 --- a/testing/spectest/shared/common/forkchoice/builder.go +++ b/testing/spectest/shared/common/forkchoice/builder.go @@ -8,15 +8,15 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/execution" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/execution" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type Builder struct { diff --git a/testing/spectest/shared/common/forkchoice/builder_test.go b/testing/spectest/shared/common/forkchoice/builder_test.go index 433b58f35b47..e26d7ffac05b 100644 --- a/testing/spectest/shared/common/forkchoice/builder_test.go +++ b/testing/spectest/shared/common/forkchoice/builder_test.go @@ -3,10 +3,10 @@ package forkchoice import ( "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func TestBuilderTick(t *testing.T) { diff --git a/testing/spectest/shared/common/forkchoice/runner.go b/testing/spectest/shared/common/forkchoice/runner.go index 33f69edc6df4..06e369dbec95 100644 --- a/testing/spectest/shared/common/forkchoice/runner.go +++ b/testing/spectest/shared/common/forkchoice/runner.go @@ -6,17 +6,17 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func init() { diff --git a/testing/spectest/shared/common/forkchoice/service.go b/testing/spectest/shared/common/forkchoice/service.go index 558908bac8c2..ee92067a301a 100644 --- a/testing/spectest/shared/common/forkchoice/service.go +++ b/testing/spectest/shared/common/forkchoice/service.go @@ -7,23 +7,23 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" gethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain" - mock "github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/cache/depositcache" - coreTime "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - testDB "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing" - doublylinkedtree "github.com/prysmaticlabs/prysm/v3/beacon-chain/forkchoice/doubly-linked-tree" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/operations/attestations" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - payloadattribute "github.com/prysmaticlabs/prysm/v3/consensus-types/payload-attribute" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - pb "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain" + mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/cache/depositcache" + coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + testDB "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing" + doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/attestations" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + payloadattribute "github.com/prysmaticlabs/prysm/v4/consensus-types/payload-attribute" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + pb "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func startChainService(t testing.TB, diff --git a/testing/spectest/shared/common/ssz_static/BUILD.bazel b/testing/spectest/shared/common/ssz_static/BUILD.bazel index 2431929e8b42..731ab4617068 100644 --- a/testing/spectest/shared/common/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/common/ssz_static/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "ssz_static.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/ssz_static", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/ssz_static", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//testing/require:go_default_library", diff --git a/testing/spectest/shared/common/ssz_static/ssz_static.go b/testing/spectest/shared/common/ssz_static/ssz_static.go index 33d3ebeb4178..86e7ec2e3da7 100644 --- a/testing/spectest/shared/common/ssz_static/ssz_static.go +++ b/testing/spectest/shared/common/ssz_static/ssz_static.go @@ -8,9 +8,9 @@ import ( "github.com/golang/snappy" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunSSZStaticTests executes "ssz_static" tests for the given fork of phase using the provided diff --git a/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go b/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go index 9bf72f44e6cf..57acf52631a6 100644 --- a/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go +++ b/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go @@ -7,10 +7,10 @@ import ( "github.com/pkg/errors" fssz "github.com/prysmaticlabs/fastssz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - common "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/ssz_static" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + common "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/ssz_static" ) func ExampleRunSSZStaticTests() { diff --git a/testing/spectest/shared/phase0/epoch_processing/BUILD.bazel b/testing/spectest/shared/phase0/epoch_processing/BUILD.bazel index b6dc000f9b15..b58d2fab9dd6 100644 --- a/testing/spectest/shared/phase0/epoch_processing/BUILD.bazel +++ b/testing/spectest/shared/phase0/epoch_processing/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "slashings.go", "slashings_reset.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/epoch_processing", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/epoch_processing", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/epoch:go_default_library", diff --git a/testing/spectest/shared/phase0/epoch_processing/effective_balance_updates.go b/testing/spectest/shared/phase0/epoch_processing/effective_balance_updates.go index c53e270be669..fa87816988f9 100644 --- a/testing/spectest/shared/phase0/epoch_processing/effective_balance_updates.go +++ b/testing/spectest/shared/phase0/epoch_processing/effective_balance_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEffectiveBalanceUpdatesTests executes "epoch_processing/effective_balance_updates" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/eth1_data_reset.go b/testing/spectest/shared/phase0/epoch_processing/eth1_data_reset.go index c2527e95c55e..74d8350fc072 100644 --- a/testing/spectest/shared/phase0/epoch_processing/eth1_data_reset.go +++ b/testing/spectest/shared/phase0/epoch_processing/eth1_data_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunEth1DataResetTests executes "epoch_processing/eth1_data_reset" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/helpers.go b/testing/spectest/shared/phase0/epoch_processing/helpers.go index f5d352de45c8..ddec3e799546 100644 --- a/testing/spectest/shared/phase0/epoch_processing/helpers.go +++ b/testing/spectest/shared/phase0/epoch_processing/helpers.go @@ -8,11 +8,11 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" ) diff --git a/testing/spectest/shared/phase0/epoch_processing/historical_roots_update.go b/testing/spectest/shared/phase0/epoch_processing/historical_roots_update.go index 25c62e810148..c9b2ba0b077e 100644 --- a/testing/spectest/shared/phase0/epoch_processing/historical_roots_update.go +++ b/testing/spectest/shared/phase0/epoch_processing/historical_roots_update.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunHistoricalRootsUpdateTests executes "epoch_processing/historical_roots_update" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/justification_and_finalization.go b/testing/spectest/shared/phase0/epoch_processing/justification_and_finalization.go index 19d90ce78e3a..d36cd81cc5d4 100644 --- a/testing/spectest/shared/phase0/epoch_processing/justification_and_finalization.go +++ b/testing/spectest/shared/phase0/epoch_processing/justification_and_finalization.go @@ -5,10 +5,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunJustificationAndFinalizationTests executes "epoch_processing/justification_and_finalization" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/participation_record_updates.go b/testing/spectest/shared/phase0/epoch_processing/participation_record_updates.go index 52c6922ce774..9bf21b6eb898 100644 --- a/testing/spectest/shared/phase0/epoch_processing/participation_record_updates.go +++ b/testing/spectest/shared/phase0/epoch_processing/participation_record_updates.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunParticipationRecordUpdatesTests executes "epoch_processing/participation_record_updates" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/randao_mixes_reset.go b/testing/spectest/shared/phase0/epoch_processing/randao_mixes_reset.go index c690df9aa608..7159eb470b07 100644 --- a/testing/spectest/shared/phase0/epoch_processing/randao_mixes_reset.go +++ b/testing/spectest/shared/phase0/epoch_processing/randao_mixes_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRandaoMixesResetTests executes "epoch_processing/randao_mixes_reset" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/registry_updates.go b/testing/spectest/shared/phase0/epoch_processing/registry_updates.go index 8d5e9628e5a1..9ab3f24c26e4 100644 --- a/testing/spectest/shared/phase0/epoch_processing/registry_updates.go +++ b/testing/spectest/shared/phase0/epoch_processing/registry_updates.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRegistryUpdatesTests executes "epoch_processing/registry_updates" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/rewards_and_penalties.go b/testing/spectest/shared/phase0/epoch_processing/rewards_and_penalties.go index 7c696b75a9d0..90115faf3a7a 100644 --- a/testing/spectest/shared/phase0/epoch_processing/rewards_and_penalties.go +++ b/testing/spectest/shared/phase0/epoch_processing/rewards_and_penalties.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunRewardsAndPenaltiesTests executes "epoch_processing/rewards_and_penalties" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/slashings.go b/testing/spectest/shared/phase0/epoch_processing/slashings.go index 41dff0b3e3f6..dffe9188a0dc 100644 --- a/testing/spectest/shared/phase0/epoch_processing/slashings.go +++ b/testing/spectest/shared/phase0/epoch_processing/slashings.go @@ -5,13 +5,13 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsTests executes "epoch_processing/slashings" tests. diff --git a/testing/spectest/shared/phase0/epoch_processing/slashings_reset.go b/testing/spectest/shared/phase0/epoch_processing/slashings_reset.go index 356e7321c6f6..2b0a69d68b3f 100644 --- a/testing/spectest/shared/phase0/epoch_processing/slashings_reset.go +++ b/testing/spectest/shared/phase0/epoch_processing/slashings_reset.go @@ -4,10 +4,10 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" ) // RunSlashingsResetTests executes "epoch_processing/slashings_reset" tests. diff --git a/testing/spectest/shared/phase0/finality/BUILD.bazel b/testing/spectest/shared/phase0/finality/BUILD.bazel index 4060748a734d..b77d2489e096 100644 --- a/testing/spectest/shared/phase0/finality/BUILD.bazel +++ b/testing/spectest/shared/phase0/finality/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["runner.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/finality", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/finality", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/phase0/finality/runner.go b/testing/spectest/shared/phase0/finality/runner.go index 91e7acf40194..50dd69050c09 100644 --- a/testing/spectest/shared/phase0/finality/runner.go +++ b/testing/spectest/shared/phase0/finality/runner.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/phase0/operations/BUILD.bazel b/testing/spectest/shared/phase0/operations/BUILD.bazel index 182c3155c1f6..44d844c5bb73 100644 --- a/testing/spectest/shared/phase0/operations/BUILD.bazel +++ b/testing/spectest/shared/phase0/operations/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "proposer_slashing.go", "voluntary_exit.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/operations", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/operations", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/blocks:go_default_library", diff --git a/testing/spectest/shared/phase0/operations/attestation.go b/testing/spectest/shared/phase0/operations/attestation.go index b2ccbe001aa6..9b8784d7ece6 100644 --- a/testing/spectest/shared/phase0/operations/attestation.go +++ b/testing/spectest/shared/phase0/operations/attestation.go @@ -7,13 +7,13 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunAttestationTest executes "operations/attestation" tests. diff --git a/testing/spectest/shared/phase0/operations/attester_slashing.go b/testing/spectest/shared/phase0/operations/attester_slashing.go index 08a007aa49d8..d4751c455797 100644 --- a/testing/spectest/shared/phase0/operations/attester_slashing.go +++ b/testing/spectest/shared/phase0/operations/attester_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunAttesterSlashingTest executes "operations/attester_slashing" tests. diff --git a/testing/spectest/shared/phase0/operations/block_header.go b/testing/spectest/shared/phase0/operations/block_header.go index 9e27c5b51f21..4325c2bdd8e1 100644 --- a/testing/spectest/shared/phase0/operations/block_header.go +++ b/testing/spectest/shared/phase0/operations/block_header.go @@ -9,13 +9,13 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/phase0/operations/deposit.go b/testing/spectest/shared/phase0/operations/deposit.go index 15c3fdef9280..044dba8da14e 100644 --- a/testing/spectest/shared/phase0/operations/deposit.go +++ b/testing/spectest/shared/phase0/operations/deposit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunDepositTest executes "operations/deposit" tests. diff --git a/testing/spectest/shared/phase0/operations/helpers.go b/testing/spectest/shared/phase0/operations/helpers.go index 8c19394a4a7c..d50b0e3d7a67 100644 --- a/testing/spectest/shared/phase0/operations/helpers.go +++ b/testing/spectest/shared/phase0/operations/helpers.go @@ -9,14 +9,14 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/phase0/operations/proposer_slashing.go b/testing/spectest/shared/phase0/operations/proposer_slashing.go index 9808dfe3b572..df7304cbcef0 100644 --- a/testing/spectest/shared/phase0/operations/proposer_slashing.go +++ b/testing/spectest/shared/phase0/operations/proposer_slashing.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - v "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/validators" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + v "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunProposerSlashingTest executes "operations/proposer_slashing" tests. diff --git a/testing/spectest/shared/phase0/operations/voluntary_exit.go b/testing/spectest/shared/phase0/operations/voluntary_exit.go index a1026bdfc821..96ba425bedf9 100644 --- a/testing/spectest/shared/phase0/operations/voluntary_exit.go +++ b/testing/spectest/shared/phase0/operations/voluntary_exit.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunVoluntaryExitTest executes "operations/voluntary_exit" tests. diff --git a/testing/spectest/shared/phase0/rewards/BUILD.bazel b/testing/spectest/shared/phase0/rewards/BUILD.bazel index ac7f6d836319..b488b9e7c6f5 100644 --- a/testing/spectest/shared/phase0/rewards/BUILD.bazel +++ b/testing/spectest/shared/phase0/rewards/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["rewards_penalties.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/rewards", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/rewards", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/epoch/precompute:go_default_library", diff --git a/testing/spectest/shared/phase0/rewards/rewards_penalties.go b/testing/spectest/shared/phase0/rewards/rewards_penalties.go index a94d1eb3d64b..8bd7f11b0cb4 100644 --- a/testing/spectest/shared/phase0/rewards/rewards_penalties.go +++ b/testing/spectest/shared/phase0/rewards/rewards_penalties.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/epoch/precompute" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // Delta contains list of rewards and penalties. diff --git a/testing/spectest/shared/phase0/sanity/BUILD.bazel b/testing/spectest/shared/phase0/sanity/BUILD.bazel index eb5a86bcb194..1e04ac39c804 100644 --- a/testing/spectest/shared/phase0/sanity/BUILD.bazel +++ b/testing/spectest/shared/phase0/sanity/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "block_processing.yaml.go", "slot_processing.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/sanity", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/sanity", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/phase0/sanity/block_processing.go b/testing/spectest/shared/phase0/sanity/block_processing.go index 08fd9f49d059..a6cce68ed162 100644 --- a/testing/spectest/shared/phase0/sanity/block_processing.go +++ b/testing/spectest/shared/phase0/sanity/block_processing.go @@ -10,15 +10,15 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/phase0/sanity/slot_processing.go b/testing/spectest/shared/phase0/sanity/slot_processing.go index 09b7d8bb7643..ecd8f86f1323 100644 --- a/testing/spectest/shared/phase0/sanity/slot_processing.go +++ b/testing/spectest/shared/phase0/sanity/slot_processing.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" "google.golang.org/protobuf/proto" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/testing/spectest/shared/phase0/shuffling/core/shuffle/BUILD.bazel b/testing/spectest/shared/phase0/shuffling/core/shuffle/BUILD.bazel index a7d0749a0da4..8cbe9d6c7aea 100644 --- a/testing/spectest/shared/phase0/shuffling/core/shuffle/BUILD.bazel +++ b/testing/spectest/shared/phase0/shuffling/core/shuffle/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "shuffle.go", "shuffle_test_format.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/shuffling/core/shuffle", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/shuffling/core/shuffle", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle.go b/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle.go index 22603da94913..e804fc3bc463 100644 --- a/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle.go +++ b/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle.go @@ -9,11 +9,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/go-yaml/yaml" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) // RunShuffleTests executes "shuffling/core/shuffle" tests. diff --git a/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle_test_format.go b/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle_test_format.go index 967f219a8f9e..34ed7a8aa8c6 100644 --- a/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle_test_format.go +++ b/testing/spectest/shared/phase0/shuffling/core/shuffle/shuffle_test_format.go @@ -1,6 +1,6 @@ package shuffle -import "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" +import "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" // ShuffleTestCase -- type ShuffleTestCase struct { diff --git a/testing/spectest/shared/phase0/ssz_static/BUILD.bazel b/testing/spectest/shared/phase0/ssz_static/BUILD.bazel index 684a5fd9c210..1c0801b6cd3a 100644 --- a/testing/spectest/shared/phase0/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/phase0/ssz_static/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["ssz_static.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/phase0/ssz_static", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/phase0/ssz_static", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//beacon-chain/state/state-native:go_default_library", diff --git a/testing/spectest/shared/phase0/ssz_static/ssz_static.go b/testing/spectest/shared/phase0/ssz_static/ssz_static.go index beab741a954b..0d3e472b993c 100644 --- a/testing/spectest/shared/phase0/ssz_static/ssz_static.go +++ b/testing/spectest/shared/phase0/ssz_static/ssz_static.go @@ -6,10 +6,10 @@ import ( "testing" fssz "github.com/prysmaticlabs/fastssz" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - common "github.com/prysmaticlabs/prysm/v3/testing/spectest/shared/common/ssz_static" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + common "github.com/prysmaticlabs/prysm/v4/testing/spectest/shared/common/ssz_static" ) // RunSSZStaticTests executes "ssz_static" tests. diff --git a/testing/spectest/utils/BUILD.bazel b/testing/spectest/utils/BUILD.bazel index 087bf8d68121..84dbe77814c9 100644 --- a/testing/spectest/utils/BUILD.bazel +++ b/testing/spectest/utils/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "config.go", "utils.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/spectest/utils", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/spectest/utils", visibility = ["//testing/spectest:__subpackages__"], deps = [ "//config/params:go_default_library", diff --git a/testing/spectest/utils/config.go b/testing/spectest/utils/config.go index a3b6e7af8aa1..0fed7e1caf33 100644 --- a/testing/spectest/utils/config.go +++ b/testing/spectest/utils/config.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) // SetConfig sets the global params for spec tests depending on the option chosen. diff --git a/testing/spectest/utils/config_test.go b/testing/spectest/utils/config_test.go index cc2444e9783f..546ab27c0c10 100644 --- a/testing/spectest/utils/config_test.go +++ b/testing/spectest/utils/config_test.go @@ -3,9 +3,9 @@ package utils import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestConfig(t *testing.T) { diff --git a/testing/spectest/utils/utils.go b/testing/spectest/utils/utils.go index 177b5aa6aa72..880cc2ed7134 100644 --- a/testing/spectest/utils/utils.go +++ b/testing/spectest/utils/utils.go @@ -8,7 +8,7 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/ghodss/yaml" jsoniter "github.com/json-iterator/go" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) var json = jsoniter.Config{ diff --git a/testing/util/BUILD.bazel b/testing/util/BUILD.bazel index 633dd8bee864..71c27c181ba6 100644 --- a/testing/util/BUILD.bazel +++ b/testing/util/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "sync_committee.go", "wait_timeout.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/testing/util", + importpath = "github.com/prysmaticlabs/prysm/v4/testing/util", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/altair:go_default_library", diff --git a/testing/util/altair.go b/testing/util/altair.go index a65565166734..074b7d0fa090 100644 --- a/testing/util/altair.go +++ b/testing/util/altair.go @@ -7,22 +7,22 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + consensusblocks "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // DeterministicGenesisStateAltair returns a genesis state in hard fork 1 format made using the deterministic deposits. diff --git a/testing/util/attestation.go b/testing/util/attestation.go index 8611007f5914..830c887ce3dc 100644 --- a/testing/util/attestation.go +++ b/testing/util/attestation.go @@ -7,20 +7,20 @@ import ( "math" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - attv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + attv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" log "github.com/sirupsen/logrus" ) diff --git a/testing/util/attestation_test.go b/testing/util/attestation_test.go index 0538b1313ae9..f027496b66c2 100644 --- a/testing/util/attestation_test.go +++ b/testing/util/attestation_test.go @@ -3,11 +3,11 @@ package util import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestHydrateAttestation(t *testing.T) { diff --git a/testing/util/bellatrix.go b/testing/util/bellatrix.go index d8d8a9e86137..db8b1b1c8e07 100644 --- a/testing/util/bellatrix.go +++ b/testing/util/bellatrix.go @@ -7,19 +7,19 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // GenerateFullBlockBellatrix generates a fully valid Bellatrix block with the requested parameters. diff --git a/testing/util/bellatrix_state.go b/testing/util/bellatrix_state.go index f7cb9bb698b2..c0fbecf48eca 100644 --- a/testing/util/bellatrix_state.go +++ b/testing/util/bellatrix_state.go @@ -5,16 +5,16 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // DeterministicGenesisStateBellatrix returns a genesis state in Bellatrix format made using the deterministic deposits. diff --git a/testing/util/bellatrix_state_test.go b/testing/util/bellatrix_state_test.go index b436434527ff..e54bfad4560d 100644 --- a/testing/util/bellatrix_state_test.go +++ b/testing/util/bellatrix_state_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestDeterministicGenesisStateBellatrix(t *testing.T) { diff --git a/testing/util/block.go b/testing/util/block.go index 759aba99425d..cb748f0f6a9c 100644 --- a/testing/util/block.go +++ b/testing/util/block.go @@ -5,25 +5,25 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - v1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assertions" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + v1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assertions" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // BlockGenConfig is used to define the requested conditions diff --git a/testing/util/block_test.go b/testing/util/block_test.go index 7dc5a4ac4a1b..90414a6be00d 100644 --- a/testing/util/block_test.go +++ b/testing/util/block_test.go @@ -4,18 +4,18 @@ import ( "context" "testing" - coreBlock "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/stateutils" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbv1 "github.com/prysmaticlabs/prysm/v3/proto/eth/v1" - ethpbv2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpbalpha "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + coreBlock "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/stateutils" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbv1 "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" + ethpbv2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpbalpha "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenerateFullBlock_PassesStateTransition(t *testing.T) { diff --git a/testing/util/capella_block.go b/testing/util/capella_block.go index 5d1896ed947e..1d4b0f4b4855 100644 --- a/testing/util/capella_block.go +++ b/testing/util/capella_block.go @@ -6,19 +6,19 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // GenerateFullBlockCapella generates a fully valid Capella block with the requested parameters. diff --git a/testing/util/capella_block_test.go b/testing/util/capella_block_test.go index f8c86ee9a6c8..96fbcd0c6755 100644 --- a/testing/util/capella_block_test.go +++ b/testing/util/capella_block_test.go @@ -3,12 +3,12 @@ package util import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGenerateBLSToExecutionChange(t *testing.T) { diff --git a/testing/util/capella_state.go b/testing/util/capella_state.go index c3e69e6c7da9..2a15c9d31250 100644 --- a/testing/util/capella_state.go +++ b/testing/util/capella_state.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // DeterministicGenesisStateCapella returns a genesis state in Capella format made using the deterministic deposits. diff --git a/testing/util/deposits.go b/testing/util/deposits.go index 56149a38d79d..d6ea056fe8ca 100644 --- a/testing/util/deposits.go +++ b/testing/util/deposits.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" ) var lock sync.Mutex diff --git a/testing/util/deposits_test.go b/testing/util/deposits_test.go index 97d9c8462554..0732f28dee32 100644 --- a/testing/util/deposits_test.go +++ b/testing/util/deposits_test.go @@ -6,9 +6,9 @@ import ( "encoding/hex" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/protobuf/proto" ) diff --git a/testing/util/helpers.go b/testing/util/helpers.go index 31c5b7df03b4..6d536927669d 100644 --- a/testing/util/helpers.go +++ b/testing/util/helpers.go @@ -6,18 +6,18 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // RandaoReveal returns a signature of the requested epoch using the beacon proposer private key. diff --git a/testing/util/helpers_test.go b/testing/util/helpers_test.go index 4df089590f3a..eb86b2cad5b6 100644 --- a/testing/util/helpers_test.go +++ b/testing/util/helpers_test.go @@ -6,15 +6,15 @@ import ( "encoding/binary" "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func TestBlockSignature(t *testing.T) { diff --git a/testing/util/merge.go b/testing/util/merge.go index 051617299257..2e0970d9ecea 100644 --- a/testing/util/merge.go +++ b/testing/util/merge.go @@ -1,8 +1,8 @@ package util import ( - v2 "github.com/prysmaticlabs/prysm/v3/proto/eth/v2" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + v2 "github.com/prysmaticlabs/prysm/v4/proto/eth/v2" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // NewBeaconBlockBellatrix creates a beacon block with minimum marshalable fields. diff --git a/testing/util/premine-state.go b/testing/util/premine-state.go index d0f6c277f128..d276ee53ebbe 100644 --- a/testing/util/premine-state.go +++ b/testing/util/premine-state.go @@ -5,22 +5,22 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stateutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/container/trie" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/stateutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/container/trie" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/runtime/version" ) var errUnsupportedVersion = errors.New("schema version not supported by premineGenesisConfig") @@ -29,7 +29,7 @@ type premineGenesisConfig struct { GenesisTime uint64 NVals uint64 PregenesisCreds uint64 - Version int // as in "github.com/prysmaticlabs/prysm/v3/runtime/version" + Version int // as in "github.com/prysmaticlabs/prysm/v4/runtime/version" GB *types.Block // geth genesis block } diff --git a/testing/util/state.go b/testing/util/state.go index 50e116f1bc00..8706f38070f0 100644 --- a/testing/util/state.go +++ b/testing/util/state.go @@ -7,16 +7,16 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/prysmaticlabs/go-bitfield" - b "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/iface" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + b "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/iface" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) // FillRootsNaturalOpt is meant to be used as an option when calling NewBeaconState. diff --git a/testing/util/state_test.go b/testing/util/state_test.go index 97a891eae6fd..02330182c5ad 100644 --- a/testing/util/state_test.go +++ b/testing/util/state_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestNewBeaconState(t *testing.T) { diff --git a/testing/util/sync_aggregate.go b/testing/util/sync_aggregate.go index 9795ae7e3225..ae025755a677 100644 --- a/testing/util/sync_aggregate.go +++ b/testing/util/sync_aggregate.go @@ -3,14 +3,14 @@ package util import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - p2pType "github.com/prysmaticlabs/prysm/v3/beacon-chain/p2p/types" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + p2pType "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func generateSyncAggregate(st state.BeaconState, privs []bls.SecretKey, parentRoot [32]byte) (*ethpb.SyncAggregate, error) { diff --git a/testing/util/sync_committee.go b/testing/util/sync_committee.go index ea7d8f4d09af..c2ac2ae1140f 100644 --- a/testing/util/sync_committee.go +++ b/testing/util/sync_committee.go @@ -1,10 +1,10 @@ package util import ( - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // HydrateSyncCommittee hydrates the provided sync committee message. diff --git a/time/BUILD.bazel b/time/BUILD.bazel index 12240f4edada..c7e2684eccba 100644 --- a/time/BUILD.bazel +++ b/time/BUILD.bazel @@ -3,6 +3,6 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["utils.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/time", + importpath = "github.com/prysmaticlabs/prysm/v4/time", visibility = ["//visibility:public"], ) diff --git a/time/mclock/BUILD.bazel b/time/mclock/BUILD.bazel index 53efdd7cb053..4e530a4f6692 100644 --- a/time/mclock/BUILD.bazel +++ b/time/mclock/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["mclock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/time/mclock", + importpath = "github.com/prysmaticlabs/prysm/v4/time/mclock", visibility = ["//visibility:public"], deps = ["@com_github_aristanetworks_goarista//monotime:go_default_library"], ) diff --git a/time/slots/BUILD.bazel b/time/slots/BUILD.bazel index a6f41193ee31..4f1b0c78e387 100644 --- a/time/slots/BUILD.bazel +++ b/time/slots/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "slotticker.go", "slottime.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/time/slots", + importpath = "github.com/prysmaticlabs/prysm/v4/time/slots", visibility = ["//visibility:public"], deps = [ "//config/params:go_default_library", diff --git a/time/slots/countdown.go b/time/slots/countdown.go index 3c4965516444..027cc834da25 100644 --- a/time/slots/countdown.go +++ b/time/slots/countdown.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" "github.com/sirupsen/logrus" ) diff --git a/time/slots/countdown_test.go b/time/slots/countdown_test.go index af8570204260..3e9fb3ec2e66 100644 --- a/time/slots/countdown_test.go +++ b/time/slots/countdown_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/time/slots/slotticker.go b/time/slots/slotticker.go index f6eea0d3dfc1..4d616b70ff5b 100644 --- a/time/slots/slotticker.go +++ b/time/slots/slotticker.go @@ -4,8 +4,8 @@ package slots import ( "time" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) // The Ticker interface defines a type which can expose a diff --git a/time/slots/slotticker_test.go b/time/slots/slotticker_test.go index f096b611243f..7b173fc5e5b2 100644 --- a/time/slots/slotticker_test.go +++ b/time/slots/slotticker_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) var _ Ticker = (*SlotTicker)(nil) diff --git a/time/slots/slottime.go b/time/slots/slottime.go index e0d61c6c2027..2c70215d728a 100644 --- a/time/slots/slottime.go +++ b/time/slots/slottime.go @@ -6,10 +6,10 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - mathutil "github.com/prysmaticlabs/prysm/v3/math" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + mathutil "github.com/prysmaticlabs/prysm/v4/math" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) // MaxSlotBuffer specifies the max buffer given to slots from diff --git a/time/slots/slottime_test.go b/time/slots/slottime_test.go index 1313f24203ea..b76b168ee07e 100644 --- a/time/slots/slottime_test.go +++ b/time/slots/slottime_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" ) func TestSlotsSinceGenesis(t *testing.T) { diff --git a/time/slots/testing/BUILD.bazel b/time/slots/testing/BUILD.bazel index 563ee3908ad0..6c743609dece 100644 --- a/time/slots/testing/BUILD.bazel +++ b/time/slots/testing/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/time/slots/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/time/slots/testing", visibility = ["//visibility:public"], deps = ["//consensus-types/primitives:go_default_library"], ) diff --git a/time/slots/testing/mock.go b/time/slots/testing/mock.go index 3b7295eff342..31b6a580c496 100644 --- a/time/slots/testing/mock.go +++ b/time/slots/testing/mock.go @@ -1,7 +1,7 @@ // Package testing includes useful mocks for slot tickers in unit tests. package testing -import "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" +import "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" // MockTicker defines a useful struct for mocking the Ticker interface // from the slotutil package. diff --git a/time/slots/testing/mock_test.go b/time/slots/testing/mock_test.go index e4253a38fb85..85ebb8276edd 100644 --- a/time/slots/testing/mock_test.go +++ b/time/slots/testing/mock_test.go @@ -1,7 +1,7 @@ package testing import ( - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) var _ slots.Ticker = (*MockTicker)(nil) diff --git a/tools/analyzers/comparesame/BUILD.bazel b/tools/analyzers/comparesame/BUILD.bazel index 3828b1657e67..8bc91adf1e6b 100644 --- a/tools/analyzers/comparesame/BUILD.bazel +++ b/tools/analyzers/comparesame/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/comparesame", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/comparesame", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/comparesame/analyzer_test.go b/tools/analyzers/comparesame/analyzer_test.go index 12e804261a88..fb5fe13f9009 100644 --- a/tools/analyzers/comparesame/analyzer_test.go +++ b/tools/analyzers/comparesame/analyzer_test.go @@ -3,7 +3,7 @@ package comparesame import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/cryptorand/BUILD.bazel b/tools/analyzers/cryptorand/BUILD.bazel index 10f39fffb500..dc3a484987b5 100644 --- a/tools/analyzers/cryptorand/BUILD.bazel +++ b/tools/analyzers/cryptorand/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/cryptorand", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/cryptorand", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/cryptorand/analyzer_test.go b/tools/analyzers/cryptorand/analyzer_test.go index 69e365987543..65285fe826bf 100644 --- a/tools/analyzers/cryptorand/analyzer_test.go +++ b/tools/analyzers/cryptorand/analyzer_test.go @@ -3,7 +3,7 @@ package cryptorand import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/errcheck/BUILD.bazel b/tools/analyzers/errcheck/BUILD.bazel index 59937affb23d..4cffa490e705 100644 --- a/tools/analyzers/errcheck/BUILD.bazel +++ b/tools/analyzers/errcheck/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/errcheck", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/errcheck", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/errcheck/embedded_walker_test.go b/tools/analyzers/errcheck/embedded_walker_test.go index b62ee8acd2c1..cbf1fea2e249 100644 --- a/tools/analyzers/errcheck/embedded_walker_test.go +++ b/tools/analyzers/errcheck/embedded_walker_test.go @@ -7,8 +7,8 @@ import ( "go/types" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) const commonSrc = ` diff --git a/tools/analyzers/featureconfig/BUILD.bazel b/tools/analyzers/featureconfig/BUILD.bazel index 94b259334859..8c4db3bb6359 100644 --- a/tools/analyzers/featureconfig/BUILD.bazel +++ b/tools/analyzers/featureconfig/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/featureconfig", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/featureconfig", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/gocognit/BUILD.bazel b/tools/analyzers/gocognit/BUILD.bazel index 6be8ca42ff2b..2ea0574d24fd 100644 --- a/tools/analyzers/gocognit/BUILD.bazel +++ b/tools/analyzers/gocognit/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/gocognit", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/gocognit", visibility = ["//visibility:public"], deps = [ "@com_github_uudashr_gocognit//:go_default_library", diff --git a/tools/analyzers/ineffassign/BUILD.bazel b/tools/analyzers/ineffassign/BUILD.bazel index 92539697fcd5..f6ce219c2202 100644 --- a/tools/analyzers/ineffassign/BUILD.bazel +++ b/tools/analyzers/ineffassign/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "analyzer.go", "ineffassign.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/ineffassign", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/ineffassign", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/ineffassign/analyzer_test.go b/tools/analyzers/ineffassign/analyzer_test.go index 5cd15e60f138..29b3e6729bda 100644 --- a/tools/analyzers/ineffassign/analyzer_test.go +++ b/tools/analyzers/ineffassign/analyzer_test.go @@ -3,7 +3,7 @@ package ineffassign import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/interfacechecker/BUILD.bazel b/tools/analyzers/interfacechecker/BUILD.bazel index 89cfd2046838..71737dc99b6f 100644 --- a/tools/analyzers/interfacechecker/BUILD.bazel +++ b/tools/analyzers/interfacechecker/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/interfacechecker", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/interfacechecker", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/logruswitherror/BUILD.bazel b/tools/analyzers/logruswitherror/BUILD.bazel index 880354f6077e..9a6f419be8d9 100644 --- a/tools/analyzers/logruswitherror/BUILD.bazel +++ b/tools/analyzers/logruswitherror/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/logruswitherror", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/logruswitherror", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/logruswitherror/analyzer_test.go b/tools/analyzers/logruswitherror/analyzer_test.go index 8e5629051693..eaca45a7aa2a 100644 --- a/tools/analyzers/logruswitherror/analyzer_test.go +++ b/tools/analyzers/logruswitherror/analyzer_test.go @@ -3,7 +3,7 @@ package logruswitherror import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/maligned/BUILD.bazel b/tools/analyzers/maligned/BUILD.bazel index f9fcfa7320a1..0c26d41dff22 100644 --- a/tools/analyzers/maligned/BUILD.bazel +++ b/tools/analyzers/maligned/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "analyzer.go", "maligned.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/maligned", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/maligned", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/nop/BUILD.bazel b/tools/analyzers/nop/BUILD.bazel index 25c257add30c..e7c58b02b76a 100644 --- a/tools/analyzers/nop/BUILD.bazel +++ b/tools/analyzers/nop/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/nop", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/nop", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/nop/analyzer_test.go b/tools/analyzers/nop/analyzer_test.go index a1e912cee212..11419d937e8c 100644 --- a/tools/analyzers/nop/analyzer_test.go +++ b/tools/analyzers/nop/analyzer_test.go @@ -3,7 +3,7 @@ package nop import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/properpermissions/BUILD.bazel b/tools/analyzers/properpermissions/BUILD.bazel index cbe178bc8799..ae266b9a6ae8 100644 --- a/tools/analyzers/properpermissions/BUILD.bazel +++ b/tools/analyzers/properpermissions/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/properpermissions", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/properpermissions", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/properpermissions/analyzer_test.go b/tools/analyzers/properpermissions/analyzer_test.go index 09236f972ab8..e1e0923b7df6 100644 --- a/tools/analyzers/properpermissions/analyzer_test.go +++ b/tools/analyzers/properpermissions/analyzer_test.go @@ -3,7 +3,7 @@ package properpermissions import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/recursivelock/BUILD.bazel b/tools/analyzers/recursivelock/BUILD.bazel index 3fbe41b68cc8..afe1645aebcb 100644 --- a/tools/analyzers/recursivelock/BUILD.bazel +++ b/tools/analyzers/recursivelock/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/recursivelock", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/recursivelock", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/recursivelock/analyzer_test.go b/tools/analyzers/recursivelock/analyzer_test.go index b3f2f5dea7bd..94cf24950ce4 100644 --- a/tools/analyzers/recursivelock/analyzer_test.go +++ b/tools/analyzers/recursivelock/analyzer_test.go @@ -3,7 +3,7 @@ package recursivelock import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/shadowpredecl/BUILD.bazel b/tools/analyzers/shadowpredecl/BUILD.bazel index d48ba47fd01c..aa282ac957b6 100644 --- a/tools/analyzers/shadowpredecl/BUILD.bazel +++ b/tools/analyzers/shadowpredecl/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/shadowpredecl", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/shadowpredecl", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/shadowpredecl/analyzer_test.go b/tools/analyzers/shadowpredecl/analyzer_test.go index c427217cab64..150773927e22 100644 --- a/tools/analyzers/shadowpredecl/analyzer_test.go +++ b/tools/analyzers/shadowpredecl/analyzer_test.go @@ -3,7 +3,7 @@ package shadowpredecl import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/slicedirect/BUILD.bazel b/tools/analyzers/slicedirect/BUILD.bazel index 1e02c027cace..67b5c87aa4d7 100644 --- a/tools/analyzers/slicedirect/BUILD.bazel +++ b/tools/analyzers/slicedirect/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/slicedirect", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/slicedirect", visibility = ["//visibility:public"], deps = [ "@org_golang_x_tools//go/analysis:go_default_library", diff --git a/tools/analyzers/slicedirect/analyzer_test.go b/tools/analyzers/slicedirect/analyzer_test.go index 8f31c92ff938..34c5047e395a 100644 --- a/tools/analyzers/slicedirect/analyzer_test.go +++ b/tools/analyzers/slicedirect/analyzer_test.go @@ -3,7 +3,7 @@ package slicedirect import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" + "github.com/prysmaticlabs/prysm/v4/build/bazel" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/analyzers/uintcast/BUILD.bazel b/tools/analyzers/uintcast/BUILD.bazel index 377585a46617..36c5dc7e9fc1 100644 --- a/tools/analyzers/uintcast/BUILD.bazel +++ b/tools/analyzers/uintcast/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["analyzer.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/analyzers/uintcast", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/analyzers/uintcast", visibility = ["//visibility:public"], deps = [ "@com_github_gostaticanalysis_comment//:go_default_library", diff --git a/tools/analyzers/uintcast/analyzer_test.go b/tools/analyzers/uintcast/analyzer_test.go index bb456ba1276f..e4098af86afc 100644 --- a/tools/analyzers/uintcast/analyzer_test.go +++ b/tools/analyzers/uintcast/analyzer_test.go @@ -3,8 +3,8 @@ package uintcast_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/build/bazel" - "github.com/prysmaticlabs/prysm/v3/tools/analyzers/uintcast" + "github.com/prysmaticlabs/prysm/v4/build/bazel" + "github.com/prysmaticlabs/prysm/v4/tools/analyzers/uintcast" "golang.org/x/tools/go/analysis/analysistest" ) diff --git a/tools/beacon-fuzz/BUILD.bazel b/tools/beacon-fuzz/BUILD.bazel index 5e53ba4183f3..612d3d03b7da 100644 --- a/tools/beacon-fuzz/BUILD.bazel +++ b/tools/beacon-fuzz/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//io/file:go_default_library", ], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/beacon-fuzz", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/beacon-fuzz", visibility = ["//visibility:private"], ) diff --git a/tools/beacon-fuzz/main.go b/tools/beacon-fuzz/main.go index 21dd77cf9185..99f6f67baa2b 100644 --- a/tools/beacon-fuzz/main.go +++ b/tools/beacon-fuzz/main.go @@ -9,7 +9,7 @@ import ( "strconv" "text/template" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/io/file" ) var ( diff --git a/tools/benchmark-files-gen/BUILD.bazel b/tools/benchmark-files-gen/BUILD.bazel index b931750ab37d..15c388fa2642 100644 --- a/tools/benchmark-files-gen/BUILD.bazel +++ b/tools/benchmark-files-gen/BUILD.bazel @@ -5,7 +5,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/benchmark-files-gen", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/benchmark-files-gen", visibility = ["//visibility:private"], deps = [ "//beacon-chain/core/helpers:go_default_library", diff --git a/tools/benchmark-files-gen/main.go b/tools/benchmark-files-gen/main.go index b07800f946c2..6a2be152d320 100644 --- a/tools/benchmark-files-gen/main.go +++ b/tools/benchmark-files-gen/main.go @@ -7,20 +7,20 @@ import ( "path" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/io/file" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/testing/benchmark" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/io/file" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/testing/benchmark" + "github.com/prysmaticlabs/prysm/v4/testing/util" log "github.com/sirupsen/logrus" ) diff --git a/tools/blocktree/BUILD.bazel b/tools/blocktree/BUILD.bazel index c44cc0b81522..cd5ed8f27d66 100644 --- a/tools/blocktree/BUILD.bazel +++ b/tools/blocktree/BUILD.bazel @@ -4,7 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/blocktree", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/blocktree", visibility = ["//visibility:private"], deps = [ "//beacon-chain/db:go_default_library", diff --git a/tools/blocktree/main.go b/tools/blocktree/main.go index 0ed702bf624f..7e8a3846d318 100644 --- a/tools/blocktree/main.go +++ b/tools/blocktree/main.go @@ -16,9 +16,9 @@ import ( "strconv" "github.com/emicklei/dot" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/filters" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/filters" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) var ( diff --git a/tools/bootnode/BUILD.bazel b/tools/bootnode/BUILD.bazel index a6d2e3c95eb4..9922bf8bf310 100644 --- a/tools/bootnode/BUILD.bazel +++ b/tools/bootnode/BUILD.bazel @@ -7,7 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( name = "go_default_library", srcs = ["bootnode.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/bootnode", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/bootnode", visibility = ["//visibility:private"], deps = [ "//async:go_default_library", diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index 6aae5163c488..18e55c2fe2f1 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -32,16 +32,16 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/network" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/network" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "github.com/sirupsen/logrus" ) diff --git a/tools/bootnode/bootnode_test.go b/tools/bootnode/bootnode_test.go index d70eac3a9833..5a7fcbbea572 100644 --- a/tools/bootnode/bootnode_test.go +++ b/tools/bootnode/bootnode_test.go @@ -11,11 +11,11 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/libp2p/go-libp2p/core/crypto" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/network" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/network" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" ) diff --git a/tools/enr-calculator/BUILD.bazel b/tools/enr-calculator/BUILD.bazel index b98ec7c2ae92..85c591948cc5 100644 --- a/tools/enr-calculator/BUILD.bazel +++ b/tools/enr-calculator/BUILD.bazel @@ -7,7 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/enr-calculator", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/enr-calculator", visibility = ["//visibility:private"], deps = [ "//crypto/ecdsa:go_default_library", diff --git a/tools/enr-calculator/main.go b/tools/enr-calculator/main.go index 1d653e547eaf..6f442fa47078 100644 --- a/tools/enr-calculator/main.go +++ b/tools/enr-calculator/main.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/crypto" - ecdsaprysm "github.com/prysmaticlabs/prysm/v3/crypto/ecdsa" - "github.com/prysmaticlabs/prysm/v3/io/file" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" + ecdsaprysm "github.com/prysmaticlabs/prysm/v4/crypto/ecdsa" + "github.com/prysmaticlabs/prysm/v4/io/file" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" log "github.com/sirupsen/logrus" ) diff --git a/tools/eth1exporter/BUILD.bazel b/tools/eth1exporter/BUILD.bazel index 2ba0a47430f7..ed404e66ee37 100644 --- a/tools/eth1exporter/BUILD.bazel +++ b/tools/eth1exporter/BUILD.bazel @@ -7,7 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/eth1exporter", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/eth1exporter", visibility = ["//visibility:private"], deps = [ "//runtime/maxprocs:go_default_library", diff --git a/tools/eth1exporter/main.go b/tools/eth1exporter/main.go index 4a5af1f2d005..289b25a4fdd0 100644 --- a/tools/eth1exporter/main.go +++ b/tools/eth1exporter/main.go @@ -17,7 +17,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/params" - _ "github.com/prysmaticlabs/prysm/v3/runtime/maxprocs" + _ "github.com/prysmaticlabs/prysm/v4/runtime/maxprocs" "github.com/sirupsen/logrus" ) diff --git a/tools/eth1voting/BUILD.bazel b/tools/eth1voting/BUILD.bazel index 3c7c7bc05b89..d9f083930a7e 100644 --- a/tools/eth1voting/BUILD.bazel +++ b/tools/eth1voting/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "main.go", "votes.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/eth1voting", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/eth1voting", visibility = ["//visibility:private"], deps = [ "//config/params:go_default_library", diff --git a/tools/eth1voting/main.go b/tools/eth1voting/main.go index 41e9ecc9f19b..8bc5c33dede9 100644 --- a/tools/eth1voting/main.go +++ b/tools/eth1voting/main.go @@ -6,12 +6,12 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "golang.org/x/sync/errgroup" "google.golang.org/grpc" ) diff --git a/tools/eth1voting/votes.go b/tools/eth1voting/votes.go index ea073e830436..05816ce7b25d 100644 --- a/tools/eth1voting/votes.go +++ b/tools/eth1voting/votes.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + v1alpha1 "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type votes struct { diff --git a/tools/exploredb/BUILD.bazel b/tools/exploredb/BUILD.bazel index 5ccf72319f8b..050ec492b3b0 100644 --- a/tools/exploredb/BUILD.bazel +++ b/tools/exploredb/BUILD.bazel @@ -4,7 +4,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/exploredb", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/exploredb", visibility = ["//visibility:private"], deps = [ "//beacon-chain/db/kv:go_default_library", diff --git a/tools/exploredb/main.go b/tools/exploredb/main.go index e803bf1ac8f8..529abc55fe34 100644 --- a/tools/exploredb/main.go +++ b/tools/exploredb/main.go @@ -18,12 +18,12 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/kv" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/state" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/kv" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/state" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" log "github.com/sirupsen/logrus" "github.com/status-im/keycard-go/hexutils" bolt "go.etcd.io/bbolt" diff --git a/tools/extractor/BUILD.bazel b/tools/extractor/BUILD.bazel index 66046ed69db6..796b8b483889 100644 --- a/tools/extractor/BUILD.bazel +++ b/tools/extractor/BUILD.bazel @@ -4,7 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/extractor", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/extractor", visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/transition/interop:go_default_library", diff --git a/tools/extractor/main.go b/tools/extractor/main.go index ab802a81c191..1676118d5e28 100644 --- a/tools/extractor/main.go +++ b/tools/extractor/main.go @@ -5,10 +5,10 @@ import ( "flag" "fmt" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/interop" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition/interop" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) var ( diff --git a/tools/forkchecker/BUILD.bazel b/tools/forkchecker/BUILD.bazel index de90ab86cf11..dce489583f43 100644 --- a/tools/forkchecker/BUILD.bazel +++ b/tools/forkchecker/BUILD.bazel @@ -4,7 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") go_library( name = "go_default_library", srcs = ["forkchecker.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/forkchecker", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/forkchecker", visibility = ["//visibility:private"], deps = [ "//config/params:go_default_library", diff --git a/tools/forkchecker/forkchecker.go b/tools/forkchecker/forkchecker.go index b4d0beca9c80..23694fd99b85 100644 --- a/tools/forkchecker/forkchecker.go +++ b/tools/forkchecker/forkchecker.go @@ -16,9 +16,9 @@ import ( "reflect" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/tools/gocovmerge/BUILD.bazel b/tools/gocovmerge/BUILD.bazel index 7f89033e95db..60af527eb018 100644 --- a/tools/gocovmerge/BUILD.bazel +++ b/tools/gocovmerge/BUILD.bazel @@ -4,7 +4,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/gocovmerge", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/gocovmerge", visibility = ["//visibility:private"], deps = [ "@com_github_sirupsen_logrus//:go_default_library", diff --git a/tools/http-request-sink/BUILD.bazel b/tools/http-request-sink/BUILD.bazel index e99ee53d1273..fe5b1bae6c6b 100644 --- a/tools/http-request-sink/BUILD.bazel +++ b/tools/http-request-sink/BUILD.bazel @@ -7,7 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/http-request-sink", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/http-request-sink", visibility = ["//visibility:private"], deps = ["//config/params:go_default_library"], ) diff --git a/tools/http-request-sink/main.go b/tools/http-request-sink/main.go index 7101ff33c8d1..1ebecbf09e31 100644 --- a/tools/http-request-sink/main.go +++ b/tools/http-request-sink/main.go @@ -14,7 +14,7 @@ import ( "path/filepath" "strconv" - "github.com/prysmaticlabs/prysm/v3/config/params" + "github.com/prysmaticlabs/prysm/v4/config/params" ) func main() { diff --git a/tools/http-request-sink/main_test.go b/tools/http-request-sink/main_test.go index 42af96643bd2..9241bbbbbe06 100644 --- a/tools/http-request-sink/main_test.go +++ b/tools/http-request-sink/main_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) type sampleRPCRequest struct { diff --git a/tools/interop/convert-keys/BUILD.bazel b/tools/interop/convert-keys/BUILD.bazel index fc0e6cf17b90..93aaec200f95 100644 --- a/tools/interop/convert-keys/BUILD.bazel +++ b/tools/interop/convert-keys/BUILD.bazel @@ -4,7 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/interop/convert-keys", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/interop/convert-keys", visibility = ["//visibility:public"], deps = [ "//tools/unencrypted-keys-gen/keygen:go_default_library", diff --git a/tools/interop/convert-keys/main.go b/tools/interop/convert-keys/main.go index 6156f5e068d7..28cf281da8e4 100644 --- a/tools/interop/convert-keys/main.go +++ b/tools/interop/convert-keys/main.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "github.com/prysmaticlabs/prysm/v3/tools/unencrypted-keys-gen/keygen" + "github.com/prysmaticlabs/prysm/v4/tools/unencrypted-keys-gen/keygen" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) diff --git a/tools/interop/export-genesis/BUILD.bazel b/tools/interop/export-genesis/BUILD.bazel index e09fe6e02b74..8c1a4262a337 100644 --- a/tools/interop/export-genesis/BUILD.bazel +++ b/tools/interop/export-genesis/BUILD.bazel @@ -4,7 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/interop/export-genesis", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/interop/export-genesis", visibility = ["//visibility:private"], deps = [ "//beacon-chain/db:go_default_library", diff --git a/tools/interop/export-genesis/main.go b/tools/interop/export-genesis/main.go index 4556eb2d6dab..96fbb8c59042 100644 --- a/tools/interop/export-genesis/main.go +++ b/tools/interop/export-genesis/main.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/db" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/db" + "github.com/prysmaticlabs/prysm/v4/io/file" ) // A basic tool to extract genesis.ssz from existing beaconchain.db. diff --git a/tools/interop/split-keys/BUILD.bazel b/tools/interop/split-keys/BUILD.bazel index 45686208dd9d..a4bf89ac4a74 100644 --- a/tools/interop/split-keys/BUILD.bazel +++ b/tools/interop/split-keys/BUILD.bazel @@ -4,7 +4,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/interop/split-keys", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/interop/split-keys", visibility = ["//visibility:private"], deps = [ "//io/file:go_default_library", diff --git a/tools/interop/split-keys/main.go b/tools/interop/split-keys/main.go index 0df9ccceaa02..6a34e948aff1 100644 --- a/tools/interop/split-keys/main.go +++ b/tools/interop/split-keys/main.go @@ -20,11 +20,11 @@ import ( "os" "path" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" "github.com/tyler-smith/go-bip39" util "github.com/wealdtech/go-eth2-util" ) diff --git a/tools/interop/split-keys/main_test.go b/tools/interop/split-keys/main_test.go index 8fab62de0889..8cc412d6e4db 100644 --- a/tools/interop/split-keys/main_test.go +++ b/tools/interop/split-keys/main_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" ) const testMnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about" diff --git a/tools/keystores/BUILD.bazel b/tools/keystores/BUILD.bazel index cfb0db504b34..4120dd19441e 100644 --- a/tools/keystores/BUILD.bazel +++ b/tools/keystores/BUILD.bazel @@ -4,7 +4,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/keystores", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/keystores", visibility = ["//visibility:private"], deps = [ "//crypto/bls:go_default_library", diff --git a/tools/keystores/main.go b/tools/keystores/main.go index 3dfb94a914ba..0bfd0196b9b3 100644 --- a/tools/keystores/main.go +++ b/tools/keystores/main.go @@ -16,10 +16,10 @@ import ( "github.com/google/uuid" "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/urfave/cli/v2" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/tools/keystores/main_test.go b/tools/keystores/main_test.go index 0d365fddb116..777f7877e6f9 100644 --- a/tools/keystores/main_test.go +++ b/tools/keystores/main_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/urfave/cli/v2" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/tools/pcli/BUILD.bazel b/tools/pcli/BUILD.bazel index 8979815356ad..fc7559762c77 100644 --- a/tools/pcli/BUILD.bazel +++ b/tools/pcli/BUILD.bazel @@ -7,7 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/pcli", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/pcli", visibility = ["//visibility:private"], deps = [ "//beacon-chain/core/transition:go_default_library", diff --git a/tools/pcli/main.go b/tools/pcli/main.go index bb5abe1ca966..9c88999f84b0 100644 --- a/tools/pcli/main.go +++ b/tools/pcli/main.go @@ -10,13 +10,13 @@ import ( "github.com/kr/pretty" fssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition" - state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/encoding/ssz/equality" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prefixed "github.com/prysmaticlabs/prysm/v3/runtime/logging/logrus-prefixed-formatter" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" + state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/encoding/ssz/equality" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prefixed "github.com/prysmaticlabs/prysm/v4/runtime/logging/logrus-prefixed-formatter" + "github.com/prysmaticlabs/prysm/v4/runtime/version" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "gopkg.in/d4l3k/messagediff.v1" diff --git a/tools/replay-http/BUILD.bazel b/tools/replay-http/BUILD.bazel index 289b993113b5..d38b08b130a7 100644 --- a/tools/replay-http/BUILD.bazel +++ b/tools/replay-http/BUILD.bazel @@ -4,7 +4,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/replay-http", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/replay-http", visibility = ["//visibility:private"], deps = ["@com_github_sirupsen_logrus//:go_default_library"], ) diff --git a/tools/specs-checker/BUILD.bazel b/tools/specs-checker/BUILD.bazel index 7af9c7d84a14..a04ae475b9a7 100644 --- a/tools/specs-checker/BUILD.bazel +++ b/tools/specs-checker/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "data/ssz/merkle-proofs.md", "data/extra.md", ], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/specs-checker", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/specs-checker", visibility = ["//visibility:public"], deps = ["@com_github_urfave_cli_v2//:go_default_library"], ) diff --git a/tools/unencrypted-keys-gen/BUILD.bazel b/tools/unencrypted-keys-gen/BUILD.bazel index 0707e65c83d9..23a8c9124715 100644 --- a/tools/unencrypted-keys-gen/BUILD.bazel +++ b/tools/unencrypted-keys-gen/BUILD.bazel @@ -4,7 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/unencrypted-keys-gen", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/unencrypted-keys-gen", visibility = [ "//tools/interop/convert-keys:__pkg__", ], diff --git a/tools/unencrypted-keys-gen/keygen/BUILD.bazel b/tools/unencrypted-keys-gen/keygen/BUILD.bazel index 2fff639de017..4d505783506a 100644 --- a/tools/unencrypted-keys-gen/keygen/BUILD.bazel +++ b/tools/unencrypted-keys-gen/keygen/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["keygen.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/tools/unencrypted-keys-gen/keygen", + importpath = "github.com/prysmaticlabs/prysm/v4/tools/unencrypted-keys-gen/keygen", visibility = ["//visibility:public"], deps = ["@com_github_sirupsen_logrus//:go_default_library"], ) diff --git a/tools/unencrypted-keys-gen/main.go b/tools/unencrypted-keys-gen/main.go index f82dab15ae24..ac180bd31ed8 100644 --- a/tools/unencrypted-keys-gen/main.go +++ b/tools/unencrypted-keys-gen/main.go @@ -5,9 +5,9 @@ import ( "log" "os" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/tools/unencrypted-keys-gen/keygen" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/tools/unencrypted-keys-gen/keygen" ) var ( diff --git a/tools/unencrypted-keys-gen/main_test.go b/tools/unencrypted-keys-gen/main_test.go index 36c9e88405e8..e2b41d33401c 100644 --- a/tools/unencrypted-keys-gen/main_test.go +++ b/tools/unencrypted-keys-gen/main_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/tools/unencrypted-keys-gen/keygen" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/tools/unencrypted-keys-gen/keygen" ) func TestSavesUnencryptedKeys(t *testing.T) { diff --git a/validator/accounts/BUILD.bazel b/validator/accounts/BUILD.bazel index 0a4504c8c07b..a30fc7055ccd 100644 --- a/validator/accounts/BUILD.bazel +++ b/validator/accounts/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "wallet_create.go", "wallet_recover.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/accounts", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/accounts", visibility = [ "//cmd/validator:__subpackages__", "//validator:__pkg__", diff --git a/validator/accounts/accounts.go b/validator/accounts/accounts.go index 38605f0f8c85..cf89fc24f89f 100644 --- a/validator/accounts/accounts.go +++ b/validator/accounts/accounts.go @@ -1,7 +1,7 @@ package accounts import ( - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" ) var ( diff --git a/validator/accounts/accounts_backup.go b/validator/accounts/accounts_backup.go index a5c0d826ab01..051244db7515 100644 --- a/validator/accounts/accounts_backup.go +++ b/validator/accounts/accounts_backup.go @@ -10,8 +10,8 @@ import ( "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" ) var ( diff --git a/validator/accounts/accounts_delete.go b/validator/accounts/accounts_delete.go index ab1e14a015eb..3f380431aeb6 100644 --- a/validator/accounts/accounts_delete.go +++ b/validator/accounts/accounts_delete.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" ) // Delete the accounts that the user requests to be deleted from the wallet. diff --git a/validator/accounts/accounts_exit.go b/validator/accounts/accounts_exit.go index b36d1cbf2c15..d4f5a2f0f4e2 100644 --- a/validator/accounts/accounts_exit.go +++ b/validator/accounts/accounts_exit.go @@ -8,14 +8,14 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blocks" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/blocks" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/validator/accounts/accounts_exit_test.go b/validator/accounts/accounts_exit_test.go index 5860eb337a33..0e4b3bd597be 100644 --- a/validator/accounts/accounts_exit_test.go +++ b/validator/accounts/accounts_exit_test.go @@ -3,10 +3,10 @@ package accounts import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/accounts/accounts_helper.go b/validator/accounts/accounts_helper.go index a17fedd699f0..6a849d1aa0c3 100644 --- a/validator/accounts/accounts_helper.go +++ b/validator/accounts/accounts_helper.go @@ -10,13 +10,13 @@ import ( "github.com/logrusorgru/aurora" "github.com/manifoldco/promptui" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/petnames" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/petnames" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" "github.com/urfave/cli/v2" ) diff --git a/validator/accounts/accounts_import.go b/validator/accounts/accounts_import.go index d0d0b4f0a8dd..70ad7157414f 100644 --- a/validator/accounts/accounts_import.go +++ b/validator/accounts/accounts_import.go @@ -14,13 +14,13 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/accounts/accounts_import_test.go b/validator/accounts/accounts_import_test.go index df1e6ff26e4a..7e6fc77dc4d7 100644 --- a/validator/accounts/accounts_import_test.go +++ b/validator/accounts/accounts_import_test.go @@ -8,15 +8,15 @@ import ( "sort" "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" ) func TestImportAccounts_NoPassword(t *testing.T) { diff --git a/validator/accounts/accounts_list.go b/validator/accounts/accounts_list.go index cb3839b70bc8..63bf37f99c6c 100644 --- a/validator/accounts/accounts_list.go +++ b/validator/accounts/accounts_list.go @@ -6,10 +6,10 @@ import ( "math" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" ) // List pretty-prints accounts in the wallet. diff --git a/validator/accounts/accounts_list_test.go b/validator/accounts/accounts_list_test.go index bfb19ef42727..8f3346902f87 100644 --- a/validator/accounts/accounts_list_test.go +++ b/validator/accounts/accounts_list_test.go @@ -13,18 +13,18 @@ import ( "github.com/golang/mock/gomock" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/params" - types "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - constant "github.com/prysmaticlabs/prysm/v3/validator/testing" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/params" + types "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + constant "github.com/prysmaticlabs/prysm/v4/validator/testing" "github.com/urfave/cli/v2" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/accounts/cli_manager.go b/validator/accounts/cli_manager.go index 99a767ce04a8..523735ff3ec1 100644 --- a/validator/accounts/cli_manager.go +++ b/validator/accounts/cli_manager.go @@ -5,15 +5,15 @@ import ( "time" "github.com/pkg/errors" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - iface "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - validatorClientFactory "github.com/prysmaticlabs/prysm/v3/validator/client/validator-client-factory" - validatorHelpers "github.com/prysmaticlabs/prysm/v3/validator/helpers" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + iface "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + validatorClientFactory "github.com/prysmaticlabs/prysm/v4/validator/client/validator-client-factory" + validatorHelpers "github.com/prysmaticlabs/prysm/v4/validator/helpers" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" "google.golang.org/grpc" ) diff --git a/validator/accounts/cli_options.go b/validator/accounts/cli_options.go index 6d0ed254d57c..8c58dc76200c 100644 --- a/validator/accounts/cli_options.go +++ b/validator/accounts/cli_options.go @@ -3,9 +3,9 @@ package accounts import ( "time" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "google.golang.org/grpc" ) diff --git a/validator/accounts/iface/BUILD.bazel b/validator/accounts/iface/BUILD.bazel index e1e4f25ae6e0..6e2fe0d41fcc 100644 --- a/validator/accounts/iface/BUILD.bazel +++ b/validator/accounts/iface/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["wallet.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface", visibility = [ "//cmd:__subpackages__", "//validator:__pkg__", diff --git a/validator/accounts/iface/wallet.go b/validator/accounts/iface/wallet.go index be99aacd44a3..9eb8299fa5b6 100644 --- a/validator/accounts/iface/wallet.go +++ b/validator/accounts/iface/wallet.go @@ -3,8 +3,8 @@ package iface import ( "context" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" ) // InitKeymanagerConfig defines configuration options for initializing a keymanager. diff --git a/validator/accounts/petnames/BUILD.bazel b/validator/accounts/petnames/BUILD.bazel index 47fedfda6bb7..56e73797f133 100644 --- a/validator/accounts/petnames/BUILD.bazel +++ b/validator/accounts/petnames/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["names.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/accounts/petnames", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/accounts/petnames", visibility = [ "//cmd/validator:__subpackages__", "//validator:__subpackages__", diff --git a/validator/accounts/petnames/names.go b/validator/accounts/petnames/names.go index baf5b2cd7597..4c9964f449a7 100644 --- a/validator/accounts/petnames/names.go +++ b/validator/accounts/petnames/names.go @@ -3,8 +3,8 @@ package petnames import ( "strings" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" ) var ( diff --git a/validator/accounts/testing/BUILD.bazel b/validator/accounts/testing/BUILD.bazel index c5a2d367ad2e..3777668af66c 100644 --- a/validator/accounts/testing/BUILD.bazel +++ b/validator/accounts/testing/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = 1, srcs = ["mock.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing", visibility = [ "//validator:__pkg__", "//validator:__subpackages__", diff --git a/validator/accounts/testing/mock.go b/validator/accounts/testing/mock.go index df15fe099aff..f4d8379e86be 100644 --- a/validator/accounts/testing/mock.go +++ b/validator/accounts/testing/mock.go @@ -7,12 +7,12 @@ import ( "sync" "time" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - iface2 "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + iface2 "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" ) // Wallet contains an in-memory, simulated wallet implementation. diff --git a/validator/accounts/userprompt/BUILD.bazel b/validator/accounts/userprompt/BUILD.bazel index f54322c8791d..2cc339db1d82 100644 --- a/validator/accounts/userprompt/BUILD.bazel +++ b/validator/accounts/userprompt/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "prompt.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt", visibility = [ "//cmd:__subpackages__", "//validator:__subpackages__", diff --git a/validator/accounts/userprompt/prompt.go b/validator/accounts/userprompt/prompt.go index 9eea342ad49b..16ae1ff5b407 100644 --- a/validator/accounts/userprompt/prompt.go +++ b/validator/accounts/userprompt/prompt.go @@ -4,9 +4,9 @@ import ( "github.com/logrusorgru/aurora" "github.com/manifoldco/promptui" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" "github.com/urfave/cli/v2" ) diff --git a/validator/accounts/wallet/BUILD.bazel b/validator/accounts/wallet/BUILD.bazel index 57719ba086ae..578ad8cad661 100644 --- a/validator/accounts/wallet/BUILD.bazel +++ b/validator/accounts/wallet/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "wallet.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet", visibility = [ "//cmd:__subpackages__", "//tools:__subpackages__", diff --git a/validator/accounts/wallet/wallet.go b/validator/accounts/wallet/wallet.go index ea8a8fa8d043..61e3ab364119 100644 --- a/validator/accounts/wallet/wallet.go +++ b/validator/accounts/wallet/wallet.go @@ -9,16 +9,16 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - accountsprompt "github.com/prysmaticlabs/prysm/v3/validator/accounts/userprompt" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + accountsprompt "github.com/prysmaticlabs/prysm/v4/validator/accounts/userprompt" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/validator/accounts/wallet/wallet_test.go b/validator/accounts/wallet/wallet_test.go index 491aa55b4032..72e873a6659f 100644 --- a/validator/accounts/wallet/wallet_test.go +++ b/validator/accounts/wallet/wallet_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" "github.com/sirupsen/logrus" ) diff --git a/validator/accounts/wallet_create.go b/validator/accounts/wallet_create.go index 81a4727203c7..703f4364d61d 100644 --- a/validator/accounts/wallet_create.go +++ b/validator/accounts/wallet_create.go @@ -5,11 +5,11 @@ import ( "encoding/json" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" ) // WalletCreate creates wallet specified by configuration options. diff --git a/validator/accounts/wallet_recover.go b/validator/accounts/wallet_recover.go index ce8ac1825965..0f07e43d8a34 100644 --- a/validator/accounts/wallet_recover.go +++ b/validator/accounts/wallet_recover.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" ) const ( diff --git a/validator/accounts/wallet_recover_fuzz_test.go b/validator/accounts/wallet_recover_fuzz_test.go index 18afafb62a69..483eba661d81 100644 --- a/validator/accounts/wallet_recover_fuzz_test.go +++ b/validator/accounts/wallet_recover_fuzz_test.go @@ -5,7 +5,7 @@ package accounts_test import ( "testing" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" ) func FuzzValidateMnemonic(f *testing.F) { diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index 404fa660f8da..b7aedf44253c 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "validator.go", "wait_for_activation.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client", visibility = [ "//cmd:__subpackages__", "//validator:__subpackages__", diff --git a/validator/client/aggregate.go b/validator/client/aggregate.go index bdafce93e56c..5cc9562555c1 100644 --- a/validator/client/aggregate.go +++ b/validator/client/aggregate.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/validator/client/aggregate_test.go b/validator/client/aggregate_test.go index 36a4b123fc40..c08cda6a008a 100644 --- a/validator/client/aggregate_test.go +++ b/validator/client/aggregate_test.go @@ -7,16 +7,16 @@ import ( "github.com/golang/mock/gomock" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/client/attest.go b/validator/client/attest.go index 8af97d2a88dd..e2c8ecbd8b7f 100644 --- a/validator/client/attest.go +++ b/validator/client/attest.go @@ -9,21 +9,21 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/validator/client/attest_protect.go b/validator/client/attest_protect.go index 8c14d9aa7c88..c9f7efc998d0 100644 --- a/validator/client/attest_protect.go +++ b/validator/client/attest_protect.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/slashings" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/slashings" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" "go.opencensus.io/trace" ) diff --git a/validator/client/attest_protect_test.go b/validator/client/attest_protect_test.go index 8a8473458611..92fd2a93bff8 100644 --- a/validator/client/attest_protect_test.go +++ b/validator/client/attest_protect_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func Test_slashableAttestationCheck(t *testing.T) { diff --git a/validator/client/attest_test.go b/validator/client/attest_test.go index bbddbc47e605..aa53090333f3 100644 --- a/validator/client/attest_test.go +++ b/validator/client/attest_test.go @@ -11,21 +11,21 @@ import ( "github.com/golang/mock/gomock" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" logTest "github.com/sirupsen/logrus/hooks/test" "gopkg.in/d4l3k/messagediff.v1" ) diff --git a/validator/client/beacon-api/BUILD.bazel b/validator/client/beacon-api/BUILD.bazel index 20544c50b396..aa97c077806b 100644 --- a/validator/client/beacon-api/BUILD.bazel +++ b/validator/client/beacon-api/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "subscribe_committee_subnets.go", "sync_committee.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api", visibility = ["//validator:__subpackages__"], deps = [ "//api/gateway/apimiddleware:go_default_library", diff --git a/validator/client/beacon-api/activation.go b/validator/client/beacon-api/activation.go index a6e82401fb47..633634f31d06 100644 --- a/validator/client/beacon-api/activation.go +++ b/validator/client/beacon-api/activation.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc" ) diff --git a/validator/client/beacon-api/activation_test.go b/validator/client/beacon-api/activation_test.go index 602487f0f9a8..8a66f35990fe 100644 --- a/validator/client/beacon-api/activation_test.go +++ b/validator/client/beacon-api/activation_test.go @@ -9,12 +9,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/pkg/errors" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestComputeWaitElements_LastRecvTimeZero(t *testing.T) { diff --git a/validator/client/beacon-api/attestation_data.go b/validator/client/beacon-api/attestation_data.go index e5f4c1b040f2..ede36e6c71ef 100644 --- a/validator/client/beacon-api/attestation_data.go +++ b/validator/client/beacon-api/attestation_data.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) getAttestationData( diff --git a/validator/client/beacon-api/attestation_data_test.go b/validator/client/beacon-api/attestation_data_test.go index 2a470285e1e3..a29ad1cbff8a 100644 --- a/validator/client/beacon-api/attestation_data_test.go +++ b/validator/client/beacon-api/attestation_data_test.go @@ -9,11 +9,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestGetAttestationData_ValidAttestation(t *testing.T) { diff --git a/validator/client/beacon-api/beacon_api_helpers.go b/validator/client/beacon-api/beacon_api_helpers.go index 2765565084d5..061e8987ec36 100644 --- a/validator/client/beacon-api/beacon_api_helpers.go +++ b/validator/client/beacon-api/beacon_api_helpers.go @@ -10,10 +10,10 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) var beaconAPITogRPCValidatorStatus = map[string]ethpb.ValidatorStatus{ diff --git a/validator/client/beacon-api/beacon_api_helpers_test.go b/validator/client/beacon-api/beacon_api_helpers_test.go index a751a947fed0..7e7d1ddf4754 100644 --- a/validator/client/beacon-api/beacon_api_helpers_test.go +++ b/validator/client/beacon-api/beacon_api_helpers_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestBeaconApiHelpers(t *testing.T) { diff --git a/validator/client/beacon-api/beacon_api_validator_client.go b/validator/client/beacon-api/beacon_api_validator_client.go index 6e7519aae9e5..361782154c5c 100644 --- a/validator/client/beacon-api/beacon_api_validator_client.go +++ b/validator/client/beacon-api/beacon_api_validator_client.go @@ -8,10 +8,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" ) type beaconApiValidatorClient struct { diff --git a/validator/client/beacon-api/beacon_api_validator_client_test.go b/validator/client/beacon-api/beacon_api_validator_client_test.go index db3d840f29a6..0a88ecfc33e2 100644 --- a/validator/client/beacon-api/beacon_api_validator_client_test.go +++ b/validator/client/beacon-api/beacon_api_validator_client_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/golang/mock/gomock" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) // Make sure that GetAttestationData() returns the same thing as the internal getAttestationData() diff --git a/validator/client/beacon-api/beacon_block_converter.go b/validator/client/beacon-api/beacon_block_converter.go index e3d33e047741..aafb858b1615 100644 --- a/validator/client/beacon-api/beacon_block_converter.go +++ b/validator/client/beacon-api/beacon_block_converter.go @@ -6,11 +6,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type beaconBlockConverter interface { diff --git a/validator/client/beacon-api/beacon_block_converter_test.go b/validator/client/beacon-api/beacon_block_converter_test.go index 76327f847846..feb0f00ff2ff 100644 --- a/validator/client/beacon-api/beacon_block_converter_test.go +++ b/validator/client/beacon-api/beacon_block_converter_test.go @@ -3,10 +3,10 @@ package beacon_api import ( "testing" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestGetBeaconBlockConverter_Phase0Valid(t *testing.T) { diff --git a/validator/client/beacon-api/beacon_block_json_helpers.go b/validator/client/beacon-api/beacon_block_json_helpers.go index d9a189d4aa56..724d44aca8ce 100644 --- a/validator/client/beacon-api/beacon_block_json_helpers.go +++ b/validator/client/beacon-api/beacon_block_json_helpers.go @@ -4,9 +4,9 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func jsonifyTransactions(transactions [][]byte) []string { diff --git a/validator/client/beacon-api/beacon_block_json_helpers_test.go b/validator/client/beacon-api/beacon_block_json_helpers_test.go index 76b6bc5ac090..1c04dfb1cd0c 100644 --- a/validator/client/beacon-api/beacon_block_json_helpers_test.go +++ b/validator/client/beacon-api/beacon_block_json_helpers_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestBeaconBlockJsonHelpers_JsonifyTransactions(t *testing.T) { diff --git a/validator/client/beacon-api/beacon_block_proto_helpers.go b/validator/client/beacon-api/beacon_block_proto_helpers.go index c8f2a6976a6e..5ed016a36b8a 100644 --- a/validator/client/beacon-api/beacon_block_proto_helpers.go +++ b/validator/client/beacon-api/beacon_block_proto_helpers.go @@ -5,10 +5,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func convertProposerSlashingsToProto(jsonProposerSlashings []*apimiddleware.ProposerSlashingJson) ([]*ethpb.ProposerSlashing, error) { diff --git a/validator/client/beacon-api/beacon_block_proto_helpers_test.go b/validator/client/beacon-api/beacon_block_proto_helpers_test.go index 3e56c3b660d2..a737fbc5c358 100644 --- a/validator/client/beacon-api/beacon_block_proto_helpers_test.go +++ b/validator/client/beacon-api/beacon_block_proto_helpers_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestBeaconBlockProtoHelpers_ConvertProposerSlashingsToProto(t *testing.T) { diff --git a/validator/client/beacon-api/domain_data.go b/validator/client/beacon-api/domain_data.go index 82ccb5fa7546..c11656cec53f 100644 --- a/validator/client/beacon-api/domain_data.go +++ b/validator/client/beacon-api/domain_data.go @@ -5,10 +5,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) getDomainData(ctx context.Context, epoch primitives.Epoch, domainType [4]byte) (*ethpb.DomainResponse, error) { diff --git a/validator/client/beacon-api/domain_data_test.go b/validator/client/beacon-api/domain_data_test.go index baa579647e02..7b972c7d30d6 100644 --- a/validator/client/beacon-api/domain_data_test.go +++ b/validator/client/beacon-api/domain_data_test.go @@ -7,12 +7,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestGetDomainData_ValidDomainData(t *testing.T) { diff --git a/validator/client/beacon-api/doppelganger.go b/validator/client/beacon-api/doppelganger.go index cbf7b9cc3f24..0d3589c6fd31 100644 --- a/validator/client/beacon-api/doppelganger.go +++ b/validator/client/beacon-api/doppelganger.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) type DoppelGangerInfo struct { diff --git a/validator/client/beacon-api/doppelganger_test.go b/validator/client/beacon-api/doppelganger_test.go index ccacdf96aadb..0a0478fd4fae 100644 --- a/validator/client/beacon-api/doppelganger_test.go +++ b/validator/client/beacon-api/doppelganger_test.go @@ -9,12 +9,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestCheckDoppelGanger_Nominal(t *testing.T) { diff --git a/validator/client/beacon-api/duties.go b/validator/client/beacon-api/duties.go index 22d7ff8c86ca..12a2e400d090 100644 --- a/validator/client/beacon-api/duties.go +++ b/validator/client/beacon-api/duties.go @@ -9,10 +9,10 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type dutiesProvider interface { diff --git a/validator/client/beacon-api/duties_test.go b/validator/client/beacon-api/duties_test.go index 8e948a4cddee..50558b29e321 100644 --- a/validator/client/beacon-api/duties_test.go +++ b/validator/client/beacon-api/duties_test.go @@ -11,13 +11,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) const getAttesterDutiesTestEndpoint = "/eth/v1/validator/duties/attester" diff --git a/validator/client/beacon-api/genesis.go b/validator/client/beacon-api/genesis.go index 66bf9ed4d85f..187eb3ec7f18 100644 --- a/validator/client/beacon-api/genesis.go +++ b/validator/client/beacon-api/genesis.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type genesisProvider interface { diff --git a/validator/client/beacon-api/genesis_test.go b/validator/client/beacon-api/genesis_test.go index cede0e87bcef..1c39e24e5e59 100644 --- a/validator/client/beacon-api/genesis_test.go +++ b/validator/client/beacon-api/genesis_test.go @@ -6,11 +6,11 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestGetGenesis_ValidGenesis(t *testing.T) { diff --git a/validator/client/beacon-api/get_beacon_block.go b/validator/client/beacon-api/get_beacon_block.go index 05f52fa5fb9e..c9e723cf63a0 100644 --- a/validator/client/beacon-api/get_beacon_block.go +++ b/validator/client/beacon-api/get_beacon_block.go @@ -9,9 +9,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type abstractProduceBlockResponseJson struct { diff --git a/validator/client/beacon-api/get_beacon_block_test.go b/validator/client/beacon-api/get_beacon_block_test.go index fedd13447cba..839be02412b7 100644 --- a/validator/client/beacon-api/get_beacon_block_test.go +++ b/validator/client/beacon-api/get_beacon_block_test.go @@ -9,13 +9,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestGetBeaconBlock_RequestFailed(t *testing.T) { diff --git a/validator/client/beacon-api/index.go b/validator/client/beacon-api/index.go index 1943b3521bda..ae5e1d4a3795 100644 --- a/validator/client/beacon-api/index.go +++ b/validator/client/beacon-api/index.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) validatorIndex(ctx context.Context, in *ethpb.ValidatorIndexRequest) (*ethpb.ValidatorIndexResponse, error) { diff --git a/validator/client/beacon-api/index_test.go b/validator/client/beacon-api/index_test.go index a512753e6e40..f9782ea09133 100644 --- a/validator/client/beacon-api/index_test.go +++ b/validator/client/beacon-api/index_test.go @@ -8,12 +8,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/pkg/errors" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) const stringPubKey = "0x8000091c2ae64ee414a54c1cc1fc67dec663408bc636cb86756e0200e41a75c8f86603f104f02c856983d2783116be13" diff --git a/validator/client/beacon-api/json_rest_handler.go b/validator/client/beacon-api/json_rest_handler.go index d5da133ec220..6d377fce4384 100644 --- a/validator/client/beacon-api/json_rest_handler.go +++ b/validator/client/beacon-api/json_rest_handler.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" ) type jsonRestHandler interface { diff --git a/validator/client/beacon-api/json_rest_handler_test.go b/validator/client/beacon-api/json_rest_handler_test.go index 18fc2c1bf16e..959c94ad2cc8 100644 --- a/validator/client/beacon-api/json_rest_handler_test.go +++ b/validator/client/beacon-api/json_rest_handler_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestGetRestJsonResponse_Valid(t *testing.T) { diff --git a/validator/client/beacon-api/mock/BUILD.bazel b/validator/client/beacon-api/mock/BUILD.bazel index 2c8045d31ac5..e48fcbf6f926 100644 --- a/validator/client/beacon-api/mock/BUILD.bazel +++ b/validator/client/beacon-api/mock/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "json_rest_handler_mock.go", "state_validators_mock.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock", visibility = ["//visibility:public"], deps = [ "//api/gateway/apimiddleware:go_default_library", diff --git a/validator/client/beacon-api/mock/beacon_block_converter_mock.go b/validator/client/beacon-api/mock/beacon_block_converter_mock.go index 3d27210322c7..4a978038e69c 100644 --- a/validator/client/beacon-api/mock/beacon_block_converter_mock.go +++ b/validator/client/beacon-api/mock/beacon_block_converter_mock.go @@ -8,8 +8,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - apimiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + apimiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // MockbeaconBlockConverter is a mock of beaconBlockConverter interface. diff --git a/validator/client/beacon-api/mock/duties_mock.go b/validator/client/beacon-api/mock/duties_mock.go index b9bc58760e5c..cf4c9ac4afb5 100644 --- a/validator/client/beacon-api/mock/duties_mock.go +++ b/validator/client/beacon-api/mock/duties_mock.go @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - apimiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - primitives "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + apimiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + primitives "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) // MockdutiesProvider is a mock of dutiesProvider interface. diff --git a/validator/client/beacon-api/mock/genesis_mock.go b/validator/client/beacon-api/mock/genesis_mock.go index b28e2552038c..8bd80f935aac 100644 --- a/validator/client/beacon-api/mock/genesis_mock.go +++ b/validator/client/beacon-api/mock/genesis_mock.go @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - apimiddleware "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - apimiddleware0 "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" + apimiddleware "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + apimiddleware0 "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" ) // MockgenesisProvider is a mock of genesisProvider interface. diff --git a/validator/client/beacon-api/mock/json_rest_handler_mock.go b/validator/client/beacon-api/mock/json_rest_handler_mock.go index eff011763405..73008f742a4d 100644 --- a/validator/client/beacon-api/mock/json_rest_handler_mock.go +++ b/validator/client/beacon-api/mock/json_rest_handler_mock.go @@ -10,7 +10,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - apimiddleware "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" + apimiddleware "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" ) // MockjsonRestHandler is a mock of jsonRestHandler interface. diff --git a/validator/client/beacon-api/mock/state_validators_mock.go b/validator/client/beacon-api/mock/state_validators_mock.go index 3afff16b9060..f3192fd1c4f0 100644 --- a/validator/client/beacon-api/mock/state_validators_mock.go +++ b/validator/client/beacon-api/mock/state_validators_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - apimiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" + apimiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" ) // MockstateValidatorsProvider is a mock of stateValidatorsProvider interface. diff --git a/validator/client/beacon-api/prepare_beacon_proposer.go b/validator/client/beacon-api/prepare_beacon_proposer.go index 14b93a9c1b6b..9a3c4219bfa4 100644 --- a/validator/client/beacon-api/prepare_beacon_proposer.go +++ b/validator/client/beacon-api/prepare_beacon_proposer.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c *beaconApiValidatorClient) prepareBeaconProposer(ctx context.Context, recipients []*ethpb.PrepareBeaconProposerRequest_FeeRecipientContainer) error { diff --git a/validator/client/beacon-api/prepare_beacon_proposer_test.go b/validator/client/beacon-api/prepare_beacon_proposer_test.go index 4852e6039a95..632aad1b640f 100644 --- a/validator/client/beacon-api/prepare_beacon_proposer_test.go +++ b/validator/client/beacon-api/prepare_beacon_proposer_test.go @@ -9,11 +9,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) const prepareBeaconProposerTestEndpoint = "/eth/v1/validator/prepare_beacon_proposer" diff --git a/validator/client/beacon-api/propose_attestation.go b/validator/client/beacon-api/propose_attestation.go index 09de3104e3fd..5292848cbec6 100644 --- a/validator/client/beacon-api/propose_attestation.go +++ b/validator/client/beacon-api/propose_attestation.go @@ -6,7 +6,7 @@ import ( "encoding/json" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) proposeAttestation(ctx context.Context, attestation *ethpb.Attestation) (*ethpb.AttestResponse, error) { diff --git a/validator/client/beacon-api/propose_attestation_test.go b/validator/client/beacon-api/propose_attestation_test.go index 4cc97b558ffd..3699f3a0bcaa 100644 --- a/validator/client/beacon-api/propose_attestation_test.go +++ b/validator/client/beacon-api/propose_attestation_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/golang/mock/gomock" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeAttestation(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block.go b/validator/client/beacon-api/propose_beacon_block.go index 47b4ca5fe73b..59fa45fffca0 100644 --- a/validator/client/beacon-api/propose_beacon_block.go +++ b/validator/client/beacon-api/propose_beacon_block.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) proposeBeaconBlock(ctx context.Context, in *ethpb.GenericSignedBeaconBlock) (*ethpb.ProposeResponse, error) { diff --git a/validator/client/beacon-api/propose_beacon_block_altair_test.go b/validator/client/beacon-api/propose_beacon_block_altair_test.go index d4a0267fb61f..c2c07c1eb35c 100644 --- a/validator/client/beacon-api/propose_beacon_block_altair_test.go +++ b/validator/client/beacon-api/propose_beacon_block_altair_test.go @@ -8,12 +8,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeBeaconBlock_Altair(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block_bellatrix_test.go b/validator/client/beacon-api/propose_beacon_block_bellatrix_test.go index 376b1598f152..697c992a0726 100644 --- a/validator/client/beacon-api/propose_beacon_block_bellatrix_test.go +++ b/validator/client/beacon-api/propose_beacon_block_bellatrix_test.go @@ -8,13 +8,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeBeaconBlock_Bellatrix(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block_blinded_bellatrix_test.go b/validator/client/beacon-api/propose_beacon_block_blinded_bellatrix_test.go index e9e1ad505f7f..f7cc9dd929c9 100644 --- a/validator/client/beacon-api/propose_beacon_block_blinded_bellatrix_test.go +++ b/validator/client/beacon-api/propose_beacon_block_blinded_bellatrix_test.go @@ -8,14 +8,14 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeBeaconBlock_BlindedBellatrix(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block_blinded_capella_test.go b/validator/client/beacon-api/propose_beacon_block_blinded_capella_test.go index ecceb406e0ab..d3d70ff7dd40 100644 --- a/validator/client/beacon-api/propose_beacon_block_blinded_capella_test.go +++ b/validator/client/beacon-api/propose_beacon_block_blinded_capella_test.go @@ -8,14 +8,14 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeBeaconBlock_BlindedCapella(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block_capella_test.go b/validator/client/beacon-api/propose_beacon_block_capella_test.go index 959d719fe86b..0632286a4c05 100644 --- a/validator/client/beacon-api/propose_beacon_block_capella_test.go +++ b/validator/client/beacon-api/propose_beacon_block_capella_test.go @@ -8,13 +8,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeBeaconBlock_Capella(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block_phase0_test.go b/validator/client/beacon-api/propose_beacon_block_phase0_test.go index 07e82b13448b..4b1b47cc44b9 100644 --- a/validator/client/beacon-api/propose_beacon_block_phase0_test.go +++ b/validator/client/beacon-api/propose_beacon_block_phase0_test.go @@ -8,12 +8,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestProposeBeaconBlock_Phase0(t *testing.T) { diff --git a/validator/client/beacon-api/propose_beacon_block_test.go b/validator/client/beacon-api/propose_beacon_block_test.go index 5421b148f45f..7c2fa33be08a 100644 --- a/validator/client/beacon-api/propose_beacon_block_test.go +++ b/validator/client/beacon-api/propose_beacon_block_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestProposeBeaconBlock_Error(t *testing.T) { diff --git a/validator/client/beacon-api/propose_exit.go b/validator/client/beacon-api/propose_exit.go index 5d848d6cff31..bb3847252db2 100644 --- a/validator/client/beacon-api/propose_exit.go +++ b/validator/client/beacon-api/propose_exit.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) proposeExit(ctx context.Context, signedVoluntaryExit *ethpb.SignedVoluntaryExit) (*ethpb.ProposeExitResponse, error) { diff --git a/validator/client/beacon-api/propose_exit_test.go b/validator/client/beacon-api/propose_exit_test.go index 10a4603e847e..8a3111c74fc2 100644 --- a/validator/client/beacon-api/propose_exit_test.go +++ b/validator/client/beacon-api/propose_exit_test.go @@ -9,11 +9,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) const proposeExitTestEndpoint = "/eth/v1/beacon/pool/voluntary_exits" diff --git a/validator/client/beacon-api/registration.go b/validator/client/beacon-api/registration.go index 1aad125d285a..5626e14f4442 100644 --- a/validator/client/beacon-api/registration.go +++ b/validator/client/beacon-api/registration.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c *beaconApiValidatorClient) submitValidatorRegistrations(ctx context.Context, registrations []*ethpb.SignedValidatorRegistrationV1) error { diff --git a/validator/client/beacon-api/registration_test.go b/validator/client/beacon-api/registration_test.go index eb304626a38b..684e8000e564 100644 --- a/validator/client/beacon-api/registration_test.go +++ b/validator/client/beacon-api/registration_test.go @@ -10,11 +10,11 @@ import ( "github.com/golang/mock/gomock" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestRegistration_Valid(t *testing.T) { diff --git a/validator/client/beacon-api/state_validators.go b/validator/client/beacon-api/state_validators.go index 57828224f2bd..38bf7331427f 100644 --- a/validator/client/beacon-api/state_validators.go +++ b/validator/client/beacon-api/state_validators.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/pkg/errors" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" ) type stateValidatorsProvider interface { diff --git a/validator/client/beacon-api/state_validators_test.go b/validator/client/beacon-api/state_validators_test.go index 82ccfd8b4c01..d03343a4dd66 100644 --- a/validator/client/beacon-api/state_validators_test.go +++ b/validator/client/beacon-api/state_validators_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestGetStateValidators_Nominal(t *testing.T) { diff --git a/validator/client/beacon-api/status.go b/validator/client/beacon-api/status.go index a7aadca2db1c..f23e3198b182 100644 --- a/validator/client/beacon-api/status.go +++ b/validator/client/beacon-api/status.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c *beaconApiValidatorClient) validatorStatus(ctx context.Context, in *ethpb.ValidatorStatusRequest) (*ethpb.ValidatorStatusResponse, error) { diff --git a/validator/client/beacon-api/status_test.go b/validator/client/beacon-api/status_test.go index 93e79c47d211..8477acd0957f 100644 --- a/validator/client/beacon-api/status_test.go +++ b/validator/client/beacon-api/status_test.go @@ -8,13 +8,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestValidatorStatus_Nominal(t *testing.T) { diff --git a/validator/client/beacon-api/stream_blocks.go b/validator/client/beacon-api/stream_blocks.go index 86435ef41bae..93c53081e29a 100644 --- a/validator/client/beacon-api/stream_blocks.go +++ b/validator/client/beacon-api/stream_blocks.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc" ) diff --git a/validator/client/beacon-api/stream_blocks_test.go b/validator/client/beacon-api/stream_blocks_test.go index 2dced6f6ae48..2a1a652ee706 100644 --- a/validator/client/beacon-api/stream_blocks_test.go +++ b/validator/client/beacon-api/stream_blocks_test.go @@ -9,12 +9,12 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestStreamBlocks_UnsupportedConsensusVersion(t *testing.T) { diff --git a/validator/client/beacon-api/submit_aggregate_selection_proof.go b/validator/client/beacon-api/submit_aggregate_selection_proof.go index 60b2ed511ceb..804e5f713135 100644 --- a/validator/client/beacon-api/submit_aggregate_selection_proof.go +++ b/validator/client/beacon-api/submit_aggregate_selection_proof.go @@ -7,11 +7,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func (c *beaconApiValidatorClient) submitAggregateSelectionProof(ctx context.Context, in *ethpb.AggregateSelectionRequest) (*ethpb.AggregateSelectionResponse, error) { diff --git a/validator/client/beacon-api/submit_aggregate_selection_proof_test.go b/validator/client/beacon-api/submit_aggregate_selection_proof_test.go index 1209cb6600e2..adfd5a2a4ef5 100644 --- a/validator/client/beacon-api/submit_aggregate_selection_proof_test.go +++ b/validator/client/beacon-api/submit_aggregate_selection_proof_test.go @@ -10,15 +10,15 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/eth/helpers" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/helpers" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestSubmitAggregateSelectionProof(t *testing.T) { diff --git a/validator/client/beacon-api/submit_signed_aggregate_proof.go b/validator/client/beacon-api/submit_signed_aggregate_proof.go index 31117cc465b2..4c1e669ff0a1 100644 --- a/validator/client/beacon-api/submit_signed_aggregate_proof.go +++ b/validator/client/beacon-api/submit_signed_aggregate_proof.go @@ -6,8 +6,8 @@ import ( "encoding/json" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c *beaconApiValidatorClient) submitSignedAggregateSelectionProof(ctx context.Context, in *ethpb.SignedAggregateSubmitRequest) (*ethpb.SignedAggregateSubmitResponse, error) { diff --git a/validator/client/beacon-api/submit_signed_aggregate_proof_test.go b/validator/client/beacon-api/submit_signed_aggregate_proof_test.go index 35f12f377c14..f545deab4b1e 100644 --- a/validator/client/beacon-api/submit_signed_aggregate_proof_test.go +++ b/validator/client/beacon-api/submit_signed_aggregate_proof_test.go @@ -8,12 +8,12 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" - test_helpers "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" + test_helpers "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers" ) func TestSubmitSignedAggregateSelectionProof_Valid(t *testing.T) { diff --git a/validator/client/beacon-api/submit_signed_contribution_and_proof.go b/validator/client/beacon-api/submit_signed_contribution_and_proof.go index 41d3dd870cc3..3d1a9fc11f6e 100644 --- a/validator/client/beacon-api/submit_signed_contribution_and_proof.go +++ b/validator/client/beacon-api/submit_signed_contribution_and_proof.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func (c beaconApiValidatorClient) submitSignedContributionAndProof(ctx context.Context, in *ethpb.SignedContributionAndProof) error { diff --git a/validator/client/beacon-api/submit_signed_contribution_and_proof_test.go b/validator/client/beacon-api/submit_signed_contribution_and_proof_test.go index 617c9cd06737..f30775b1cfe6 100644 --- a/validator/client/beacon-api/submit_signed_contribution_and_proof_test.go +++ b/validator/client/beacon-api/submit_signed_contribution_and_proof_test.go @@ -9,11 +9,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) const submitSignedContributionAndProofTestEndpoint = "/eth/v1/validator/contribution_and_proofs" diff --git a/validator/client/beacon-api/subscribe_committee_subnets.go b/validator/client/beacon-api/subscribe_committee_subnets.go index 473199148a2d..14dc7871b051 100644 --- a/validator/client/beacon-api/subscribe_committee_subnets.go +++ b/validator/client/beacon-api/subscribe_committee_subnets.go @@ -7,10 +7,10 @@ import ( "strconv" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func (c beaconApiValidatorClient) subscribeCommitteeSubnets(ctx context.Context, in *ethpb.CommitteeSubnetsSubscribeRequest, validatorIndices []primitives.ValidatorIndex) error { diff --git a/validator/client/beacon-api/subscribe_committee_subnets_test.go b/validator/client/beacon-api/subscribe_committee_subnets_test.go index c56e993dfcc1..a48f47151191 100644 --- a/validator/client/beacon-api/subscribe_committee_subnets_test.go +++ b/validator/client/beacon-api/subscribe_committee_subnets_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) const subscribeCommitteeSubnetsTestEndpoint = "/eth/v1/validator/beacon_committee_subscriptions" diff --git a/validator/client/beacon-api/sync_committee.go b/validator/client/beacon-api/sync_committee.go index 5b517b393c78..1f1e3e80df45 100644 --- a/validator/client/beacon-api/sync_committee.go +++ b/validator/client/beacon-api/sync_committee.go @@ -9,10 +9,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) func (c *beaconApiValidatorClient) submitSyncMessage(ctx context.Context, syncMessage *ethpb.SyncCommitteeMessage) error { diff --git a/validator/client/beacon-api/sync_committee_test.go b/validator/client/beacon-api/sync_committee_test.go index 150c6e35f7e5..23a3fdeaf1ac 100644 --- a/validator/client/beacon-api/sync_committee_test.go +++ b/validator/client/beacon-api/sync_committee_test.go @@ -11,13 +11,13 @@ import ( "github.com/golang/mock/gomock" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" ) func TestSubmitSyncMessage_Valid(t *testing.T) { diff --git a/validator/client/beacon-api/test-helpers/BUILD.bazel b/validator/client/beacon-api/test-helpers/BUILD.bazel index 210c28c8211c..37e09500c914 100644 --- a/validator/client/beacon-api/test-helpers/BUILD.bazel +++ b/validator/client/beacon-api/test-helpers/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "phase0_beacon_block_test_helpers.go", "test_helpers.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/test-helpers", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/test-helpers", visibility = ["//validator:__subpackages__"], deps = [ "//beacon-chain/rpc/apimiddleware:go_default_library", diff --git a/validator/client/beacon-api/test-helpers/altair_beacon_block_test_helpers.go b/validator/client/beacon-api/test-helpers/altair_beacon_block_test_helpers.go index b2bcbe80383e..084fa1c3af79 100644 --- a/validator/client/beacon-api/test-helpers/altair_beacon_block_test_helpers.go +++ b/validator/client/beacon-api/test-helpers/altair_beacon_block_test_helpers.go @@ -1,8 +1,8 @@ package test_helpers import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func GenerateProtoAltairBeaconBlock() *ethpb.BeaconBlockAltair { diff --git a/validator/client/beacon-api/test-helpers/bellatrix_beacon_block_test_helpers.go b/validator/client/beacon-api/test-helpers/bellatrix_beacon_block_test_helpers.go index 2bc479c07e28..20fe84414d03 100644 --- a/validator/client/beacon-api/test-helpers/bellatrix_beacon_block_test_helpers.go +++ b/validator/client/beacon-api/test-helpers/bellatrix_beacon_block_test_helpers.go @@ -1,10 +1,10 @@ package test_helpers import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func GenerateProtoBellatrixBeaconBlock() *ethpb.BeaconBlockBellatrix { diff --git a/validator/client/beacon-api/test-helpers/capella_beacon_block_test_helpers.go b/validator/client/beacon-api/test-helpers/capella_beacon_block_test_helpers.go index 966dbb650315..d8f9002e9bc4 100644 --- a/validator/client/beacon-api/test-helpers/capella_beacon_block_test_helpers.go +++ b/validator/client/beacon-api/test-helpers/capella_beacon_block_test_helpers.go @@ -1,10 +1,10 @@ package test_helpers import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - enginev1 "github.com/prysmaticlabs/prysm/v3/proto/engine/v1" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func GenerateProtoCapellaBeaconBlock() *ethpb.BeaconBlockCapella { diff --git a/validator/client/beacon-api/test-helpers/phase0_beacon_block_test_helpers.go b/validator/client/beacon-api/test-helpers/phase0_beacon_block_test_helpers.go index 58a24bf84177..a250780b2b5e 100644 --- a/validator/client/beacon-api/test-helpers/phase0_beacon_block_test_helpers.go +++ b/validator/client/beacon-api/test-helpers/phase0_beacon_block_test_helpers.go @@ -1,8 +1,8 @@ package test_helpers import ( - "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) func GenerateProtoPhase0BeaconBlock() *ethpb.BeaconBlock { diff --git a/validator/client/beacon-api/wait_for_chain_start_test.go b/validator/client/beacon-api/wait_for_chain_start_test.go index bab4b63e6805..fd7e4280bdf6 100644 --- a/validator/client/beacon-api/wait_for_chain_start_test.go +++ b/validator/client/beacon-api/wait_for_chain_start_test.go @@ -8,11 +8,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - rpcmiddleware "github.com/prysmaticlabs/prysm/v3/beacon-chain/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api/mock" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + rpcmiddleware "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api/mock" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/validator/client/grpc-api/BUILD.bazel b/validator/client/grpc-api/BUILD.bazel index f36b50c5c275..47b51f995cab 100644 --- a/validator/client/grpc-api/BUILD.bazel +++ b/validator/client/grpc-api/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["grpc_validator_client.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/grpc-api", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/grpc-api", visibility = ["//validator:__subpackages__"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/validator/client/grpc-api/grpc_validator_client.go b/validator/client/grpc-api/grpc_validator_client.go index 9019beeed428..2226b275c90f 100644 --- a/validator/client/grpc-api/grpc_validator_client.go +++ b/validator/client/grpc-api/grpc_validator_client.go @@ -5,9 +5,9 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" "google.golang.org/grpc" ) diff --git a/validator/client/grpc-api/grpc_validator_client_test.go b/validator/client/grpc-api/grpc_validator_client_test.go index 87c36f92254d..e80957912a78 100644 --- a/validator/client/grpc-api/grpc_validator_client_test.go +++ b/validator/client/grpc-api/grpc_validator_client_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - mock2 "github.com/prysmaticlabs/prysm/v3/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + mock2 "github.com/prysmaticlabs/prysm/v4/testing/mock" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/validator/client/iface/BUILD.bazel b/validator/client/iface/BUILD.bazel index f37b6bb6c7cb..cf553b531a73 100644 --- a/validator/client/iface/BUILD.bazel +++ b/validator/client/iface/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "validator.go", "validator_client.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/iface", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/iface", visibility = ["//validator:__subpackages__"], deps = [ "//config/fieldparams:go_default_library", diff --git a/validator/client/iface/validator.go b/validator/client/iface/validator.go index 546be52ed023..8d8c3a689853 100644 --- a/validator/client/iface/validator.go +++ b/validator/client/iface/validator.go @@ -5,13 +5,13 @@ import ( "errors" "time" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" ) // ErrConnectionIssue represents a connection problem. diff --git a/validator/client/iface/validator_client.go b/validator/client/iface/validator_client.go index cffa179c7697..b5072ee3ebcd 100644 --- a/validator/client/iface/validator_client.go +++ b/validator/client/iface/validator_client.go @@ -4,8 +4,8 @@ import ( "context" "github.com/golang/protobuf/ptypes/empty" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) type ValidatorClient interface { diff --git a/validator/client/key_reload.go b/validator/client/key_reload.go index 942626149f95..628bf50336cb 100644 --- a/validator/client/key_reload.go +++ b/validator/client/key_reload.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "go.opencensus.io/trace" ) diff --git a/validator/client/key_reload_test.go b/validator/client/key_reload_test.go index 5d313bd7b4da..582e4cf14449 100644 --- a/validator/client/key_reload_test.go +++ b/validator/client/key_reload_test.go @@ -6,13 +6,13 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/testutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/testutil" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/client/log.go b/validator/client/log.go index d9062fe72726..482eb48b7b56 100644 --- a/validator/client/log.go +++ b/validator/client/log.go @@ -4,9 +4,9 @@ import ( "fmt" "sync/atomic" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "github.com/sirupsen/logrus" ) diff --git a/validator/client/metrics.go b/validator/client/metrics.go index 27bfdbc34ab3..7d38eece3a11 100644 --- a/validator/client/metrics.go +++ b/validator/client/metrics.go @@ -6,12 +6,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" ) diff --git a/validator/client/metrics_test.go b/validator/client/metrics_test.go index 18dedb6831f3..af231e26e2a2 100644 --- a/validator/client/metrics_test.go +++ b/validator/client/metrics_test.go @@ -3,13 +3,13 @@ package client import ( "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/time/slots" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/time/slots" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/client/propose.go b/validator/client/propose.go index c056e37bb644..1b60baae83c7 100644 --- a/validator/client/propose.go +++ b/validator/client/propose.go @@ -7,22 +7,22 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/time/slots" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/time/slots" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" "github.com/sirupsen/logrus" "go.opencensus.io/trace" "google.golang.org/protobuf/types/known/emptypb" diff --git a/validator/client/propose_protect.go b/validator/client/propose_protect.go index 0ff5f327107b..d02b055c735d 100644 --- a/validator/client/propose_protect.go +++ b/validator/client/propose_protect.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" "github.com/sirupsen/logrus" ) diff --git a/validator/client/propose_protect_test.go b/validator/client/propose_protect_test.go index cbf6ca5a2344..2b726929e4d7 100644 --- a/validator/client/propose_protect_test.go +++ b/validator/client/propose_protect_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" ) func Test_slashableProposalCheck_PreventsLowerThanMinProposal(t *testing.T) { diff --git a/validator/client/propose_test.go b/validator/client/propose_test.go index fa4805740c9b..04bfed23c920 100644 --- a/validator/client/propose_test.go +++ b/validator/client/propose_test.go @@ -9,24 +9,24 @@ import ( "time" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - blocktest "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks/testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - testing2 "github.com/prysmaticlabs/prysm/v3/validator/db/testing" - "github.com/prysmaticlabs/prysm/v3/validator/graffiti" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + blocktest "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + testing2 "github.com/prysmaticlabs/prysm/v4/validator/db/testing" + "github.com/prysmaticlabs/prysm/v4/validator/graffiti" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/validator/client/registration.go b/validator/client/registration.go index 14e74b3be673..7d1d53b504ec 100644 --- a/validator/client/registration.go +++ b/validator/client/registration.go @@ -6,13 +6,13 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/builder" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/builder" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" "go.opencensus.io/trace" ) diff --git a/validator/client/registration_test.go b/validator/client/registration_test.go index 9fbd5e36da20..2658ec07e94e 100644 --- a/validator/client/registration_test.go +++ b/validator/client/registration_test.go @@ -8,12 +8,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestSubmitValidatorRegistrations(t *testing.T) { diff --git a/validator/client/runner.go b/validator/client/runner.go index 7ca5fee0b4d0..9609fbdfd78e 100644 --- a/validator/client/runner.go +++ b/validator/client/runner.go @@ -7,13 +7,13 @@ import ( "time" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/time/slots" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/time/slots" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/validator/client/runner_test.go b/validator/client/runner_test.go index 5ad5126b2cac..b5be08449340 100644 --- a/validator/client/runner_test.go +++ b/validator/client/runner_test.go @@ -7,15 +7,15 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - "github.com/prysmaticlabs/prysm/v3/validator/client/testutil" + "github.com/prysmaticlabs/prysm/v4/async/event" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/validator/client/testutil" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/client/service.go b/validator/client/service.go index 43a0c8636c86..0cae6617549f 100644 --- a/validator/client/service.go +++ b/validator/client/service.go @@ -11,24 +11,24 @@ import ( grpcopentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - "github.com/prysmaticlabs/prysm/v3/async/event" - lruwrpr "github.com/prysmaticlabs/prysm/v3/cache/lru" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - validatorClientFactory "github.com/prysmaticlabs/prysm/v3/validator/client/validator-client-factory" - "github.com/prysmaticlabs/prysm/v3/validator/db" - "github.com/prysmaticlabs/prysm/v3/validator/graffiti" - validatorHelpers "github.com/prysmaticlabs/prysm/v3/validator/helpers" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + "github.com/prysmaticlabs/prysm/v4/async/event" + lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + validatorClientFactory "github.com/prysmaticlabs/prysm/v4/validator/client/validator-client-factory" + "github.com/prysmaticlabs/prysm/v4/validator/db" + "github.com/prysmaticlabs/prysm/v4/validator/graffiti" + validatorHelpers "github.com/prysmaticlabs/prysm/v4/validator/helpers" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" "go.opencensus.io/plugin/ocgrpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/validator/client/service_test.go b/validator/client/service_test.go index faaa6068421f..3662aa06ed50 100644 --- a/validator/client/service_test.go +++ b/validator/client/service_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/grpc/metadata" ) diff --git a/validator/client/slashing_protection_interchange_test.go b/validator/client/slashing_protection_interchange_test.go index b003966bc94c..eb13e8baf198 100644 --- a/validator/client/slashing_protection_interchange_test.go +++ b/validator/client/slashing_protection_interchange_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/tools/bazel" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/io/file" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - history "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/io/file" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + history "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history" ) type eip3076TestCase struct { diff --git a/validator/client/sync_committee.go b/validator/client/sync_committee.go index d65bc7122e16..9cbfd314c803 100644 --- a/validator/client/sync_committee.go +++ b/validator/client/sync_committee.go @@ -7,16 +7,16 @@ import ( "time" emptypb "github.com/golang/protobuf/ptypes/empty" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/signing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/signing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/time/slots" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/validator/client/sync_committee_test.go b/validator/client/sync_committee_test.go index 7741ac21bb30..4cc43e8267f3 100644 --- a/validator/client/sync_committee_test.go +++ b/validator/client/sync_committee_test.go @@ -8,13 +8,13 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/validator/client/testutil/BUILD.bazel b/validator/client/testutil/BUILD.bazel index a6f86c893e89..99aa48581254 100644 --- a/validator/client/testutil/BUILD.bazel +++ b/validator/client/testutil/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "helper.go", "mock_validator.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/testutil", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/testutil", visibility = ["//validator:__subpackages__"], deps = [ "//config/fieldparams:go_default_library", diff --git a/validator/client/testutil/helper.go b/validator/client/testutil/helper.go index feda39be384c..9d0e551adfc8 100644 --- a/validator/client/testutil/helper.go +++ b/validator/client/testutil/helper.go @@ -1,9 +1,9 @@ package testutil import ( - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // ActiveKey represents a public key whose status is ACTIVE. diff --git a/validator/client/testutil/mock_validator.go b/validator/client/testutil/mock_validator.go index 0e90f0fd8d78..f12c170cf07c 100644 --- a/validator/client/testutil/mock_validator.go +++ b/validator/client/testutil/mock_validator.go @@ -5,13 +5,13 @@ import ( "context" "time" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - prysmTime "github.com/prysmaticlabs/prysm/v3/time" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + prysmTime "github.com/prysmaticlabs/prysm/v4/time" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" log "github.com/sirupsen/logrus" ) diff --git a/validator/client/validator-client-factory/BUILD.bazel b/validator/client/validator-client-factory/BUILD.bazel index bf9812e2da2a..1e85867b6381 100644 --- a/validator/client/validator-client-factory/BUILD.bazel +++ b/validator/client/validator-client-factory/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["validator_client_factory.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/client/validator-client-factory", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/client/validator-client-factory", visibility = ["//visibility:public"], deps = [ "//config/features:go_default_library", diff --git a/validator/client/validator-client-factory/validator_client_factory.go b/validator/client/validator-client-factory/validator_client_factory.go index dcb67d6ebdaf..cb0a9f72b9a0 100644 --- a/validator/client/validator-client-factory/validator_client_factory.go +++ b/validator/client/validator-client-factory/validator_client_factory.go @@ -1,11 +1,11 @@ package validator_client_factory import ( - "github.com/prysmaticlabs/prysm/v3/config/features" - beaconApi "github.com/prysmaticlabs/prysm/v3/validator/client/beacon-api" - grpcApi "github.com/prysmaticlabs/prysm/v3/validator/client/grpc-api" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - validatorHelpers "github.com/prysmaticlabs/prysm/v3/validator/helpers" + "github.com/prysmaticlabs/prysm/v4/config/features" + beaconApi "github.com/prysmaticlabs/prysm/v4/validator/client/beacon-api" + grpcApi "github.com/prysmaticlabs/prysm/v4/validator/client/grpc-api" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + validatorHelpers "github.com/prysmaticlabs/prysm/v4/validator/helpers" ) func NewValidatorClient(validatorConn validatorHelpers.NodeConnection) iface.ValidatorClient { diff --git a/validator/client/validator.go b/validator/client/validator.go index 3411cf124c08..71b2c0b6e4bc 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -20,28 +20,28 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" - accountsiface "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - vdb "github.com/prysmaticlabs/prysm/v3/validator/db" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - "github.com/prysmaticlabs/prysm/v3/validator/graffiti" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" + accountsiface "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + vdb "github.com/prysmaticlabs/prysm/v4/validator/db" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/validator/graffiti" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" "github.com/sirupsen/logrus" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/validator/client/validator_test.go b/validator/client/validator_test.go index 3e38ccc52cfa..a3703ee24122 100644 --- a/validator/client/validator_test.go +++ b/validator/client/validator_test.go @@ -15,28 +15,28 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/mock/gomock" "github.com/golang/protobuf/ptypes/empty" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - blsmock "github.com/prysmaticlabs/prysm/v3/crypto/bls/common/mock" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - mock2 "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/testing/util" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - dbTest "github.com/prysmaticlabs/prysm/v3/validator/db/testing" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + blsmock "github.com/prysmaticlabs/prysm/v4/crypto/bls/common/mock" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + mock2 "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/util" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + dbTest "github.com/prysmaticlabs/prysm/v4/validator/db/testing" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" "google.golang.org/grpc/codes" diff --git a/validator/client/wait_for_activation.go b/validator/client/wait_for_activation.go index 3d82ba0a509f..d1f4a96d50ac 100644 --- a/validator/client/wait_for_activation.go +++ b/validator/client/wait_for_activation.go @@ -6,13 +6,13 @@ import ( "time" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/math" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/math" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" "go.opencensus.io/trace" ) diff --git a/validator/client/wait_for_activation_test.go b/validator/client/wait_for_activation_test.go index aa3615a7e5d9..bad5f51ad26f 100644 --- a/validator/client/wait_for_activation_test.go +++ b/validator/client/wait_for_activation_test.go @@ -8,15 +8,15 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - walletMock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - constant "github.com/prysmaticlabs/prysm/v3/validator/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + walletMock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + constant "github.com/prysmaticlabs/prysm/v4/validator/testing" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/tyler-smith/go-bip39" util "github.com/wealdtech/go-eth2-util" diff --git a/validator/db/BUILD.bazel b/validator/db/BUILD.bazel index 0338e3b347cc..e1cb9aa41215 100644 --- a/validator/db/BUILD.bazel +++ b/validator/db/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "migrate.go", "restore.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/db", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/db", visibility = [ "//cmd/validator:__subpackages__", "//validator:__subpackages__", diff --git a/validator/db/alias.go b/validator/db/alias.go index 314321cf678d..75d0ea638f38 100644 --- a/validator/db/alias.go +++ b/validator/db/alias.go @@ -1,6 +1,6 @@ package db -import "github.com/prysmaticlabs/prysm/v3/validator/db/iface" +import "github.com/prysmaticlabs/prysm/v4/validator/db/iface" // Database defines the necessary methods for Prysm's validator client backend which may be implemented by any // key-value or relational database in practice. This is the full database interface which should diff --git a/validator/db/iface/BUILD.bazel b/validator/db/iface/BUILD.bazel index 1ac63ee48a31..fe4e2d1cc7f5 100644 --- a/validator/db/iface/BUILD.bazel +++ b/validator/db/iface/BUILD.bazel @@ -3,8 +3,8 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["interface.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/db/iface", - # Other packages must use github.com/prysmaticlabs/prysm/v3/validator/db.Database alias. + importpath = "github.com/prysmaticlabs/prysm/v4/validator/db/iface", + # Other packages must use github.com/prysmaticlabs/prysm/v4/validator/db.Database alias. visibility = ["//validator/db:__subpackages__"], deps = [ "//config/fieldparams:go_default_library", diff --git a/validator/db/iface/interface.go b/validator/db/iface/interface.go index 0aa352620c55..228d0a02dbc4 100644 --- a/validator/db/iface/interface.go +++ b/validator/db/iface/interface.go @@ -5,11 +5,11 @@ import ( "context" "io" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/monitoring/backup" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/monitoring/backup" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" ) // Ensure the kv store implements the interface. diff --git a/validator/db/kv/BUILD.bazel b/validator/db/kv/BUILD.bazel index d58f22762f6c..6944dd1ee857 100644 --- a/validator/db/kv/BUILD.bazel +++ b/validator/db/kv/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "prune_attester_protection.go", "schema.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/db/kv", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/db/kv", visibility = [ "//cmd:__subpackages__", "//validator:__subpackages__", diff --git a/validator/db/kv/attester_protection.go b/validator/db/kv/attester_protection.go index f66b273ec7ba..00a9c8d046bb 100644 --- a/validator/db/kv/attester_protection.go +++ b/validator/db/kv/attester_protection.go @@ -7,12 +7,12 @@ import ( "time" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/slashings" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/slashings" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/validator/db/kv/attester_protection_test.go b/validator/db/kv/attester_protection_test.go index 4a791ef292c5..3320f892b016 100644 --- a/validator/db/kv/attester_protection_test.go +++ b/validator/db/kv/attester_protection_test.go @@ -7,12 +7,12 @@ import ( "sync" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" logTest "github.com/sirupsen/logrus/hooks/test" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/backup.go b/validator/db/kv/backup.go index eeb820a66563..5a740dee55f0 100644 --- a/validator/db/kv/backup.go +++ b/validator/db/kv/backup.go @@ -6,8 +6,8 @@ import ( "path" "time" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/validator/db/kv/backup_test.go b/validator/db/kv/backup_test.go index 098b770ba7a7..07e83c4ecdfa 100644 --- a/validator/db/kv/backup_test.go +++ b/validator/db/kv/backup_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_Backup(t *testing.T) { diff --git a/validator/db/kv/db.go b/validator/db/kv/db.go index 5c409e757191..3fb3a06ea540 100644 --- a/validator/db/kv/db.go +++ b/validator/db/kv/db.go @@ -10,12 +10,12 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" prombolt "github.com/prysmaticlabs/prombbolt" - "github.com/prysmaticlabs/prysm/v3/async/abool" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/io/file" + "github.com/prysmaticlabs/prysm/v4/async/abool" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/io/file" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/deprecated_attester_protection.go b/validator/db/kv/deprecated_attester_protection.go index 2bc64d73b413..aae5cb5da08a 100644 --- a/validator/db/kv/deprecated_attester_protection.go +++ b/validator/db/kv/deprecated_attester_protection.go @@ -3,10 +3,10 @@ package kv import ( "fmt" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" ) const ( diff --git a/validator/db/kv/deprecated_attester_protection_test.go b/validator/db/kv/deprecated_attester_protection_test.go index 3b5a3ff0da0a..0319dcbcfc3f 100644 --- a/validator/db/kv/deprecated_attester_protection_test.go +++ b/validator/db/kv/deprecated_attester_protection_test.go @@ -3,11 +3,11 @@ package kv import ( "testing" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestNewAttestationHistoryArray(t *testing.T) { diff --git a/validator/db/kv/eip_blacklisted_keys.go b/validator/db/kv/eip_blacklisted_keys.go index da6c2031478a..96c511a1e215 100644 --- a/validator/db/kv/eip_blacklisted_keys.go +++ b/validator/db/kv/eip_blacklisted_keys.go @@ -3,7 +3,7 @@ package kv import ( "context" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/validator/db/kv/eip_blacklisted_keys_test.go b/validator/db/kv/eip_blacklisted_keys_test.go index ccf4a81e9edd..ff1bef7c6610 100644 --- a/validator/db/kv/eip_blacklisted_keys_test.go +++ b/validator/db/kv/eip_blacklisted_keys_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_EIPBlacklistedPublicKeys(t *testing.T) { diff --git a/validator/db/kv/genesis_test.go b/validator/db/kv/genesis_test.go index 94ce5e344c36..97f087a97799 100644 --- a/validator/db/kv/genesis_test.go +++ b/validator/db/kv/genesis_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_GenesisValidatorsRoot_ReadAndWrite(t *testing.T) { diff --git a/validator/db/kv/graffiti.go b/validator/db/kv/graffiti.go index 020601fcf5ff..89642dd4443d 100644 --- a/validator/db/kv/graffiti.go +++ b/validator/db/kv/graffiti.go @@ -4,7 +4,7 @@ import ( "bytes" "context" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/graffiti_test.go b/validator/db/kv/graffiti_test.go index b4206b745f13..40069cd9342c 100644 --- a/validator/db/kv/graffiti_test.go +++ b/validator/db/kv/graffiti_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestStore_GraffitiOrderedIndex_ReadAndWrite(t *testing.T) { diff --git a/validator/db/kv/kv_test.go b/validator/db/kv/kv_test.go index a2f183d06a05..48a574f7f55a 100644 --- a/validator/db/kv/kv_test.go +++ b/validator/db/kv/kv_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/sirupsen/logrus" ) diff --git a/validator/db/kv/migration_optimal_attester_protection.go b/validator/db/kv/migration_optimal_attester_protection.go index 3ae927322352..a62ae0b59270 100644 --- a/validator/db/kv/migration_optimal_attester_protection.go +++ b/validator/db/kv/migration_optimal_attester_protection.go @@ -4,11 +4,11 @@ import ( "bytes" "context" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/progress" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/progress" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/migration_optimal_attester_protection_test.go b/validator/db/kv/migration_optimal_attester_protection_test.go index 73f34681f819..4382ef9a6b4d 100644 --- a/validator/db/kv/migration_optimal_attester_protection_test.go +++ b/validator/db/kv/migration_optimal_attester_protection_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/migration_source_target_epochs_bucket.go b/validator/db/kv/migration_source_target_epochs_bucket.go index e6e5ef442140..60f82fab38d3 100644 --- a/validator/db/kv/migration_source_target_epochs_bucket.go +++ b/validator/db/kv/migration_source_target_epochs_bucket.go @@ -4,7 +4,7 @@ import ( "bytes" "context" - "github.com/prysmaticlabs/prysm/v3/monitoring/progress" + "github.com/prysmaticlabs/prysm/v4/monitoring/progress" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/migration_source_target_epochs_bucket_test.go b/validator/db/kv/migration_source_target_epochs_bucket_test.go index 14b68718c05e..e684b4fd4469 100644 --- a/validator/db/kv/migration_source_target_epochs_bucket_test.go +++ b/validator/db/kv/migration_source_target_epochs_bucket_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/kv/proposer_protection.go b/validator/db/kv/proposer_protection.go index 01f43df9ff49..e1cc14b96f10 100644 --- a/validator/db/kv/proposer_protection.go +++ b/validator/db/kv/proposer_protection.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/time/slots" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/time/slots" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/validator/db/kv/proposer_protection_test.go b/validator/db/kv/proposer_protection_test.go index e4fb4a691daf..26a318461c83 100644 --- a/validator/db/kv/proposer_protection_test.go +++ b/validator/db/kv/proposer_protection_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestProposalHistoryForSlot_InitializesNewPubKeys(t *testing.T) { diff --git a/validator/db/kv/prune_attester_protection.go b/validator/db/kv/prune_attester_protection.go index e007808bf0e8..8226b2273cde 100644 --- a/validator/db/kv/prune_attester_protection.go +++ b/validator/db/kv/prune_attester_protection.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/validator/db/kv/prune_attester_protection_test.go b/validator/db/kv/prune_attester_protection_test.go index ea202829bc26..4073dea154c8 100644 --- a/validator/db/kv/prune_attester_protection_test.go +++ b/validator/db/kv/prune_attester_protection_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/require" bolt "go.etcd.io/bbolt" ) diff --git a/validator/db/migrate.go b/validator/db/migrate.go index ff846758ba4e..72eba6b88057 100644 --- a/validator/db/migrate.go +++ b/validator/db/migrate.go @@ -5,9 +5,9 @@ import ( "path" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" "github.com/urfave/cli/v2" ) diff --git a/validator/db/migrate_test.go b/validator/db/migrate_test.go index 68c21db9a8e4..0a78c4ce5c9f 100644 --- a/validator/db/migrate_test.go +++ b/validator/db/migrate_test.go @@ -4,10 +4,10 @@ import ( "flag" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - dbtest "github.com/prysmaticlabs/prysm/v3/validator/db/testing" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + dbtest "github.com/prysmaticlabs/prysm/v4/validator/db/testing" "github.com/urfave/cli/v2" ) diff --git a/validator/db/restore.go b/validator/db/restore.go index 8012244c76a6..5ab2179f7047 100644 --- a/validator/db/restore.go +++ b/validator/db/restore.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" "github.com/urfave/cli/v2" ) diff --git a/validator/db/restore_test.go b/validator/db/restore_test.go index 6d910657f59b..a0817222b171 100644 --- a/validator/db/restore_test.go +++ b/validator/db/restore_test.go @@ -7,11 +7,11 @@ import ( "path" "testing" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/validator/db/testing/BUILD.bazel b/validator/db/testing/BUILD.bazel index b5e4bfcf576c..d189ef5c4608 100644 --- a/validator/db/testing/BUILD.bazel +++ b/validator/db/testing/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["setup_db.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/db/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/db/testing", visibility = [ "//cmd:__subpackages__", "//validator:__subpackages__", diff --git a/validator/db/testing/setup_db.go b/validator/db/testing/setup_db.go index df364c600a56..2dcf5713a90f 100644 --- a/validator/db/testing/setup_db.go +++ b/validator/db/testing/setup_db.go @@ -4,9 +4,9 @@ import ( "context" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/validator/db/iface" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/validator/db/iface" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" ) // SetupDB instantiates and returns a DB instance for the validator client. diff --git a/validator/db/testing/setup_db_test.go b/validator/db/testing/setup_db_test.go index 338fa1a2afcf..5235ea97c2b1 100644 --- a/validator/db/testing/setup_db_test.go +++ b/validator/db/testing/setup_db_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" ) func TestClearDB(t *testing.T) { diff --git a/validator/graffiti/BUILD.bazel b/validator/graffiti/BUILD.bazel index 44ccb90f60f0..2c8cac2cc4d6 100644 --- a/validator/graffiti/BUILD.bazel +++ b/validator/graffiti/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "log.go", "parse_graffiti.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/graffiti", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/graffiti", visibility = ["//validator:__subpackages__"], deps = [ "//consensus-types/primitives:go_default_library", diff --git a/validator/graffiti/parse_graffiti.go b/validator/graffiti/parse_graffiti.go index e1d745940db2..16341119ecbb 100644 --- a/validator/graffiti/parse_graffiti.go +++ b/validator/graffiti/parse_graffiti.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" "gopkg.in/yaml.v2" ) diff --git a/validator/graffiti/parse_graffiti_test.go b/validator/graffiti/parse_graffiti_test.go index 02ada192d93e..bc368b796e2a 100644 --- a/validator/graffiti/parse_graffiti_test.go +++ b/validator/graffiti/parse_graffiti_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/hash" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/hash" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestParseGraffitiFile_Default(t *testing.T) { diff --git a/validator/helpers/BUILD.bazel b/validator/helpers/BUILD.bazel index 37386030a158..af57fa3e0abb 100644 --- a/validator/helpers/BUILD.bazel +++ b/validator/helpers/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["node_connection.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/helpers", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/helpers", visibility = ["//visibility:public"], deps = [ "@org_golang_google_grpc//:go_default_library", diff --git a/validator/keymanager/BUILD.bazel b/validator/keymanager/BUILD.bazel index d41f961b7a90..2c88381330d9 100644 --- a/validator/keymanager/BUILD.bazel +++ b/validator/keymanager/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "constants.go", "types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager", visibility = [ "//cmd:__subpackages__", "//testing/endtoend/components:__subpackages__", diff --git a/validator/keymanager/derived/BUILD.bazel b/validator/keymanager/derived/BUILD.bazel index 413430c8c157..dedf009de8d4 100644 --- a/validator/keymanager/derived/BUILD.bazel +++ b/validator/keymanager/derived/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "log.go", "mnemonic.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived", visibility = [ "//cmd/validator:__subpackages__", "//tools:__subpackages__", diff --git a/validator/keymanager/derived/eip_test.go b/validator/keymanager/derived/eip_test.go index e6d73cdcdea1..336f9d6a19fb 100644 --- a/validator/keymanager/derived/eip_test.go +++ b/validator/keymanager/derived/eip_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" util "github.com/wealdtech/go-eth2-util" ) diff --git a/validator/keymanager/derived/keymanager.go b/validator/keymanager/derived/keymanager.go index b1f22ba899cd..1d2335f70ca1 100644 --- a/validator/keymanager/derived/keymanager.go +++ b/validator/keymanager/derived/keymanager.go @@ -6,14 +6,14 @@ import ( "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/async/event" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" util "github.com/wealdtech/go-eth2-util" ) diff --git a/validator/keymanager/derived/keymanager_test.go b/validator/keymanager/derived/keymanager_test.go index c72cb4960973..6ccdc22a4c83 100644 --- a/validator/keymanager/derived/keymanager_test.go +++ b/validator/keymanager/derived/keymanager_test.go @@ -5,14 +5,14 @@ import ( "fmt" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - constant "github.com/prysmaticlabs/prysm/v3/validator/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + constant "github.com/prysmaticlabs/prysm/v4/validator/testing" "github.com/tyler-smith/go-bip39" util "github.com/wealdtech/go-eth2-util" ) diff --git a/validator/keymanager/derived/mnemonic.go b/validator/keymanager/derived/mnemonic.go index 00d9ec4efea3..d774755db78e 100644 --- a/validator/keymanager/derived/mnemonic.go +++ b/validator/keymanager/derived/mnemonic.go @@ -5,8 +5,8 @@ import ( "os" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/io/prompt" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/io/prompt" "github.com/tyler-smith/go-bip39" "github.com/tyler-smith/go-bip39/wordlists" ) diff --git a/validator/keymanager/derived/mnemonic_test.go b/validator/keymanager/derived/mnemonic_test.go index 6b0b1886dcd3..7585860c837b 100644 --- a/validator/keymanager/derived/mnemonic_test.go +++ b/validator/keymanager/derived/mnemonic_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" "github.com/tyler-smith/go-bip39" "github.com/tyler-smith/go-bip39/wordlists" ) diff --git a/validator/keymanager/local/BUILD.bazel b/validator/keymanager/local/BUILD.bazel index d56689f74c9b..779dcc5a5f92 100644 --- a/validator/keymanager/local/BUILD.bazel +++ b/validator/keymanager/local/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "log.go", "refresh.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local", visibility = [ "//cmd/validator:__subpackages__", "//tools:__subpackages__", diff --git a/validator/keymanager/local/backup.go b/validator/keymanager/local/backup.go index cd7a85ba1d01..5f6ec8e99230 100644 --- a/validator/keymanager/local/backup.go +++ b/validator/keymanager/local/backup.go @@ -6,9 +6,9 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/local/backup_test.go b/validator/keymanager/local/backup_test.go index 5e621ca819e9..ee8806161421 100644 --- a/validator/keymanager/local/backup_test.go +++ b/validator/keymanager/local/backup_test.go @@ -5,11 +5,11 @@ import ( "encoding/hex" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestLocalKeymanager_ExtractKeystores(t *testing.T) { diff --git a/validator/keymanager/local/delete.go b/validator/keymanager/local/delete.go index 0ca0997da64a..3a6f33ffabc7 100644 --- a/validator/keymanager/local/delete.go +++ b/validator/keymanager/local/delete.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" "github.com/sirupsen/logrus" ) diff --git a/validator/keymanager/local/delete_test.go b/validator/keymanager/local/delete_test.go index e96878f56fc7..8b20cf70c0a0 100644 --- a/validator/keymanager/local/delete_test.go +++ b/validator/keymanager/local/delete_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/testing/require" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" logTest "github.com/sirupsen/logrus/hooks/test" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/local/import.go b/validator/keymanager/local/import.go index 8a3e1fc155a0..0a41d54ee37f 100644 --- a/validator/keymanager/local/import.go +++ b/validator/keymanager/local/import.go @@ -9,9 +9,9 @@ import ( "github.com/k0kubun/go-ansi" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/schollz/progressbar/v3" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/local/import_test.go b/validator/keymanager/local/import_test.go index 9f7cb0bedeed..18553f9956e7 100644 --- a/validator/keymanager/local/import_test.go +++ b/validator/keymanager/local/import_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/local/keymanager.go b/validator/keymanager/local/keymanager.go index 45b94383d12e..5c971c477d3a 100644 --- a/validator/keymanager/local/keymanager.go +++ b/validator/keymanager/local/keymanager.go @@ -10,15 +10,15 @@ import ( "github.com/google/uuid" "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/runtime/interop" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/petnames" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/async/event" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/runtime/interop" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/petnames" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" "go.opencensus.io/trace" ) diff --git a/validator/keymanager/local/keymanager_test.go b/validator/keymanager/local/keymanager_test.go index c3c4134a53c3..7534cc7334f8 100644 --- a/validator/keymanager/local/keymanager_test.go +++ b/validator/keymanager/local/keymanager_test.go @@ -6,14 +6,14 @@ import ( "strings" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/local/refresh.go b/validator/keymanager/local/refresh.go index 45315423ca22..2bd8df6051b2 100644 --- a/validator/keymanager/local/refresh.go +++ b/validator/keymanager/local/refresh.go @@ -8,13 +8,13 @@ import ( "github.com/fsnotify/fsnotify" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/async" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/local/refresh_test.go b/validator/keymanager/local/refresh_test.go index c01b47593e60..ad8a14c40023 100644 --- a/validator/keymanager/local/refresh_test.go +++ b/validator/keymanager/local/refresh_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/keymanager/remote-web3signer/BUILD.bazel b/validator/keymanager/remote-web3signer/BUILD.bazel index 0579331e318d..1a5125d61241 100644 --- a/validator/keymanager/remote-web3signer/BUILD.bazel +++ b/validator/keymanager/remote-web3signer/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "keymanager.go", "metrics.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer", visibility = [ "//cmd/validator:__subpackages__", "//validator:__subpackages__", diff --git a/validator/keymanager/remote-web3signer/internal/BUILD.bazel b/validator/keymanager/remote-web3signer/internal/BUILD.bazel index da734f158941..93be860b3bde 100644 --- a/validator/keymanager/remote-web3signer/internal/BUILD.bazel +++ b/validator/keymanager/remote-web3signer/internal/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "log.go", "metrics.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/internal", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/internal", visibility = ["//validator/keymanager/remote-web3signer:__subpackages__"], deps = [ "//config/fieldparams:go_default_library", diff --git a/validator/keymanager/remote-web3signer/internal/client.go b/validator/keymanager/remote-web3signer/internal/client.go index 991ceca8f69e..af52fa6ee527 100644 --- a/validator/keymanager/remote-web3signer/internal/client.go +++ b/validator/keymanager/remote-web3signer/internal/client.go @@ -15,10 +15,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/validator/keymanager/remote-web3signer/internal/client_test.go b/validator/keymanager/remote-web3signer/internal/client_test.go index 74b51513d60a..c9e9c1c1d69c 100644 --- a/validator/keymanager/remote-web3signer/internal/client_test.go +++ b/validator/keymanager/remote-web3signer/internal/client_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/internal" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/internal" "github.com/stretchr/testify/assert" ) diff --git a/validator/keymanager/remote-web3signer/keymanager.go b/validator/keymanager/remote-web3signer/keymanager.go index 35db914be29e..047d6b9a4fbc 100644 --- a/validator/keymanager/remote-web3signer/keymanager.go +++ b/validator/keymanager/remote-web3signer/keymanager.go @@ -11,16 +11,16 @@ import ( "github.com/go-playground/validator/v10" "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/async/event" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/petnames" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/internal" - web3signerv1 "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1" + "github.com/prysmaticlabs/prysm/v4/async/event" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/petnames" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/internal" + web3signerv1 "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1" log "github.com/sirupsen/logrus" ) diff --git a/validator/keymanager/remote-web3signer/keymanager_test.go b/validator/keymanager/remote-web3signer/keymanager_test.go index f6fafe2726de..623e19f3279c 100644 --- a/validator/keymanager/remote-web3signer/keymanager_test.go +++ b/validator/keymanager/remote-web3signer/keymanager_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/internal" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1/mock" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/internal" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1/mock" "github.com/stretchr/testify/assert" ) diff --git a/validator/keymanager/remote-web3signer/v1/BUILD.bazel b/validator/keymanager/remote-web3signer/v1/BUILD.bazel index b0d75d8f445c..d5e5cd58105a 100644 --- a/validator/keymanager/remote-web3signer/v1/BUILD.bazel +++ b/validator/keymanager/remote-web3signer/v1/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "requests.go", "web3signer_types.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1", visibility = ["//visibility:public"], deps = [ "//consensus-types/blocks:go_default_library", diff --git a/validator/keymanager/remote-web3signer/v1/custom_mappers.go b/validator/keymanager/remote-web3signer/v1/custom_mappers.go index 4091ee3c171a..0d7462048085 100644 --- a/validator/keymanager/remote-web3signer/v1/custom_mappers.go +++ b/validator/keymanager/remote-web3signer/v1/custom_mappers.go @@ -5,10 +5,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/network/forks" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/time/slots" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/network/forks" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/time/slots" ) // MapForkInfo maps the eth2.ForkInfo proto to the Web3Signer spec. diff --git a/validator/keymanager/remote-web3signer/v1/custom_mappers_test.go b/validator/keymanager/remote-web3signer/v1/custom_mappers_test.go index 47f26dd80e70..4091a4074460 100644 --- a/validator/keymanager/remote-web3signer/v1/custom_mappers_test.go +++ b/validator/keymanager/remote-web3signer/v1/custom_mappers_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - v1 "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1/mock" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + v1 "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1/mock" ) func TestMapAggregateAndProof(t *testing.T) { diff --git a/validator/keymanager/remote-web3signer/v1/mock/BUILD.bazel b/validator/keymanager/remote-web3signer/v1/mock/BUILD.bazel index 34dfcee0fc5c..6612406d41ea 100644 --- a/validator/keymanager/remote-web3signer/v1/mock/BUILD.bazel +++ b/validator/keymanager/remote-web3signer/v1/mock/BUILD.bazel @@ -4,7 +4,7 @@ go_library( name = "go_default_library", testonly = True, srcs = ["mocks.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1/mock", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1/mock", visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", diff --git a/validator/keymanager/remote-web3signer/v1/mock/mocks.go b/validator/keymanager/remote-web3signer/v1/mock/mocks.go index 02b85d726041..c9072a5ebb4c 100644 --- a/validator/keymanager/remote-web3signer/v1/mock/mocks.go +++ b/validator/keymanager/remote-web3signer/v1/mock/mocks.go @@ -5,11 +5,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/prysmaticlabs/go-bitfield" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/util" - v1 "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/util" + v1 "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1" ) ///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/validator/keymanager/remote-web3signer/v1/requests.go b/validator/keymanager/remote-web3signer/v1/requests.go index df1fb58db320..7c55f05328a1 100644 --- a/validator/keymanager/remote-web3signer/v1/requests.go +++ b/validator/keymanager/remote-web3signer/v1/requests.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" - "github.com/prysmaticlabs/prysm/v3/consensus-types/interfaces" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/consensus-types/blocks" + "github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" ) // GetBlockSignRequest maps the request for signing type BLOCK. diff --git a/validator/keymanager/remote-web3signer/v1/requests_test.go b/validator/keymanager/remote-web3signer/v1/requests_test.go index c79c9c3276a4..521ab4af1e9d 100644 --- a/validator/keymanager/remote-web3signer/v1/requests_test.go +++ b/validator/keymanager/remote-web3signer/v1/requests_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/require" - v1 "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer/v1/mock" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/require" + v1 "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer/v1/mock" ) func TestGetAggregateAndProofSignRequest(t *testing.T) { diff --git a/validator/keymanager/types.go b/validator/keymanager/types.go index 63a2ac8b19d1..e60e0a4b9649 100644 --- a/validator/keymanager/types.go +++ b/validator/keymanager/types.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/prysmaticlabs/prysm/v3/async/event" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/async/event" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" ) // IKeymanager defines a general keymanager interface for Prysm wallets. diff --git a/validator/keymanager/types_test.go b/validator/keymanager/types_test.go index 13dce64745d5..f4e1d89cd980 100644 --- a/validator/keymanager/types_test.go +++ b/validator/keymanager/types_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" ) var ( diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel index 6937a7009bf0..60e2855e2c3a 100644 --- a/validator/node/BUILD.bazel +++ b/validator/node/BUILD.bazel @@ -30,7 +30,7 @@ go_library( "log.go", "node.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/node", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/node", visibility = [ "//cmd/validator:__subpackages__", "//validator:__subpackages__", diff --git a/validator/node/node.go b/validator/node/node.go index 32c96e85129e..f58edf38a43f 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -25,37 +25,37 @@ import ( gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/pkg/errors" fastssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/prysm/v3/api/gateway" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/v3/config/features" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorServiceConfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/container/slice" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/monitoring/backup" - "github.com/prysmaticlabs/prysm/v3/monitoring/prometheus" - tracing2 "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/runtime" - "github.com/prysmaticlabs/prysm/v3/runtime/debug" - "github.com/prysmaticlabs/prysm/v3/runtime/prereqs" - "github.com/prysmaticlabs/prysm/v3/runtime/version" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - g "github.com/prysmaticlabs/prysm/v3/validator/graffiti" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" - "github.com/prysmaticlabs/prysm/v3/validator/rpc" - validatormiddleware "github.com/prysmaticlabs/prysm/v3/validator/rpc/apimiddleware" - "github.com/prysmaticlabs/prysm/v3/validator/web" + "github.com/prysmaticlabs/prysm/v4/api/gateway" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + "github.com/prysmaticlabs/prysm/v4/config/features" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorServiceConfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/container/slice" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/monitoring/backup" + "github.com/prysmaticlabs/prysm/v4/monitoring/prometheus" + tracing2 "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/runtime" + "github.com/prysmaticlabs/prysm/v4/runtime/debug" + "github.com/prysmaticlabs/prysm/v4/runtime/prereqs" + "github.com/prysmaticlabs/prysm/v4/runtime/version" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + g "github.com/prysmaticlabs/prysm/v4/validator/graffiti" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/validator/rpc" + validatormiddleware "github.com/prysmaticlabs/prysm/v4/validator/rpc/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/validator/web" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" "google.golang.org/protobuf/encoding/protojson" diff --git a/validator/node/node_test.go b/validator/node/node_test.go index bddb3bc511c8..687db3b46daf 100644 --- a/validator/node/node_test.go +++ b/validator/node/node_test.go @@ -12,16 +12,16 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" logtest "github.com/sirupsen/logrus/hooks/test" "github.com/urfave/cli/v2" ) diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel index 0ba92a80133c..6ca81c0b26de 100644 --- a/validator/rpc/BUILD.bazel +++ b/validator/rpc/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "standard_api.go", "wallet.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/rpc", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/rpc", visibility = [ "//cmd/validator:__subpackages__", "//validator:__subpackages__", diff --git a/validator/rpc/accounts.go b/validator/rpc/accounts.go index 15d2af424954..825980544956 100644 --- a/validator/rpc/accounts.go +++ b/validator/rpc/accounts.go @@ -7,15 +7,15 @@ import ( "encoding/json" "fmt" - "github.com/prysmaticlabs/prysm/v3/api/pagination" - "github.com/prysmaticlabs/prysm/v3/cmd" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/petnames" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/local" + "github.com/prysmaticlabs/prysm/v4/api/pagination" + "github.com/prysmaticlabs/prysm/v4/cmd" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/petnames" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/local" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/validator/rpc/accounts_test.go b/validator/rpc/accounts_test.go index 73637d160c49..d85088304c18 100644 --- a/validator/rpc/accounts_test.go +++ b/validator/rpc/accounts_test.go @@ -12,19 +12,19 @@ import ( "time" "github.com/golang/mock/gomock" - "github.com/prysmaticlabs/prysm/v3/cmd/validator/flags" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - mock2 "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - constant "github.com/prysmaticlabs/prysm/v3/validator/testing" + "github.com/prysmaticlabs/prysm/v4/cmd/validator/flags" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + mock2 "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + constant "github.com/prysmaticlabs/prysm/v4/validator/testing" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/validator/rpc/apimiddleware/BUILD.bazel b/validator/rpc/apimiddleware/BUILD.bazel index 368e8c9917ed..634d560005fc 100644 --- a/validator/rpc/apimiddleware/BUILD.bazel +++ b/validator/rpc/apimiddleware/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "endpoint_factory.go", "structs.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/rpc/apimiddleware", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/rpc/apimiddleware", visibility = ["//visibility:public"], deps = [ "//api/gateway/apimiddleware:go_default_library", diff --git a/validator/rpc/apimiddleware/endpoint_factory.go b/validator/rpc/apimiddleware/endpoint_factory.go index b9a762772054..50a6f875c624 100644 --- a/validator/rpc/apimiddleware/endpoint_factory.go +++ b/validator/rpc/apimiddleware/endpoint_factory.go @@ -2,7 +2,7 @@ package apimiddleware import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/api/gateway/apimiddleware" + "github.com/prysmaticlabs/prysm/v4/api/gateway/apimiddleware" ) // ValidatorEndpointFactory creates endpoints used for running validator API calls through the API Middleware. diff --git a/validator/rpc/apimiddleware/structs_test.go b/validator/rpc/apimiddleware/structs_test.go index 82feeb2815bf..cf36da1ce6b0 100644 --- a/validator/rpc/apimiddleware/structs_test.go +++ b/validator/rpc/apimiddleware/structs_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - "github.com/prysmaticlabs/prysm/v3/testing/require" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + "github.com/prysmaticlabs/prysm/v4/testing/require" ) func TestListKeystores_JSONisEqual(t *testing.T) { diff --git a/validator/rpc/auth_token.go b/validator/rpc/auth_token.go index cd6ea4396056..fecc33b5ff65 100644 --- a/validator/rpc/auth_token.go +++ b/validator/rpc/auth_token.go @@ -15,10 +15,10 @@ import ( "github.com/fsnotify/fsnotify" "github.com/golang-jwt/jwt/v4" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/io/file" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/io/file" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/validator/rpc/auth_token_test.go b/validator/rpc/auth_token_test.go index bc5740730806..6e744b1b3ac3 100644 --- a/validator/rpc/auth_token_test.go +++ b/validator/rpc/auth_token_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/golang-jwt/jwt/v4" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/validator/rpc/beacon.go b/validator/rpc/beacon.go index 7dc1129f575c..d22599d27363 100644 --- a/validator/rpc/beacon.go +++ b/validator/rpc/beacon.go @@ -10,12 +10,12 @@ import ( grpcopentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" - grpcutil "github.com/prysmaticlabs/prysm/v3/api/grpc" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/client" - validatorClientFactory "github.com/prysmaticlabs/prysm/v3/validator/client/validator-client-factory" - validatorHelpers "github.com/prysmaticlabs/prysm/v3/validator/helpers" + grpcutil "github.com/prysmaticlabs/prysm/v4/api/grpc" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/client" + validatorClientFactory "github.com/prysmaticlabs/prysm/v4/validator/client/validator-client-factory" + validatorHelpers "github.com/prysmaticlabs/prysm/v4/validator/helpers" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/validator/rpc/beacon_test.go b/validator/rpc/beacon_test.go index 2708ac325fe8..17a2c2ba9fde 100644 --- a/validator/rpc/beacon_test.go +++ b/validator/rpc/beacon_test.go @@ -8,11 +8,11 @@ import ( "github.com/golang/mock/gomock" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - mock2 "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + mock2 "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/validator/rpc/health.go b/validator/rpc/health.go index 0e58f0c3d895..5d6e24402e8f 100644 --- a/validator/rpc/health.go +++ b/validator/rpc/health.go @@ -5,9 +5,9 @@ import ( "time" "github.com/pkg/errors" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/runtime/version" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/runtime/version" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/validator/rpc/health_test.go b/validator/rpc/health_test.go index 20f0a923e1c6..ac8abd5f20c3 100644 --- a/validator/rpc/health_test.go +++ b/validator/rpc/health_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/golang/protobuf/ptypes/empty" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/client" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/client" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/validator/rpc/intercepter_test.go b/validator/rpc/intercepter_test.go index 70fa371abc72..2d1e1bab2a26 100644 --- a/validator/rpc/intercepter_test.go +++ b/validator/rpc/intercepter_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/golang-jwt/jwt/v4" - "github.com/prysmaticlabs/prysm/v3/testing/require" + "github.com/prysmaticlabs/prysm/v4/testing/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/validator/rpc/server.go b/validator/rpc/server.go index bea1f0c09cef..ada558f7c925 100644 --- a/validator/rpc/server.go +++ b/validator/rpc/server.go @@ -11,16 +11,16 @@ import ( recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" grpcopentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/io/logs" - "github.com/prysmaticlabs/prysm/v3/monitoring/tracing" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client" - iface "github.com/prysmaticlabs/prysm/v3/validator/client/iface" - "github.com/prysmaticlabs/prysm/v3/validator/db" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/io/logs" + "github.com/prysmaticlabs/prysm/v4/monitoring/tracing" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client" + iface "github.com/prysmaticlabs/prysm/v4/validator/client/iface" + "github.com/prysmaticlabs/prysm/v4/validator/db" "github.com/sirupsen/logrus" "go.opencensus.io/plugin/ocgrpc" "google.golang.org/grpc" diff --git a/validator/rpc/server_test.go b/validator/rpc/server_test.go index 64755def3252..d2725c6e9f2d 100644 --- a/validator/rpc/server_test.go +++ b/validator/rpc/server_test.go @@ -1,7 +1,7 @@ package rpc import ( - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" ) var _ pb.AuthServer = (*Server)(nil) diff --git a/validator/rpc/slashing.go b/validator/rpc/slashing.go index ecd5e6b59589..016ccbce4143 100644 --- a/validator/rpc/slashing.go +++ b/validator/rpc/slashing.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - slashing "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + slashing "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/validator/rpc/slashing_test.go b/validator/rpc/slashing_test.go index 3c8ff2b5061a..f0af3822c2e1 100644 --- a/validator/rpc/slashing_test.go +++ b/validator/rpc/slashing_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/golang/protobuf/ptypes/empty" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" - mocks "github.com/prysmaticlabs/prysm/v3/validator/testing" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" + mocks "github.com/prysmaticlabs/prysm/v4/validator/testing" ) func TestImportSlashingProtection_Preconditions(t *testing.T) { diff --git a/validator/rpc/standard_api.go b/validator/rpc/standard_api.go index 76dba6185b4f..29473fb34eba 100644 --- a/validator/rpc/standard_api.go +++ b/validator/rpc/standard_api.go @@ -9,16 +9,16 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/golang/protobuf/ptypes/empty" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorServiceConfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - slashingprotection "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorServiceConfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + slashingprotection "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/validator/rpc/standard_api_test.go b/validator/rpc/standard_api_test.go index c1347e5ede57..6ca8704d2b91 100644 --- a/validator/rpc/standard_api_test.go +++ b/validator/rpc/standard_api_test.go @@ -14,28 +14,28 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/google/uuid" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - validatorserviceconfig "github.com/prysmaticlabs/prysm/v3/config/validator/service" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - mock2 "github.com/prysmaticlabs/prysm/v3/testing/mock" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager/derived" - remoteweb3signer "github.com/prysmaticlabs/prysm/v3/validator/keymanager/remote-web3signer" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" - mocks "github.com/prysmaticlabs/prysm/v3/validator/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + validatorserviceconfig "github.com/prysmaticlabs/prysm/v4/config/validator/service" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + validatorpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + mock2 "github.com/prysmaticlabs/prysm/v4/testing/mock" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager/derived" + remoteweb3signer "github.com/prysmaticlabs/prysm/v4/validator/keymanager/remote-web3signer" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" + mocks "github.com/prysmaticlabs/prysm/v4/validator/testing" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/validator/rpc/wallet.go b/validator/rpc/wallet.go index 0cb5e843a87d..5d8c26dac27b 100644 --- a/validator/rpc/wallet.go +++ b/validator/rpc/wallet.go @@ -9,13 +9,13 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/io/file" - "github.com/prysmaticlabs/prysm/v3/io/prompt" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/io/file" + "github.com/prysmaticlabs/prysm/v4/io/prompt" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/tyler-smith/go-bip39" "github.com/tyler-smith/go-bip39/wordlists" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" diff --git a/validator/rpc/wallet_test.go b/validator/rpc/wallet_test.go index 447787d0c4fa..2dacb68528ff 100644 --- a/validator/rpc/wallet_test.go +++ b/validator/rpc/wallet_test.go @@ -9,21 +9,21 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/v3/async/event" - "github.com/prysmaticlabs/prysm/v3/config/features" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/io/file" - ethpbservice "github.com/prysmaticlabs/prysm/v3/proto/eth/service" - pb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/accounts" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/iface" - mock "github.com/prysmaticlabs/prysm/v3/validator/accounts/testing" - "github.com/prysmaticlabs/prysm/v3/validator/accounts/wallet" - "github.com/prysmaticlabs/prysm/v3/validator/client" - "github.com/prysmaticlabs/prysm/v3/validator/keymanager" + "github.com/prysmaticlabs/prysm/v4/async/event" + "github.com/prysmaticlabs/prysm/v4/config/features" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/io/file" + ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" + pb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/validator-client" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/accounts" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/iface" + mock "github.com/prysmaticlabs/prysm/v4/validator/accounts/testing" + "github.com/prysmaticlabs/prysm/v4/validator/accounts/wallet" + "github.com/prysmaticlabs/prysm/v4/validator/client" + "github.com/prysmaticlabs/prysm/v4/validator/keymanager" "github.com/tyler-smith/go-bip39" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) diff --git a/validator/slashing-protection-history/BUILD.bazel b/validator/slashing-protection-history/BUILD.bazel index 69a1157500b4..df0cbea75a46 100644 --- a/validator/slashing-protection-history/BUILD.bazel +++ b/validator/slashing-protection-history/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "import.go", "log.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history", visibility = [ "//cmd:__subpackages__", "//validator:__subpackages__", diff --git a/validator/slashing-protection-history/export.go b/validator/slashing-protection-history/export.go index 940178134626..d78fd1906464 100644 --- a/validator/slashing-protection-history/export.go +++ b/validator/slashing-protection-history/export.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/monitoring/progress" - "github.com/prysmaticlabs/prysm/v3/validator/db" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/monitoring/progress" + "github.com/prysmaticlabs/prysm/v4/validator/db" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" ) // ExportStandardProtectionJSON extracts all slashing protection data from a validator database diff --git a/validator/slashing-protection-history/export_test.go b/validator/slashing-protection-history/export_test.go index b22d80bdfe36..faca5a56a062 100644 --- a/validator/slashing-protection-history/export_test.go +++ b/validator/slashing-protection-history/export_test.go @@ -5,12 +5,12 @@ import ( "fmt" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - dbtest "github.com/prysmaticlabs/prysm/v3/validator/db/testing" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + dbtest "github.com/prysmaticlabs/prysm/v4/validator/db/testing" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" ) func TestExportStandardProtectionJSON_EmptyGenesisRoot(t *testing.T) { diff --git a/validator/slashing-protection-history/format/BUILD.bazel b/validator/slashing-protection-history/format/BUILD.bazel index df47060f8e9d..5cbc0ac81bd8 100644 --- a/validator/slashing-protection-history/format/BUILD.bazel +++ b/validator/slashing-protection-history/format/BUILD.bazel @@ -3,6 +3,6 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["format.go"], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format", visibility = ["//visibility:public"], ) diff --git a/validator/slashing-protection-history/helpers.go b/validator/slashing-protection-history/helpers.go index 90dc59a1e6ed..63b92490d5d4 100644 --- a/validator/slashing-protection-history/helpers.go +++ b/validator/slashing-protection-history/helpers.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/k0kubun/go-ansi" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" "github.com/schollz/progressbar/v3" ) diff --git a/validator/slashing-protection-history/helpers_test.go b/validator/slashing-protection-history/helpers_test.go index abe9d4365175..a5d2206e114c 100644 --- a/validator/slashing-protection-history/helpers_test.go +++ b/validator/slashing-protection-history/helpers_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" ) func Test_uint64FromString(t *testing.T) { diff --git a/validator/slashing-protection-history/import.go b/validator/slashing-protection-history/import.go index a56d81a0bc23..f04e7413ddb3 100644 --- a/validator/slashing-protection-history/import.go +++ b/validator/slashing-protection-history/import.go @@ -8,14 +8,14 @@ import ( "io" "github.com/pkg/errors" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/slashings" - "github.com/prysmaticlabs/prysm/v3/validator/db" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1/slashings" + "github.com/prysmaticlabs/prysm/v4/validator/db" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" ) // ImportStandardProtectionJSON takes in EIP-3076 compliant JSON file used for slashing protection diff --git a/validator/slashing-protection-history/import_test.go b/validator/slashing-protection-history/import_test.go index 2736856c02b3..908343a3d51b 100644 --- a/validator/slashing-protection-history/import_test.go +++ b/validator/slashing-protection-history/import_test.go @@ -9,15 +9,15 @@ import ( "reflect" "testing" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - dbtest "github.com/prysmaticlabs/prysm/v3/validator/db/testing" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" - valtest "github.com/prysmaticlabs/prysm/v3/validator/testing" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + dbtest "github.com/prysmaticlabs/prysm/v4/validator/db/testing" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" + valtest "github.com/prysmaticlabs/prysm/v4/validator/testing" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/validator/slashing-protection-history/round_trip_test.go b/validator/slashing-protection-history/round_trip_test.go index e02c67affa62..9778ae914f6f 100644 --- a/validator/slashing-protection-history/round_trip_test.go +++ b/validator/slashing-protection-history/round_trip_test.go @@ -7,14 +7,14 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/testing/assert" - "github.com/prysmaticlabs/prysm/v3/testing/require" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - dbtest "github.com/prysmaticlabs/prysm/v3/validator/db/testing" - history "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" - slashtest "github.com/prysmaticlabs/prysm/v3/validator/testing" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/require" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + dbtest "github.com/prysmaticlabs/prysm/v4/validator/db/testing" + history "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" + slashtest "github.com/prysmaticlabs/prysm/v4/validator/testing" ) func TestImportExport_RoundTrip(t *testing.T) { diff --git a/validator/testing/BUILD.bazel b/validator/testing/BUILD.bazel index 966e0d196925..af8eef0d8c5c 100644 --- a/validator/testing/BUILD.bazel +++ b/validator/testing/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "mock_slasher.go", "protection_history.go", ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/testing", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/testing", visibility = [ "//cmd:__subpackages__", "//validator:__subpackages__", diff --git a/validator/testing/mock_protector.go b/validator/testing/mock_protector.go index 5e7431eb4e83..005cc45912f1 100644 --- a/validator/testing/mock_protector.go +++ b/validator/testing/mock_protector.go @@ -3,7 +3,7 @@ package testing import ( "context" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" ) // MockProtector mocks the protector. diff --git a/validator/testing/mock_slasher.go b/validator/testing/mock_slasher.go index 180a0f39a386..6c7c87bf81dc 100644 --- a/validator/testing/mock_slasher.go +++ b/validator/testing/mock_slasher.go @@ -4,7 +4,7 @@ import ( "context" "errors" - eth "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1" + eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/validator/testing/protection_history.go b/validator/testing/protection_history.go index a4c17fbcae89..6c55d72702e0 100644 --- a/validator/testing/protection_history.go +++ b/validator/testing/protection_history.go @@ -3,14 +3,14 @@ package testing import ( "fmt" - fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams" - "github.com/prysmaticlabs/prysm/v3/config/params" - "github.com/prysmaticlabs/prysm/v3/consensus-types/primitives" - "github.com/prysmaticlabs/prysm/v3/crypto/bls" - "github.com/prysmaticlabs/prysm/v3/crypto/rand" - "github.com/prysmaticlabs/prysm/v3/encoding/bytesutil" - "github.com/prysmaticlabs/prysm/v3/validator/db/kv" - "github.com/prysmaticlabs/prysm/v3/validator/slashing-protection-history/format" + fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams" + "github.com/prysmaticlabs/prysm/v4/config/params" + "github.com/prysmaticlabs/prysm/v4/consensus-types/primitives" + "github.com/prysmaticlabs/prysm/v4/crypto/bls" + "github.com/prysmaticlabs/prysm/v4/crypto/rand" + "github.com/prysmaticlabs/prysm/v4/encoding/bytesutil" + "github.com/prysmaticlabs/prysm/v4/validator/db/kv" + "github.com/prysmaticlabs/prysm/v4/validator/slashing-protection-history/format" ) // MockSlashingProtectionJSON creates a mock, full slashing protection JSON struct diff --git a/validator/web/BUILD.bazel b/validator/web/BUILD.bazel index 4f4e7cfb7396..0bfc3e8243c0 100644 --- a/validator/web/BUILD.bazel +++ b/validator/web/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "headers.go", ":site_data", # keep ], - importpath = "github.com/prysmaticlabs/prysm/v3/validator/web", + importpath = "github.com/prysmaticlabs/prysm/v4/validator/web", visibility = [ "//api/gateway:__pkg__", "//validator:__subpackages__", diff --git a/validator/web/handler_test.go b/validator/web/handler_test.go index 883dbeb1cf17..27c3571f857d 100644 --- a/validator/web/handler_test.go +++ b/validator/web/handler_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/prysmaticlabs/prysm/v3/testing/assert" + "github.com/prysmaticlabs/prysm/v4/testing/assert" ) func TestHandler(t *testing.T) { From 67595d576cfa899795037d9b2b886004919b9580 Mon Sep 17 00:00:00 2001 From: james-prysm <90280386+james-prysm@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:25:36 -0500 Subject: [PATCH 10/10] fixing SSE payloads (#12154) * fixing typo on casing * WIP get missed slot * missed in commit * reverting changes onfeedback * reverting bazel * using the current or head slots for events * fixing linting * use emitSlot * fixing time and preRando change * updating based on feedback * fixing linting * clarifying variable * removing useless if statement * fixing function to use the current slot+1 * updating based on feedback * fixing unit tests * missed dependency injection * fixing linting --- beacon-chain/blockchain/process_block.go | 4 ++++ beacon-chain/core/feed/state/events.go | 2 ++ beacon-chain/rpc/apimiddleware/structs.go | 4 ++-- beacon-chain/rpc/eth/events/BUILD.bazel | 1 + beacon-chain/rpc/eth/events/events.go | 26 +++++++++++++++++++--- beacon-chain/rpc/eth/events/events_test.go | 17 +++++++++----- beacon-chain/rpc/eth/events/server.go | 1 + beacon-chain/rpc/service.go | 1 + 8 files changed, 45 insertions(+), 11 deletions(-) diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index 20166ef01f1e..e979fe5c6ba5 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -671,9 +671,13 @@ func (s *Service) fillMissingPayloadIDRoutine(ctx context.Context, stateFeed *ev for { select { case <-ticker.C(): + s.cfg.StateNotifier.StateFeed().Send(&feed.Event{ + Type: statefeed.MissedSlot, + }) if err := s.fillMissingBlockPayloadId(ctx); err != nil { log.WithError(err).Error("Could not fill missing payload ID") } + case <-ctx.Done(): log.Debug("Context closed, exiting routine") return diff --git a/beacon-chain/core/feed/state/events.go b/beacon-chain/core/feed/state/events.go index 191501936f14..2ef282ef886d 100644 --- a/beacon-chain/core/feed/state/events.go +++ b/beacon-chain/core/feed/state/events.go @@ -26,6 +26,8 @@ const ( FinalizedCheckpoint // NewHead of the chain event. NewHead + // MissedSlot is sent when we need to notify users that a slot was missed. + MissedSlot ) // BlockProcessedData is the data sent with BlockProcessed events. diff --git a/beacon-chain/rpc/apimiddleware/structs.go b/beacon-chain/rpc/apimiddleware/structs.go index 3e8bb3cf38e3..f305b6d85ddb 100644 --- a/beacon-chain/rpc/apimiddleware/structs.go +++ b/beacon-chain/rpc/apimiddleware/structs.go @@ -1166,8 +1166,8 @@ type EventPayloadAttributeStreamV1Json struct { } type EventPayloadAttributeStreamV2Json struct { - Version string `json:"version"` - Data *EventPayloadAttributeV2Json + Version string `json:"version"` + Data *EventPayloadAttributeV2Json `json:"data"` } type EventPayloadAttributeV1Json struct { diff --git a/beacon-chain/rpc/eth/events/BUILD.bazel b/beacon-chain/rpc/eth/events/BUILD.bazel index 2d21b6b17095..c36535c1a0ba 100644 --- a/beacon-chain/rpc/eth/events/BUILD.bazel +++ b/beacon-chain/rpc/eth/events/BUILD.bazel @@ -16,6 +16,7 @@ go_library( "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/time:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//proto/engine/v1:go_default_library", "//proto/eth/service:go_default_library", "//proto/eth/v1:go_default_library", diff --git a/beacon-chain/rpc/eth/events/events.go b/beacon-chain/rpc/eth/events/events.go index c17636bc552f..194bfbf3ecdf 100644 --- a/beacon-chain/rpc/eth/events/events.go +++ b/beacon-chain/rpc/eth/events/events.go @@ -11,6 +11,7 @@ import ( statefeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time" + "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition" enginev1 "github.com/prysmaticlabs/prysm/v4/proto/engine/v1" ethpbservice "github.com/prysmaticlabs/prysm/v4/proto/eth/service" ethpb "github.com/prysmaticlabs/prysm/v4/proto/eth/v1" @@ -225,6 +226,14 @@ func (s *Server) handleStateEvents( return nil } return nil + case statefeed.MissedSlot: + if _, ok := requestedTopics[PayloadAttributesTopic]; ok { + if err := s.streamPayloadAttributes(stream); err != nil { + log.WithError(err).Error("Unable to obtain stream payload attributes") + } + return nil + } + return nil case statefeed.FinalizedCheckpoint: if _, ok := requestedTopics[FinalizedCheckpointTopic]; !ok { return nil @@ -250,8 +259,14 @@ func (s *Server) handleStateEvents( // streamPayloadAttributes on new head event. // This event stream is intended to be used by builders and relays. +// parent_ fields are based on state at N_{current_slot}, while the rest of fields are based on state of N_{current_slot + 1} func (s *Server) streamPayloadAttributes(stream ethpbservice.Events_StreamEventsServer) error { - headState, err := s.HeadFetcher.HeadStateReadOnly(s.Ctx) + st, err := s.HeadFetcher.HeadState(s.Ctx) + if err != nil { + return err + } + // advance the headstate + headState, err := transition.ProcessSlotsIfPossible(s.Ctx, st, s.ChainInfoFetcher.CurrentSlot()+1) if err != nil { return err } @@ -281,12 +296,17 @@ func (s *Server) streamPayloadAttributes(stream ethpbservice.Events_StreamEvents return err } + proposerIndex, err := helpers.BeaconProposerIndex(s.Ctx, headState) + if err != nil { + return err + } + switch headState.Version() { case version.Bellatrix: return streamData(stream, PayloadAttributesTopic, ðpb.EventPayloadAttributeV1{ Version: version.String(headState.Version()), Data: ðpb.EventPayloadAttributeV1_BasePayloadAttribute{ - ProposerIndex: headBlock.Block().ProposerIndex(), + ProposerIndex: proposerIndex, ProposalSlot: headState.Slot(), ParentBlockNumber: headPayload.BlockNumber(), ParentBlockRoot: headRoot, @@ -306,7 +326,7 @@ func (s *Server) streamPayloadAttributes(stream ethpbservice.Events_StreamEvents return streamData(stream, PayloadAttributesTopic, ðpb.EventPayloadAttributeV2{ Version: version.String(headState.Version()), Data: ðpb.EventPayloadAttributeV2_BasePayloadAttribute{ - ProposerIndex: headBlock.Block().ProposerIndex(), + ProposerIndex: proposerIndex, ProposalSlot: headState.Slot(), ParentBlockNumber: headPayload.BlockNumber(), ParentBlockRoot: headRoot, diff --git a/beacon-chain/rpc/eth/events/events_test.go b/beacon-chain/rpc/eth/events/events_test.go index 2842a2ec7dfb..3f8f0661932c 100644 --- a/beacon-chain/rpc/eth/events/events_test.go +++ b/beacon-chain/rpc/eth/events/events_test.go @@ -337,7 +337,7 @@ func TestStreamEvents_StateEvents(t *testing.T) { var scBits [fieldparams.SyncAggregateSyncCommitteeBytesLength]byte blk := ð.SignedBeaconBlockBellatrix{ Block: ð.BeaconBlockBellatrix{ - ProposerIndex: 1, + ProposerIndex: 0, Slot: 1, ParentRoot: parentRoot[:], StateRoot: genesis.Block.StateRoot, @@ -365,13 +365,15 @@ func TestStreamEvents_StateEvents(t *testing.T) { require.NoError(t, err) srv, ctrl, mockStream := setupServer(ctx, t) defer ctrl.Finish() - srv.HeadFetcher = &mockChain.ChainService{ + fetcher := &mockChain.ChainService{ Genesis: time.Now(), State: beaconState, Block: signedBlk, Root: make([]byte, 32), ValidatorsRoot: [32]byte{}, } + srv.HeadFetcher = fetcher + srv.ChainInfoFetcher = fetcher prevRando, err := helpers.RandaoMix(beaconState, prysmtime.CurrentEpoch(beaconState)) require.NoError(t, err) @@ -379,7 +381,7 @@ func TestStreamEvents_StateEvents(t *testing.T) { wantedPayload := ðpb.EventPayloadAttributeV1{ Version: version.String(version.Bellatrix), Data: ðpb.EventPayloadAttributeV1_BasePayloadAttribute{ - ProposerIndex: 1, + ProposerIndex: 0, ProposalSlot: 2, ParentBlockNumber: 1, ParentBlockRoot: make([]byte, 32), @@ -441,7 +443,7 @@ func TestStreamEvents_StateEvents(t *testing.T) { var scBits [fieldparams.SyncAggregateSyncCommitteeBytesLength]byte blk := ð.SignedBeaconBlockCapella{ Block: ð.BeaconBlockCapella{ - ProposerIndex: 1, + ProposerIndex: 0, Slot: 1, ParentRoot: parentRoot[:], StateRoot: genesis.Block.StateRoot, @@ -470,7 +472,7 @@ func TestStreamEvents_StateEvents(t *testing.T) { require.NoError(t, err) srv, ctrl, mockStream := setupServer(ctx, t) defer ctrl.Finish() - srv.HeadFetcher = &mockChain.ChainService{ + fetcher := &mockChain.ChainService{ Genesis: time.Now(), State: beaconState, Block: signedBlk, @@ -478,13 +480,16 @@ func TestStreamEvents_StateEvents(t *testing.T) { ValidatorsRoot: [32]byte{}, } + srv.HeadFetcher = fetcher + srv.ChainInfoFetcher = fetcher + prevRando, err := helpers.RandaoMix(beaconState, prysmtime.CurrentEpoch(beaconState)) require.NoError(t, err) wantedPayload := ðpb.EventPayloadAttributeV2{ Version: version.String(version.Capella), Data: ðpb.EventPayloadAttributeV2_BasePayloadAttribute{ - ProposerIndex: 1, + ProposerIndex: 0, ProposalSlot: 2, ParentBlockNumber: 1, ParentBlockRoot: make([]byte, 32), diff --git a/beacon-chain/rpc/eth/events/server.go b/beacon-chain/rpc/eth/events/server.go index 1be71c3eb6df..d48fdca32310 100644 --- a/beacon-chain/rpc/eth/events/server.go +++ b/beacon-chain/rpc/eth/events/server.go @@ -20,4 +20,5 @@ type Server struct { BlockNotifier blockfeed.Notifier OperationNotifier opfeed.Notifier HeadFetcher blockchain.HeadFetcher + ChainInfoFetcher blockchain.ChainInfoFetcher } diff --git a/beacon-chain/rpc/service.go b/beacon-chain/rpc/service.go index 41b953e57307..8031df046c9c 100644 --- a/beacon-chain/rpc/service.go +++ b/beacon-chain/rpc/service.go @@ -336,6 +336,7 @@ func (s *Service) Start() { BlockNotifier: s.cfg.BlockNotifier, OperationNotifier: s.cfg.OperationNotifier, HeadFetcher: s.cfg.HeadFetcher, + ChainInfoFetcher: s.cfg.ChainInfoFetcher, }) if s.cfg.EnableDebugRPCEndpoints { log.Info("Enabled debug gRPC endpoints")