diff --git a/api/client/builder/client_test.go b/api/client/builder/client_test.go index 79be7ae79d..9f058ac0f3 100644 --- a/api/client/builder/client_test.go +++ b/api/client/builder/client_test.go @@ -10,6 +10,7 @@ import ( "net/url" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api" "github.com/OffchainLabs/prysm/v6/api/server/structs" "github.com/OffchainLabs/prysm/v6/config/params" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" log "github.com/sirupsen/logrus" ) diff --git a/api/client/builder/types_test.go b/api/client/builder/types_test.go index 9dff0c049e..016bf9678b 100644 --- a/api/client/builder/types_test.go +++ b/api/client/builder/types_test.go @@ -11,6 +11,7 @@ import ( "os" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api/server/structs" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" consensusblocks "github.com/OffchainLabs/prysm/v6/consensus-types/blocks" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func ezDecode(t *testing.T, s string) []byte { diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index 3ff4d88089..bb7169c2f2 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -5,6 +5,7 @@ import ( "fmt" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/peerdas" @@ -29,7 +30,6 @@ import ( "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/process_block_test.go b/beacon-chain/blockchain/process_block_test.go index 1494d3da8e..f1daba177e 100644 --- a/beacon-chain/blockchain/process_block_test.go +++ b/beacon-chain/blockchain/process_block_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/cache" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" @@ -49,7 +50,6 @@ import ( "github.com/ethereum/go-ethereum/common" gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/cache/attestation_test.go b/beacon-chain/cache/attestation_test.go index a4d5aa548d..82ab952f15 100644 --- a/beacon-chain/cache/attestation_test.go +++ b/beacon-chain/cache/attestation_test.go @@ -3,6 +3,7 @@ package cache import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls/blst" "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" @@ -10,7 +11,6 @@ import ( "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestAdd(t *testing.T) { diff --git a/beacon-chain/core/altair/attestation_test.go b/beacon-chain/core/altair/attestation_test.go index 7aa93e0142..d7af583c23 100644 --- a/beacon-chain/core/altair/attestation_test.go +++ b/beacon-chain/core/altair/attestation_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" gofuzz "github.com/google/gofuzz" - "github.com/prysmaticlabs/go-bitfield" ) func TestProcessAttestations_InclusionDelayFailure(t *testing.T) { diff --git a/beacon-chain/core/altair/block_test.go b/beacon-chain/core/altair/block_test.go index 2642390f86..be8041d242 100644 --- a/beacon-chain/core/altair/block_test.go +++ b/beacon-chain/core/altair/block_test.go @@ -4,6 +4,7 @@ import ( "math" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -19,7 +20,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" ) func TestProcessSyncCommittee_PerfectParticipation(t *testing.T) { diff --git a/beacon-chain/core/altair/upgrade_test.go b/beacon-chain/core/altair/upgrade_test.go index 15117ac696..715f57b0c6 100644 --- a/beacon-chain/core/altair/upgrade_test.go +++ b/beacon-chain/core/altair/upgrade_test.go @@ -3,6 +3,7 @@ package altair_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" @@ -12,7 +13,6 @@ import ( "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestTranslateParticipation(t *testing.T) { diff --git a/beacon-chain/core/blocks/attestation_regression_test.go b/beacon-chain/core/blocks/attestation_regression_test.go index cc3c367beb..c23a110806 100644 --- a/beacon-chain/core/blocks/attestation_regression_test.go +++ b/beacon-chain/core/blocks/attestation_regression_test.go @@ -5,6 +5,7 @@ import ( "os" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" state_native "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native" "github.com/OffchainLabs/prysm/v6/config/params" @@ -12,7 +13,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) // 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 916c31c256..9f9135a7b4 100644 --- a/beacon-chain/core/blocks/attestation_test.go +++ b/beacon-chain/core/blocks/attestation_test.go @@ -4,6 +4,7 @@ import ( "context" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -20,7 +21,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestProcessAggregatedAttestation_OverlappingBits(t *testing.T) { diff --git a/beacon-chain/core/epoch/precompute/attestation_test.go b/beacon-chain/core/epoch/precompute/attestation_test.go index 7a45fb7181..099fe7b749 100644 --- a/beacon-chain/core/epoch/precompute/attestation_test.go +++ b/beacon-chain/core/epoch/precompute/attestation_test.go @@ -3,6 +3,7 @@ package precompute_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/epoch/precompute" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/config/params" @@ -12,7 +13,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) 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 2a0583ef2b..d219192cab 100644 --- a/beacon-chain/core/epoch/precompute/justification_finalization.go +++ b/beacon-chain/core/epoch/precompute/justification_finalization.go @@ -1,6 +1,7 @@ package precompute import ( + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" @@ -8,7 +9,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) 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 95d7d92d2b..1eaed13fb5 100644 --- a/beacon-chain/core/epoch/precompute/justification_finalization_test.go +++ b/beacon-chain/core/epoch/precompute/justification_finalization_test.go @@ -3,6 +3,7 @@ package precompute_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/epoch/precompute" state_native "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native" @@ -12,7 +13,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestProcessJustificationAndFinalizationPreCompute_ConsecutiveEpochs(t *testing.T) { diff --git a/beacon-chain/core/epoch/precompute/reward_penalty_test.go b/beacon-chain/core/epoch/precompute/reward_penalty_test.go index 279f819970..a9a9084ebb 100644 --- a/beacon-chain/core/epoch/precompute/reward_penalty_test.go +++ b/beacon-chain/core/epoch/precompute/reward_penalty_test.go @@ -3,6 +3,7 @@ package precompute import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" @@ -16,7 +17,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func TestProcessRewardsAndPenaltiesPrecompute(t *testing.T) { diff --git a/beacon-chain/core/helpers/beacon_committee.go b/beacon-chain/core/helpers/beacon_committee.go index 8048b1feac..198832d681 100644 --- a/beacon-chain/core/helpers/beacon_committee.go +++ b/beacon-chain/core/helpers/beacon_committee.go @@ -7,6 +7,7 @@ import ( "fmt" "sort" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/cache" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" forkchoicetypes "github.com/OffchainLabs/prysm/v6/beacon-chain/forkchoice/types" @@ -23,7 +24,6 @@ import ( "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) var ( diff --git a/beacon-chain/core/helpers/beacon_committee_test.go b/beacon-chain/core/helpers/beacon_committee_test.go index d168e8e8ab..efb3214aa0 100644 --- a/beacon-chain/core/helpers/beacon_committee_test.go +++ b/beacon-chain/core/helpers/beacon_committee_test.go @@ -5,6 +5,7 @@ import ( "strconv" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" state_native "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native" @@ -18,7 +19,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" ) func TestComputeCommittee_WithoutCache(t *testing.T) { diff --git a/beacon-chain/core/helpers/weak_subjectivity_test.go b/beacon-chain/core/helpers/weak_subjectivity_test.go index 8cd74e7819..cbe788541a 100644 --- a/beacon-chain/core/helpers/weak_subjectivity_test.go +++ b/beacon-chain/core/helpers/weak_subjectivity_test.go @@ -285,4 +285,3 @@ func genState(t *testing.T, valCount, avgBalance uint64) state.BeaconState { return beaconState } - 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 5e6ec67d0d..4eab874cc5 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 @@ -4,6 +4,7 @@ import ( "math" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -20,7 +21,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" ) 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 0f9e47d4dd..4fb6e13495 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 @@ -4,6 +4,7 @@ import ( "math" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" ) func TestExecuteBellatrixStateTransitionNoVerify_FullProcess(t *testing.T) { diff --git a/beacon-chain/core/transition/transition_test.go b/beacon-chain/core/transition/transition_test.go index 42a24d5e98..bee546fd13 100644 --- a/beacon-chain/core/transition/transition_test.go +++ b/beacon-chain/core/transition/transition_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -23,7 +24,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func init() { diff --git a/beacon-chain/monitor/process_attestation_test.go b/beacon-chain/monitor/process_attestation_test.go index 820d0871b5..03bdad84ed 100644 --- a/beacon-chain/monitor/process_attestation_test.go +++ b/beacon-chain/monitor/process_attestation_test.go @@ -4,12 +4,12 @@ import ( "bytes" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/blocks" "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/monitor/process_sync_committee_test.go b/beacon-chain/monitor/process_sync_committee_test.go index bf0b59dc4b..35848ed0ad 100644 --- a/beacon-chain/monitor/process_sync_committee_test.go +++ b/beacon-chain/monitor/process_sync_committee_test.go @@ -3,11 +3,11 @@ package monitor import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/blocks" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/operations/attestations/kv/aggregated_test.go b/beacon-chain/operations/attestations/kv/aggregated_test.go index e91b589d30..c285fab015 100644 --- a/beacon-chain/operations/attestations/kv/aggregated_test.go +++ b/beacon-chain/operations/attestations/kv/aggregated_test.go @@ -4,6 +4,7 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" @@ -13,7 +14,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" c "github.com/patrickmn/go-cache" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func TestKV_Aggregated_AggregateUnaggregatedAttestations(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/block_test.go b/beacon-chain/operations/attestations/kv/block_test.go index 7d683c5f4c..492c5ffeee 100644 --- a/beacon-chain/operations/attestations/kv/block_test.go +++ b/beacon-chain/operations/attestations/kv/block_test.go @@ -4,11 +4,11 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestKV_BlockAttestation_CanSaveRetrieve(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/forkchoice_test.go b/beacon-chain/operations/attestations/kv/forkchoice_test.go index c56b4fd776..9f7fe460d3 100644 --- a/beacon-chain/operations/attestations/kv/forkchoice_test.go +++ b/beacon-chain/operations/attestations/kv/forkchoice_test.go @@ -4,11 +4,11 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestKV_Forkchoice_CanSaveRetrieve(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/seen_bits.go b/beacon-chain/operations/attestations/kv/seen_bits.go index c1c710ae8e..5dfe00cd69 100644 --- a/beacon-chain/operations/attestations/kv/seen_bits.go +++ b/beacon-chain/operations/attestations/kv/seen_bits.go @@ -1,11 +1,11 @@ package kv import ( + "github.com/OffchainLabs/go-bitfield" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation" "github.com/patrickmn/go-cache" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func (c *AttCaches) insertSeenBit(att ethpb.Att) error { diff --git a/beacon-chain/operations/attestations/kv/seen_bits_test.go b/beacon-chain/operations/attestations/kv/seen_bits_test.go index ec8611fdc8..e8a7037307 100644 --- a/beacon-chain/operations/attestations/kv/seen_bits_test.go +++ b/beacon-chain/operations/attestations/kv/seen_bits_test.go @@ -3,11 +3,11 @@ package kv import ( "testing" + "github.com/OffchainLabs/go-bitfield" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestAttCaches_hasSeenBit(t *testing.T) { diff --git a/beacon-chain/operations/attestations/kv/unaggregated_test.go b/beacon-chain/operations/attestations/kv/unaggregated_test.go index 56750dc44c..3d53c392db 100644 --- a/beacon-chain/operations/attestations/kv/unaggregated_test.go +++ b/beacon-chain/operations/attestations/kv/unaggregated_test.go @@ -5,6 +5,7 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" @@ -13,7 +14,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" c "github.com/patrickmn/go-cache" - "github.com/prysmaticlabs/go-bitfield" ) func TestKV_Unaggregated_UnaggregatedAttestations(t *testing.T) { diff --git a/beacon-chain/operations/attestations/prepare_forkchoice.go b/beacon-chain/operations/attestations/prepare_forkchoice.go index bf399546c3..99a9b3f90e 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice.go @@ -5,6 +5,7 @@ import ( "context" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/config/features" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace" @@ -13,7 +14,6 @@ import ( attaggregation "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/attestations" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // This prepares fork choice attestations by running batchForkChoiceAtts diff --git a/beacon-chain/operations/attestations/prepare_forkchoice_test.go b/beacon-chain/operations/attestations/prepare_forkchoice_test.go index 108ebb4db5..598630c428 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice_test.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice_test.go @@ -5,13 +5,13 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" attaggregation "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/attestations" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/operations/attestations/prune_expired_test.go b/beacon-chain/operations/attestations/prune_expired_test.go index 70533fa8ae..d5ef9b0c29 100644 --- a/beacon-chain/operations/attestations/prune_expired_test.go +++ b/beacon-chain/operations/attestations/prune_expired_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/async" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/config/params" @@ -13,7 +14,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestPruneExpired_Ticker(t *testing.T) { diff --git a/beacon-chain/p2p/broadcaster_test.go b/beacon-chain/p2p/broadcaster_test.go index 36696b85e3..9565008318 100644 --- a/beacon-chain/p2p/broadcaster_test.go +++ b/beacon-chain/p2p/broadcaster_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/kzg" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/peerdas" @@ -31,7 +32,6 @@ import ( "github.com/OffchainLabs/prysm/v6/time/slots" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/host" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index a8b0f59d6b..a5f324ad5c 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -9,6 +9,7 @@ import ( "sync" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/cache" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/peerdas" "github.com/OffchainLabs/prysm/v6/cmd/beacon-chain/flags" @@ -24,7 +25,6 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index b5cb188b4f..cd48877690 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -16,6 +16,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/cache" testDB "github.com/OffchainLabs/prysm/v6/beacon-chain/db/testing" @@ -41,7 +42,6 @@ import ( "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/p2p/peers/benchmark_test.go b/beacon-chain/p2p/peers/benchmark_test.go index 2a9d0079ac..e756a65baa 100644 --- a/beacon-chain/p2p/peers/benchmark_test.go +++ b/beacon-chain/p2p/peers/benchmark_test.go @@ -3,7 +3,7 @@ package peers import ( "testing" - "github.com/prysmaticlabs/go-bitfield" + "github.com/OffchainLabs/go-bitfield" ) func Benchmark_retrieveIndicesFromBitfield(b *testing.B) { diff --git a/beacon-chain/p2p/peers/status.go b/beacon-chain/p2p/peers/status.go index 048f8e3251..f533cf31e3 100644 --- a/beacon-chain/p2p/peers/status.go +++ b/beacon-chain/p2p/peers/status.go @@ -30,6 +30,7 @@ import ( "strings" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/peers/peerdata" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/peers/scorers" "github.com/OffchainLabs/prysm/v6/config/features" @@ -47,7 +48,6 @@ import ( ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) const ( diff --git a/beacon-chain/p2p/peers/status_test.go b/beacon-chain/p2p/peers/status_test.go index c57344c041..d5d45cbeef 100644 --- a/beacon-chain/p2p/peers/status_test.go +++ b/beacon-chain/p2p/peers/status_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/peers" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/peers/peerdata" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/peers/scorers" @@ -21,7 +22,6 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/go-bitfield" ) func TestStatus(t *testing.T) { diff --git a/beacon-chain/p2p/subnets.go b/beacon-chain/p2p/subnets.go index 13638dd3bd..0c7d3a1f54 100644 --- a/beacon-chain/p2p/subnets.go +++ b/beacon-chain/p2p/subnets.go @@ -8,6 +8,7 @@ import ( "sync" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/cache" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/peerdas" @@ -24,7 +25,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/holiman/uint256" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/p2p/subnets_test.go b/beacon-chain/p2p/subnets_test.go index ad2855af6b..357784421f 100644 --- a/beacon-chain/p2p/subnets_test.go +++ b/beacon-chain/p2p/subnets_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/cache" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/peerdas" testDB "github.com/OffchainLabs/prysm/v6/beacon-chain/db/testing" @@ -23,7 +24,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/network" - "github.com/prysmaticlabs/go-bitfield" ) func TestStartDiscV5_FindAndDialPeersWithSubnet(t *testing.T) { diff --git a/beacon-chain/p2p/utils.go b/beacon-chain/p2p/utils.go index ffc9852b60..f65b4d5e17 100644 --- a/beacon-chain/p2p/utils.go +++ b/beacon-chain/p2p/utils.go @@ -13,6 +13,7 @@ import ( "path" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/db" "github.com/OffchainLabs/prysm/v6/beacon-chain/db/kv" "github.com/OffchainLabs/prysm/v6/config/params" @@ -28,7 +29,6 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/eth/beacon/handlers_pool_test.go b/beacon-chain/rpc/eth/beacon/handlers_pool_test.go index 4fb0c7d238..855a79b400 100644 --- a/beacon-chain/rpc/eth/beacon/handlers_pool_test.go +++ b/beacon-chain/rpc/eth/beacon/handlers_pool_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api" "github.com/OffchainLabs/prysm/v6/api/server" "github.com/OffchainLabs/prysm/v6/api/server/structs" @@ -42,7 +43,6 @@ import ( "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func TestListAttestations(t *testing.T) { diff --git a/beacon-chain/rpc/eth/beacon/handlers_test.go b/beacon-chain/rpc/eth/beacon/handlers_test.go index d39830dec9..86e24e33b4 100644 --- a/beacon-chain/rpc/eth/beacon/handlers_test.go +++ b/beacon-chain/rpc/eth/beacon/handlers_test.go @@ -12,6 +12,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api" "github.com/OffchainLabs/prysm/v6/api/server/structs" "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/kzg" @@ -44,7 +45,6 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/mock" "go.uber.org/mock/gomock" diff --git a/beacon-chain/rpc/eth/node/handlers_test.go b/beacon-chain/rpc/eth/node/handlers_test.go index 483b2908e9..b9cf95b11d 100644 --- a/beacon-chain/rpc/eth/node/handlers_test.go +++ b/beacon-chain/rpc/eth/node/handlers_test.go @@ -9,6 +9,7 @@ import ( "runtime" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api/server/structs" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p" @@ -28,7 +29,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/enr" "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/prysmaticlabs/go-bitfield" ) type dummyIdentity enode.ID diff --git a/beacon-chain/rpc/eth/rewards/handlers_test.go b/beacon-chain/rpc/eth/rewards/handlers_test.go index b3d5f2c9ae..4e596804a8 100644 --- a/beacon-chain/rpc/eth/rewards/handlers_test.go +++ b/beacon-chain/rpc/eth/rewards/handlers_test.go @@ -10,6 +10,7 @@ import ( "strings" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api/server/structs" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" @@ -34,7 +35,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func BlockRewardTestSetup(t *testing.T, ver int) (state.BeaconState, interfaces.SignedBeaconBlock, error) { diff --git a/beacon-chain/rpc/eth/validator/handlers_test.go b/beacon-chain/rpc/eth/validator/handlers_test.go index d0f0d90747..88661139c0 100644 --- a/beacon-chain/rpc/eth/validator/handlers_test.go +++ b/beacon-chain/rpc/eth/validator/handlers_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api" "github.com/OffchainLabs/prysm/v6/api/server/structs" mockChain "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" @@ -43,7 +44,6 @@ import ( "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/rpc/prysm/beacon/handlers_test.go b/beacon-chain/rpc/prysm/beacon/handlers_test.go index 6c10f02258..2b40edba71 100644 --- a/beacon-chain/rpc/prysm/beacon/handlers_test.go +++ b/beacon-chain/rpc/prysm/beacon/handlers_test.go @@ -10,6 +10,7 @@ import ( "net/http/httptest" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api/server/structs" chainMock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" @@ -33,7 +34,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/go-bitfield" ) func individualVotesHelper(t *testing.T, request *structs.GetIndividualVotesRequest, s *Server) (string, *structs.GetIndividualVotesResponse) { diff --git a/beacon-chain/rpc/prysm/beacon/ssz_query_test.go b/beacon-chain/rpc/prysm/beacon/ssz_query_test.go index 15fdc7fe3b..099faef713 100644 --- a/beacon-chain/rpc/prysm/beacon/ssz_query_test.go +++ b/beacon-chain/rpc/prysm/beacon/ssz_query_test.go @@ -10,6 +10,7 @@ import ( "strings" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api" "github.com/OffchainLabs/prysm/v6/api/server/structs" chainMock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" @@ -24,7 +25,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/go-bitfield" ) func TestQueryBeaconState(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go index bb8df746d8..16d5ed9392 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" chainMock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" dbTest "github.com/OffchainLabs/prysm/v6/beacon-chain/db/testing" @@ -27,7 +28,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go index eaf217b013..b3f1370785 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/epoch/precompute" @@ -37,7 +38,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" prysmTime "github.com/OffchainLabs/prysm/v6/time" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go b/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go index a4e4af1a2b..1613732094 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/block_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" dbTest "github.com/OffchainLabs/prysm/v6/beacon-chain/db/testing" @@ -15,7 +16,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestServer_GetBlock(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go index 6bb62c397e..9fe8fa4713 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -25,7 +26,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestSubmitAggregateAndProof_Syncing(t *testing.T) { diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go index 74de8a4030..5a7ae057ac 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go @@ -4,6 +4,7 @@ import ( "bytes" "context" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" "github.com/OffchainLabs/prysm/v6/config/params" @@ -18,7 +19,6 @@ import ( "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func (vs *Server) setSyncAggregate(ctx context.Context, blk interfaces.SignedBeaconBlock, headState state.BeaconState) { 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 440d29826e..04f086079a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go @@ -3,6 +3,7 @@ package validator import ( "testing" + "github.com/OffchainLabs/go-bitfield" chainmock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/operations/synccommittee" @@ -16,7 +17,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestProposer_GetSyncAggregate_OK(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 642e3b81e9..2e84393854 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations.go @@ -8,6 +8,7 @@ import ( "slices" "sort" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/electra" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" @@ -23,7 +24,6 @@ import ( "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra.go index c6547ecddb..7ca2a62f5c 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra.go @@ -4,10 +4,10 @@ import ( "cmp" "slices" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/go-bitfield" ) // computeOnChainAggregate constructs a final aggregate form a list of network aggregates with equal attestation data. diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra_test.go index 3f86c54098..ddda9b4f19 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_electra_test.go @@ -4,6 +4,7 @@ import ( "reflect" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls/blst" @@ -11,7 +12,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func Test_computeOnChainAggregate(t *testing.T) { 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 d6269acf06..93056e4bea 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_attestations_test.go @@ -7,6 +7,7 @@ import ( "strconv" "testing" + "github.com/OffchainLabs/go-bitfield" chainMock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/electra" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" @@ -21,7 +22,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" ) func TestProposer_ProposerAtts_committeeAwareSort(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 f3773085d8..447d30fa02 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" builderapi "github.com/OffchainLabs/prysm/v6/api/client/builder" "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/kzg" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" @@ -52,7 +53,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" 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 3f6b2c352f..9eb09e077f 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 @@ -4,11 +4,11 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/config/params" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" aggtesting "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/testing" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func BenchmarkProposerAtts_sortByProfitability(b *testing.B) { diff --git a/beacon-chain/rpc/prysm/validator/handlers_test.go b/beacon-chain/rpc/prysm/validator/handlers_test.go index dcc4f8ef13..d38ac2ee1f 100644 --- a/beacon-chain/rpc/prysm/validator/handlers_test.go +++ b/beacon-chain/rpc/prysm/validator/handlers_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api/server/structs" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" @@ -37,7 +38,6 @@ import ( prysmTime "github.com/OffchainLabs/prysm/v6/time" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/go-bitfield" ) func addDefaultReplayerBuilder(s *Server, h stategen.HistoryAccessor) { diff --git a/beacon-chain/rpc/prysm/validator/validator_performance_test.go b/beacon-chain/rpc/prysm/validator/validator_performance_test.go index 0420132692..e85668f04b 100644 --- a/beacon-chain/rpc/prysm/validator/validator_performance_test.go +++ b/beacon-chain/rpc/prysm/validator/validator_performance_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/api/server/structs" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/epoch/precompute" @@ -23,7 +24,6 @@ import ( "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestServer_GetValidatorPerformance(t *testing.T) { diff --git a/beacon-chain/state/interfaces.go b/beacon-chain/state/interfaces.go index 54f1aceae6..38b1421e95 100644 --- a/beacon-chain/state/interfaces.go +++ b/beacon-chain/state/interfaces.go @@ -8,6 +8,7 @@ import ( "encoding/json" "time" + "github.com/OffchainLabs/go-bitfield" customtypes "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native/custom-types" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/consensus-types/interfaces" @@ -15,7 +16,6 @@ import ( "github.com/OffchainLabs/prysm/v6/crypto/bls" enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/go-bitfield" ) // BeaconState has read and write access to beacon state methods. diff --git a/beacon-chain/state/state-native/beacon_state.go b/beacon-chain/state/state-native/beacon_state.go index 8dd7285e47..e44579978d 100644 --- a/beacon-chain/state/state-native/beacon_state.go +++ b/beacon-chain/state/state-native/beacon_state.go @@ -4,6 +4,7 @@ import ( "encoding/json" "sync" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/state/fieldtrie" customtypes "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native/custom-types" "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native/types" @@ -11,7 +12,6 @@ import ( "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/go-bitfield" ) // BeaconState defines a struct containing utilities for the Ethereum Beacon Chain state, defining diff --git a/beacon-chain/state/state-native/getters_checkpoint.go b/beacon-chain/state/state-native/getters_checkpoint.go index 103057067e..76b760e170 100644 --- a/beacon-chain/state/state-native/getters_checkpoint.go +++ b/beacon-chain/state/state-native/getters_checkpoint.go @@ -3,9 +3,9 @@ package state_native import ( "bytes" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/go-bitfield" ) // 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 79d1b5fcfc..852d48cf71 100644 --- a/beacon-chain/state/state-native/getters_checkpoint_test.go +++ b/beacon-chain/state/state-native/getters_checkpoint_test.go @@ -3,10 +3,10 @@ package state_native import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" testtmpl "github.com/OffchainLabs/prysm/v6/beacon-chain/state/testing" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/go-bitfield" ) func TestBeaconState_PreviousJustifiedCheckpointNil_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/hasher_test.go b/beacon-chain/state/state-native/hasher_test.go index e73f4fbaf6..2b7407d8e9 100644 --- a/beacon-chain/state/state-native/hasher_test.go +++ b/beacon-chain/state/state-native/hasher_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" statenative "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/blocks" @@ -13,7 +14,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestComputeFieldRootsWithHasher_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/references_test.go b/beacon-chain/state/state-native/references_test.go index 67b9b406c3..04d44c74c9 100644 --- a/beacon-chain/state/state-native/references_test.go +++ b/beacon-chain/state/state-native/references_test.go @@ -6,13 +6,13 @@ import ( "runtime/debug" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native/types" "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestStateReferenceSharing_Finalizer_Phase0(t *testing.T) { diff --git a/beacon-chain/state/state-native/setters_checkpoint.go b/beacon-chain/state/state-native/setters_checkpoint.go index 16f20d58f5..f405f3a66d 100644 --- a/beacon-chain/state/state-native/setters_checkpoint.go +++ b/beacon-chain/state/state-native/setters_checkpoint.go @@ -1,9 +1,9 @@ package state_native import ( + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native/types" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/go-bitfield" ) // SetJustificationBits for the beacon state. diff --git a/beacon-chain/state/state-native/state_test.go b/beacon-chain/state/state-native/state_test.go index 57f04eef63..980db230b1 100644 --- a/beacon-chain/state/state-native/state_test.go +++ b/beacon-chain/state/state-native/state_test.go @@ -6,6 +6,7 @@ import ( "sync" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native/types" "github.com/OffchainLabs/prysm/v6/beacon-chain/state/stateutil" @@ -16,7 +17,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestBeaconState_NoDeadlock_Phase0(t *testing.T) { diff --git a/beacon-chain/state/testing/getters_checkpoint.go b/beacon-chain/state/testing/getters_checkpoint.go index c295b50ef8..a458ae1804 100644 --- a/beacon-chain/state/testing/getters_checkpoint.go +++ b/beacon-chain/state/testing/getters_checkpoint.go @@ -3,12 +3,12 @@ package testing import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func VerifyBeaconStateJustificationBitsNil(t *testing.T, factory getState) { diff --git a/beacon-chain/sync/pending_attestations_queue_test.go b/beacon-chain/sync/pending_attestations_queue_test.go index 146f75ac18..fbe2113ef8 100644 --- a/beacon-chain/sync/pending_attestations_queue_test.go +++ b/beacon-chain/sync/pending_attestations_queue_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/async/abool" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/feed" @@ -36,7 +37,6 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/libp2p/go-libp2p/core/network" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/sync/rpc_metadata.go b/beacon-chain/sync/rpc_metadata.go index 17111b7e6a..5fe051741a 100644 --- a/beacon-chain/sync/rpc_metadata.go +++ b/beacon-chain/sync/rpc_metadata.go @@ -3,6 +3,7 @@ package sync import ( "context" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/types" "github.com/OffchainLabs/prysm/v6/config/params" @@ -14,7 +15,6 @@ import ( libp2pcore "github.com/libp2p/go-libp2p/core" "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // 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 e0288b9111..cba6f95f97 100644 --- a/beacon-chain/sync/rpc_metadata_test.go +++ b/beacon-chain/sync/rpc_metadata_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" db "github.com/OffchainLabs/prysm/v6/beacon-chain/db/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p" @@ -24,7 +25,6 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic" - "github.com/prysmaticlabs/go-bitfield" ) func TestMetaDataRPCHandler_ReceivesMetadata(t *testing.T) { diff --git a/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go b/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go index 8e1f9199dc..f4767a416e 100644 --- a/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go +++ b/beacon-chain/sync/subscriber_beacon_aggregate_proof_test.go @@ -3,6 +3,7 @@ package sync import ( "testing" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/operations/attestations" lruwrpr "github.com/OffchainLabs/prysm/v6/cache/lru" @@ -11,7 +12,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" ) func TestBeaconAggregateProofSubscriber_CanSaveAggregatedAttestation(t *testing.T) { diff --git a/beacon-chain/sync/subscriber_beacon_blocks_test.go b/beacon-chain/sync/subscriber_beacon_blocks_test.go index 4652542baf..ac0bc8ea76 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks_test.go +++ b/beacon-chain/sync/subscriber_beacon_blocks_test.go @@ -3,6 +3,7 @@ package sync import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain" "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/kzg" chainMock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" @@ -23,7 +24,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" ) diff --git a/beacon-chain/sync/validate_aggregate_proof_test.go b/beacon-chain/sync/validate_aggregate_proof_test.go index 035f1d81e2..1244ed4888 100644 --- a/beacon-chain/sync/validate_aggregate_proof_test.go +++ b/beacon-chain/sync/validate_aggregate_proof_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -29,7 +30,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - "github.com/prysmaticlabs/go-bitfield" ) func TestVerifyIndexInCommittee_CanVerify(t *testing.T) { diff --git a/beacon-chain/sync/validate_beacon_attestation_test.go b/beacon-chain/sync/validate_beacon_attestation_test.go index 991010dfe1..dc47650c03 100644 --- a/beacon-chain/sync/validate_beacon_attestation_test.go +++ b/beacon-chain/sync/validate_beacon_attestation_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mockChain "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" @@ -25,7 +26,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - "github.com/prysmaticlabs/go-bitfield" ) func TestService_validateCommitteeIndexBeaconAttestation(t *testing.T) { diff --git a/beacon-chain/sync/validate_proposer_slashing_test.go b/beacon-chain/sync/validate_proposer_slashing_test.go index 7ca4ea5725..2e6a76b609 100644 --- a/beacon-chain/sync/validate_proposer_slashing_test.go +++ b/beacon-chain/sync/validate_proposer_slashing_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" coreTime "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" @@ -26,7 +27,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/require" pubsub "github.com/libp2p/go-libp2p-pubsub" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" - "github.com/prysmaticlabs/go-bitfield" ) func setupValidProposerSlashing(t *testing.T) (*ethpb.ProposerSlashing, state.BeaconState) { diff --git a/beacon-chain/sync/validate_sync_contribution_proof_test.go b/beacon-chain/sync/validate_sync_contribution_proof_test.go index 7b99ad7a6f..1fd598e062 100644 --- a/beacon-chain/sync/validate_sync_contribution_proof_test.go +++ b/beacon-chain/sync/validate_sync_contribution_proof_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" mockChain "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/feed" @@ -38,7 +39,6 @@ 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/go-bitfield" ) func TestService_ValidateSyncContributionAndProof(t *testing.T) { diff --git a/changelog/ttsao-go_bitfield.md b/changelog/ttsao-go_bitfield.md new file mode 100644 index 0000000000..391e6a4b77 --- /dev/null +++ b/changelog/ttsao-go_bitfield.md @@ -0,0 +1,3 @@ +### Changed + +- Updated go bitfield from prysmaticlabs to offchainlabs diff --git a/cmd/prysmctl/p2p/client.go b/cmd/prysmctl/p2p/client.go index 23ba11242e..5a660d9132 100644 --- a/cmd/prysmctl/p2p/client.go +++ b/cmd/prysmctl/p2p/client.go @@ -7,6 +7,7 @@ import ( "net" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p" "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/encoder" "github.com/OffchainLabs/prysm/v6/config/params" @@ -31,7 +32,6 @@ import ( libp2ptcp "github.com/libp2p/go-libp2p/p2p/transport/tcp" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/consensus-types/blocks/proto_test.go b/consensus-types/blocks/proto_test.go index af513ee979..1f64ec639b 100644 --- a/consensus-types/blocks/proto_test.go +++ b/consensus-types/blocks/proto_test.go @@ -3,6 +3,7 @@ package blocks import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" @@ -11,7 +12,6 @@ import ( "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) type fields struct { diff --git a/consensus-types/hdiff/state_diff.go b/consensus-types/hdiff/state_diff.go index 608b37e115..eb009808a3 100644 --- a/consensus-types/hdiff/state_diff.go +++ b/consensus-types/hdiff/state_diff.go @@ -6,6 +6,7 @@ import ( "encoding/binary" "slices" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/capella" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/deneb" @@ -24,7 +25,6 @@ import ( "github.com/golang/snappy" "github.com/pkg/errors" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) diff --git a/consensus-types/primitives/committee_bits_mainnet.go b/consensus-types/primitives/committee_bits_mainnet.go index b815dd12c3..d507d7fd79 100644 --- a/consensus-types/primitives/committee_bits_mainnet.go +++ b/consensus-types/primitives/committee_bits_mainnet.go @@ -2,7 +2,7 @@ package primitives -import "github.com/prysmaticlabs/go-bitfield" +import "github.com/OffchainLabs/go-bitfield" func NewAttestationCommitteeBits() bitfield.Bitvector64 { return bitfield.NewBitvector64() diff --git a/consensus-types/primitives/committee_bits_minimal.go b/consensus-types/primitives/committee_bits_minimal.go index caec3090a8..d9ad25eca1 100644 --- a/consensus-types/primitives/committee_bits_minimal.go +++ b/consensus-types/primitives/committee_bits_minimal.go @@ -2,7 +2,7 @@ package primitives -import "github.com/prysmaticlabs/go-bitfield" +import "github.com/OffchainLabs/go-bitfield" func NewAttestationCommitteeBits() bitfield.Bitvector4 { return bitfield.NewBitvector4() diff --git a/consensus-types/wrapper/metadata.go b/consensus-types/wrapper/metadata.go index e0728f5bb8..1fb14668ab 100644 --- a/consensus-types/wrapper/metadata.go +++ b/consensus-types/wrapper/metadata.go @@ -1,10 +1,10 @@ package wrapper import ( + "github.com/OffchainLabs/go-bitfield" pb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/metadata" "github.com/OffchainLabs/prysm/v6/runtime/version" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" ) diff --git a/deps.bzl b/deps.bzl index fda38f0761..fe710020b4 100644 --- a/deps.bzl +++ b/deps.bzl @@ -2877,9 +2877,9 @@ def prysm_deps(): ) go_repository( name = "com_github_prysmaticlabs_go_bitfield", - importpath = "github.com/prysmaticlabs/go-bitfield", - sum = "h1:ATgOe+abbzfx9kCPeXIW4fiWyDdxlwHw07j8UGhdTd4=", - version = "v0.0.0-20240328144219-a1caa50c3a1e", + importpath = "github.com/OffchainLabs/go-bitfield", + sum = "h1:d/SJkN8/9Ca+1YmuDiUJxAiV4w/a9S8NcsG7GMQSrVI=", + version = "v0.0.0-20251031151322-f427d04d8506", ) go_repository( name = "com_github_prysmaticlabs_gohashtree", diff --git a/encoding/ssz/helpers.go b/encoding/ssz/helpers.go index fa46ec927c..f2c6d4ca4e 100644 --- a/encoding/ssz/helpers.go +++ b/encoding/ssz/helpers.go @@ -5,10 +5,10 @@ import ( "bytes" "encoding/binary" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" "github.com/minio/sha256-simd" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) const ( diff --git a/encoding/ssz/helpers_test.go b/encoding/ssz/helpers_test.go index 651d9077e3..db66f467ff 100644 --- a/encoding/ssz/helpers_test.go +++ b/encoding/ssz/helpers_test.go @@ -3,10 +3,10 @@ package ssz_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/encoding/ssz" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) const merkleizingListLimitError = "merkleizing list that is too large, over limit" diff --git a/encoding/ssz/merkleize_test.go b/encoding/ssz/merkleize_test.go index f0ff1b29d8..c908b644c7 100644 --- a/encoding/ssz/merkleize_test.go +++ b/encoding/ssz/merkleize_test.go @@ -3,12 +3,12 @@ package ssz_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/crypto/hash" "github.com/OffchainLabs/prysm/v6/encoding/ssz" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestGetDepth(t *testing.T) { diff --git a/encoding/ssz/query/bitlist.go b/encoding/ssz/query/bitlist.go index 91e39690c9..b96321d841 100644 --- a/encoding/ssz/query/bitlist.go +++ b/encoding/ssz/query/bitlist.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/prysmaticlabs/go-bitfield" + "github.com/OffchainLabs/go-bitfield" ) // bitlistInfo holds information about a SSZ Bitlist type. diff --git a/encoding/ssz/query/query_test.go b/encoding/ssz/query/query_test.go index 3935bd9ea0..3c8de53cc1 100644 --- a/encoding/ssz/query/query_test.go +++ b/encoding/ssz/query/query_test.go @@ -4,11 +4,11 @@ import ( "math" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/encoding/ssz/query" "github.com/OffchainLabs/prysm/v6/encoding/ssz/query/testutil" sszquerypb "github.com/OffchainLabs/prysm/v6/proto/ssz_query/testing" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestSize(t *testing.T) { diff --git a/encoding/ssz/query/tag_parser.go b/encoding/ssz/query/tag_parser.go index 0dd9e26735..e60733676d 100644 --- a/encoding/ssz/query/tag_parser.go +++ b/encoding/ssz/query/tag_parser.go @@ -17,7 +17,7 @@ const ( sszSizeTag = "ssz-size" // castTypeTag specifies special custom casting instructions. - // e.g., "github.com/prysmaticlabs/go-bitfield.Bitlist". + // e.g., "github.com/OffchainLabs/go-bitfield.Bitlist". castTypeTag = "cast-type" ) diff --git a/encoding/ssz/query/testutil/util.go b/encoding/ssz/query/testutil/util.go index f9ec4bd34f..c85058a314 100644 --- a/encoding/ssz/query/testutil/util.go +++ b/encoding/ssz/query/testutil/util.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" + "github.com/OffchainLabs/go-bitfield" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/go-bitfield" ) // marshalAny marshals any value into SSZ format. diff --git a/go.mod b/go.mod index 8bb6cdf86a..36f4d14f33 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.25.1 require ( github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d github.com/MariusVanDerWijden/tx-fuzz v1.4.0 + github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 github.com/aristanetworks/goarista v0.0.0-20200805130819-fd197cf57d96 github.com/bazelbuild/rules_go v0.23.2 github.com/btcsuite/btcd/btcec/v2 v2.3.4 @@ -60,7 +61,6 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/prom2json v1.3.0 github.com/prysmaticlabs/fastssz v0.0.0-20241008181541-518c4ce73516 - github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294 github.com/r3labs/sse/v2 v2.10.0 diff --git a/go.sum b/go.sum index ed1ef641d7..b8dda499b2 100644 --- a/go.sum +++ b/go.sum @@ -57,6 +57,8 @@ github.com/MariusVanDerWijden/tx-fuzz v1.4.0 h1:Tq4lXivsR8mtoP4RpasUDIUpDLHfN1Yh github.com/MariusVanDerWijden/tx-fuzz v1.4.0/go.mod h1:gmOVECg7o5FY5VU3DQ/fY0zTk/ExBdMkUGz0vA8qqms= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 h1:d/SJkN8/9Ca+1YmuDiUJxAiV4w/a9S8NcsG7GMQSrVI= +github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506/go.mod h1:6TZI4FU6zT8x6ZfWa1J8YQ2NgW0wLV/W3fHRca8ISBo= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.26.1/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= @@ -906,8 +908,6 @@ github.com/prometheus/prom2json v1.3.0/go.mod h1:rMN7m0ApCowcoDlypBHlkNbp5eJQf/+ github.com/prysmaticlabs/fastssz v0.0.0-20241008181541-518c4ce73516 h1:xuVAdtz5ShYblG2sPyb4gw01DF8InbOI/kBCQjk7NiM= github.com/prysmaticlabs/fastssz v0.0.0-20241008181541-518c4ce73516/go.mod h1:h2OlIZD/M6wFvV3YMZbW16lFgh3Rsye00G44J2cwLyU= github.com/prysmaticlabs/go-bitfield v0.0.0-20210108222456-8e92c3709aa0/go.mod h1:hCwmef+4qXWjv0jLDbQdWnL0Ol7cS7/lCSS26WR+u6s= -github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e h1:ATgOe+abbzfx9kCPeXIW4fiWyDdxlwHw07j8UGhdTd4= -github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e/go.mod h1:wmuf/mdK4VMD+jA9ThwcUKjg3a2XWM9cVfFYjDyY4j4= github.com/prysmaticlabs/gohashtree v0.0.5-beta h1:ct41mg7HyIZd7uoSM/ud23f+3DxQG9tlMlQG+BVX23c= github.com/prysmaticlabs/gohashtree v0.0.5-beta/go.mod h1:HRuvtXLZ4WkaB1MItToVH2e8ZwKwZPY5/Rcby+CvvLY= github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c h1:9PHRCuO/VN0s9k+RmLykho7AjDxblNYI5bYKed16NPU= diff --git a/proto/eth/v1/attestation.pb.go b/proto/eth/v1/attestation.pb.go index 1945918134..598cb7d6e0 100755 --- a/proto/eth/v1/attestation.pb.go +++ b/proto/eth/v1/attestation.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" _ "google.golang.org/protobuf/types/descriptorpb" @@ -27,7 +27,7 @@ const ( type Attestation struct { state protoimpl.MessageState `protogen:"open.v1"` - 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"` + 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/OffchainLabs/go-bitfield.Bitlist" ssz-max:"2048"` Data *AttestationData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty" ssz-size:"96"` unknownFields protoimpl.UnknownFields diff --git a/proto/eth/v1/attestation.proto b/proto/eth/v1/attestation.proto index e844b839c7..f86a0fb14c 100644 --- a/proto/eth/v1/attestation.proto +++ b/proto/eth/v1/attestation.proto @@ -31,7 +31,7 @@ message Attestation { bytes aggregation_bits = 1 [ (ethereum.eth.ext.ssz_max) = "2048", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitlist" + "github.com/OffchainLabs/go-bitfield.Bitlist" ]; AttestationData data = 2; diff --git a/proto/eth/v1/beacon_block.pb.go b/proto/eth/v1/beacon_block.pb.go index 962741fd1f..35aaa2e3db 100755 --- a/proto/eth/v1/beacon_block.pb.go +++ b/proto/eth/v1/beacon_block.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" _ "google.golang.org/protobuf/types/descriptorpb" @@ -763,7 +763,7 @@ func (x *IndexedAttestation) GetSignature() []byte { type SyncAggregate struct { state protoimpl.MessageState `protogen:"open.v1"` - SyncCommitteeBits github_com_prysmaticlabs_go_bitfield.Bitvector512 `protobuf:"bytes,1,opt,name=sync_committee_bits,json=syncCommitteeBits,proto3" json:"sync_committee_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector512" ssz-size:"64"` + SyncCommitteeBits github_com_prysmaticlabs_go_bitfield.Bitvector512 `protobuf:"bytes,1,opt,name=sync_committee_bits,json=syncCommitteeBits,proto3" json:"sync_committee_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector512" ssz-size:"64"` SyncCommitteeSignature []byte `protobuf:"bytes,2,opt,name=sync_committee_signature,json=syncCommitteeSignature,proto3" json:"sync_committee_signature,omitempty" ssz-size:"96"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache diff --git a/proto/prysm/v1alpha1/attestation.go b/proto/prysm/v1alpha1/attestation.go index 5c76c74683..8c185940b0 100644 --- a/proto/prysm/v1alpha1/attestation.go +++ b/proto/prysm/v1alpha1/attestation.go @@ -1,11 +1,11 @@ package eth import ( + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" "github.com/OffchainLabs/prysm/v6/runtime/version" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/proto" ) diff --git a/proto/prysm/v1alpha1/attestation.pb.go b/proto/prysm/v1alpha1/attestation.pb.go index 6868bd4ed5..e05f9187a2 100755 --- a/proto/prysm/v1alpha1/attestation.pb.go +++ b/proto/prysm/v1alpha1/attestation.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -138,7 +138,7 @@ func (x *AggregateAttestationAndProof) GetSelectionProof() []byte { type Attestation struct { state protoimpl.MessageState `protogen:"open.v1"` - 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"` + 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/OffchainLabs/go-bitfield.Bitlist" ssz-max:"2048"` Data *AttestationData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty" ssz-size:"96"` unknownFields protoimpl.UnknownFields @@ -438,10 +438,10 @@ func (x *AggregateAttestationAndProofElectra) GetSelectionProof() []byte { type AttestationElectra struct { state protoimpl.MessageState `protogen:"open.v1"` - 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:"131072"` + 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/OffchainLabs/go-bitfield.Bitlist" ssz-max:"131072"` Data *AttestationData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty" ssz-size:"96"` - CommitteeBits github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,4,opt,name=committee_bits,json=committeeBits,proto3" json:"committee_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector64" ssz-size:"8"` + CommitteeBits github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,4,opt,name=committee_bits,json=committeeBits,proto3" json:"committee_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector64" ssz-size:"8"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } diff --git a/proto/prysm/v1alpha1/attestation.proto b/proto/prysm/v1alpha1/attestation.proto index 93f7ee4ea4..b3069fd6cf 100644 --- a/proto/prysm/v1alpha1/attestation.proto +++ b/proto/prysm/v1alpha1/attestation.proto @@ -57,7 +57,7 @@ message Attestation { bytes aggregation_bits = 1 [ (ethereum.eth.ext.ssz_max) = "2048", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitlist" + "github.com/OffchainLabs/go-bitfield.Bitlist" ]; AttestationData data = 2; @@ -139,7 +139,7 @@ message AttestationElectra { bytes aggregation_bits = 1 [ (ethereum.eth.ext.ssz_max) = "max_attesting_indices.size", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitlist" + "github.com/OffchainLabs/go-bitfield.Bitlist" ]; AttestationData data = 2; diff --git a/proto/prysm/v1alpha1/attestation/aggregation/aggregation.go b/proto/prysm/v1alpha1/attestation/aggregation/aggregation.go index 16e97170bb..ad161f2e8d 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/aggregation.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/aggregation.go @@ -4,7 +4,7 @@ package aggregation import ( "errors" - "github.com/prysmaticlabs/go-bitfield" + "github.com/OffchainLabs/go-bitfield" "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 910cf72039..0d2cd0e85a 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/attestations_test.go @@ -6,6 +6,7 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/encoding/ssz/equality" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" @@ -14,7 +15,6 @@ import ( aggtesting "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/testing" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" "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 698d03b68a..0b91af8c59 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover.go @@ -3,12 +3,12 @@ package attestations import ( "sort" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation" "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // 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 cc03137b9f..a7d03a8b7a 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/attestations/maxcover_test.go @@ -3,12 +3,12 @@ package attestations_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/attestations" "github.com/OffchainLabs/prysm/v6/testing/assert" - "github.com/prysmaticlabs/go-bitfield" ) func TestAggregateAttestations_MaxCover_NewMaxCover(t *testing.T) { diff --git a/proto/prysm/v1alpha1/attestation/aggregation/maxcover.go b/proto/prysm/v1alpha1/attestation/aggregation/maxcover.go index e4d7dd6893..1bf68af446 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/maxcover.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/maxcover.go @@ -3,8 +3,8 @@ package aggregation import ( "sort" + "github.com/OffchainLabs/go-bitfield" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // ErrInvalidMaxCoverProblem is returned when Maximum Coverage problem was initialized incorrectly. diff --git a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go index 250551cff0..61dea9be3e 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_bench_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation" aggtesting "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/testing" - "github.com/prysmaticlabs/go-bitfield" ) 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 120c968379..7c385062b2 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/maxcover_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/maxcover_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" aggtesting "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/testing" "github.com/OffchainLabs/prysm/v6/testing/assert" - "github.com/prysmaticlabs/go-bitfield" ) func TestMaxCover_MaxCoverCandidates_filter(t *testing.T) { 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 ad5c9f4da3..5c9c91af54 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive_test.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/sync_contribution/naive_test.go @@ -5,13 +5,13 @@ import ( "sort" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation" aggtesting "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation/aggregation/testing" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestAggregateAttestations_aggregate(t *testing.T) { diff --git a/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go b/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go index 2c2ede37c4..6593084efc 100644 --- a/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go +++ b/proto/prysm/v1alpha1/attestation/aggregation/testing/bitlistutils.go @@ -4,11 +4,11 @@ import ( "math/rand" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/time" - "github.com/prysmaticlabs/go-bitfield" ) // 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 94c93d9fae..19525cef86 100644 --- a/proto/prysm/v1alpha1/attestation/attestation_utils.go +++ b/proto/prysm/v1alpha1/attestation/attestation_utils.go @@ -10,6 +10,7 @@ import ( "slices" "sort" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls" @@ -17,7 +18,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // ConvertToIndexed converts attestation to (almost) indexed-verifiable form. diff --git a/proto/prysm/v1alpha1/attestation/attestation_utils_test.go b/proto/prysm/v1alpha1/attestation/attestation_utils_test.go index 44a19d3d21..d4b33bdb8a 100644 --- a/proto/prysm/v1alpha1/attestation/attestation_utils_test.go +++ b/proto/prysm/v1alpha1/attestation/attestation_utils_test.go @@ -3,6 +3,7 @@ package attestation_test import ( "testing" + "github.com/OffchainLabs/go-bitfield" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" @@ -10,7 +11,6 @@ import ( "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation" "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" - "github.com/prysmaticlabs/go-bitfield" ) func TestAttestingIndices(t *testing.T) { diff --git a/proto/prysm/v1alpha1/beacon_core_types.pb.go b/proto/prysm/v1alpha1/beacon_core_types.pb.go index 405fac3219..28077d3fb6 100755 --- a/proto/prysm/v1alpha1/beacon_core_types.pb.go +++ b/proto/prysm/v1alpha1/beacon_core_types.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -534,7 +534,7 @@ func (x *IndexedAttestationElectra) GetSignature() []byte { type SyncAggregate struct { state protoimpl.MessageState `protogen:"open.v1"` - SyncCommitteeBits github_com_prysmaticlabs_go_bitfield.Bitvector512 `protobuf:"bytes,1,opt,name=sync_committee_bits,json=syncCommitteeBits,proto3" json:"sync_committee_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector512" ssz-size:"64"` + SyncCommitteeBits github_com_prysmaticlabs_go_bitfield.Bitvector512 `protobuf:"bytes,1,opt,name=sync_committee_bits,json=syncCommitteeBits,proto3" json:"sync_committee_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector512" ssz-size:"64"` SyncCommitteeSignature []byte `protobuf:"bytes,2,opt,name=sync_committee_signature,json=syncCommitteeSignature,proto3" json:"sync_committee_signature,omitempty" ssz-size:"96"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache diff --git a/proto/prysm/v1alpha1/beacon_state.pb.go b/proto/prysm/v1alpha1/beacon_state.pb.go index ceeaaa2a4e..7fbe790984 100755 --- a/proto/prysm/v1alpha1/beacon_state.pb.go +++ b/proto/prysm/v1alpha1/beacon_state.pb.go @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" v1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -44,7 +44,7 @@ type BeaconState struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochAttestations []*PendingAttestation `protobuf:"bytes,7001,rep,name=previous_epoch_attestations,json=previousEpochAttestations,proto3" json:"previous_epoch_attestations,omitempty" ssz-max:"4096"` CurrentEpochAttestations []*PendingAttestation `protobuf:"bytes,7002,rep,name=current_epoch_attestations,json=currentEpochAttestations,proto3" json:"current_epoch_attestations,omitempty" ssz-max:"4096"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` @@ -231,7 +231,7 @@ func (x *BeaconState) GetFinalizedCheckpoint() *Checkpoint { type PendingAttestation struct { state protoimpl.MessageState `protogen:"open.v1"` - 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"` + 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/OffchainLabs/go-bitfield.Bitlist" ssz-max:"2048"` Data *AttestationData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` InclusionDelay github_com_OffchainLabs_prysm_v6_consensus_types_primitives.Slot `protobuf:"varint,3,opt,name=inclusion_delay,json=inclusionDelay,proto3" json:"inclusion_delay,omitempty" cast-type:"github.com/OffchainLabs/prysm/v6/consensus-types/primitives.Slot"` ProposerIndex github_com_OffchainLabs_prysm_v6_consensus_types_primitives.ValidatorIndex `protobuf:"varint,4,opt,name=proposer_index,json=proposerIndex,proto3" json:"proposer_index,omitempty" cast-type:"github.com/OffchainLabs/prysm/v6/consensus-types/primitives.ValidatorIndex"` @@ -720,7 +720,7 @@ type BeaconStateAltair struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochParticipation []byte `protobuf:"bytes,7001,opt,name=previous_epoch_participation,json=previousEpochParticipation,proto3" json:"previous_epoch_participation,omitempty" ssz-max:"1099511627776"` CurrentEpochParticipation []byte `protobuf:"bytes,7002,opt,name=current_epoch_participation,json=currentEpochParticipation,proto3" json:"current_epoch_participation,omitempty" ssz-max:"1099511627776"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` @@ -1000,7 +1000,7 @@ type BeaconStateBellatrix struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochParticipation []byte `protobuf:"bytes,7001,opt,name=previous_epoch_participation,json=previousEpochParticipation,proto3" json:"previous_epoch_participation,omitempty" ssz-max:"1099511627776"` CurrentEpochParticipation []byte `protobuf:"bytes,7002,opt,name=current_epoch_participation,json=currentEpochParticipation,proto3" json:"current_epoch_participation,omitempty" ssz-max:"1099511627776"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` @@ -1236,7 +1236,7 @@ type BeaconStateCapella struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochParticipation []byte `protobuf:"bytes,7001,opt,name=previous_epoch_participation,json=previousEpochParticipation,proto3" json:"previous_epoch_participation,omitempty" ssz-max:"1099511627776"` CurrentEpochParticipation []byte `protobuf:"bytes,7002,opt,name=current_epoch_participation,json=currentEpochParticipation,proto3" json:"current_epoch_participation,omitempty" ssz-max:"1099511627776"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` @@ -1496,7 +1496,7 @@ type BeaconStateDeneb struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochParticipation []byte `protobuf:"bytes,7001,opt,name=previous_epoch_participation,json=previousEpochParticipation,proto3" json:"previous_epoch_participation,omitempty" ssz-max:"1099511627776"` CurrentEpochParticipation []byte `protobuf:"bytes,7002,opt,name=current_epoch_participation,json=currentEpochParticipation,proto3" json:"current_epoch_participation,omitempty" ssz-max:"1099511627776"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` @@ -1756,7 +1756,7 @@ type BeaconStateElectra struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochParticipation []byte `protobuf:"bytes,7001,opt,name=previous_epoch_participation,json=previousEpochParticipation,proto3" json:"previous_epoch_participation,omitempty" ssz-max:"1099511627776"` CurrentEpochParticipation []byte `protobuf:"bytes,7002,opt,name=current_epoch_participation,json=currentEpochParticipation,proto3" json:"current_epoch_participation,omitempty" ssz-max:"1099511627776"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` @@ -2088,7 +2088,7 @@ type BeaconStateFulu struct { Slashings []uint64 `protobuf:"varint,6001,rep,packed,name=slashings,proto3" json:"slashings,omitempty" ssz-size:"8192"` PreviousEpochParticipation []byte `protobuf:"bytes,7001,opt,name=previous_epoch_participation,json=previousEpochParticipation,proto3" json:"previous_epoch_participation,omitempty" ssz-max:"1099511627776"` CurrentEpochParticipation []byte `protobuf:"bytes,7002,opt,name=current_epoch_participation,json=currentEpochParticipation,proto3" json:"current_epoch_participation,omitempty" ssz-max:"1099511627776"` - JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + JustificationBits github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,8001,opt,name=justification_bits,json=justificationBits,proto3" json:"justification_bits,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` PreviousJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8002,opt,name=previous_justified_checkpoint,json=previousJustifiedCheckpoint,proto3" json:"previous_justified_checkpoint,omitempty"` CurrentJustifiedCheckpoint *Checkpoint `protobuf:"bytes,8003,opt,name=current_justified_checkpoint,json=currentJustifiedCheckpoint,proto3" json:"current_justified_checkpoint,omitempty"` FinalizedCheckpoint *Checkpoint `protobuf:"bytes,8004,opt,name=finalized_checkpoint,json=finalizedCheckpoint,proto3" json:"finalized_checkpoint,omitempty"` diff --git a/proto/prysm/v1alpha1/beacon_state.proto b/proto/prysm/v1alpha1/beacon_state.proto index 16f0d864d4..59ea245fc5 100644 --- a/proto/prysm/v1alpha1/beacon_state.proto +++ b/proto/prysm/v1alpha1/beacon_state.proto @@ -71,7 +71,7 @@ message BeaconState { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; @@ -84,7 +84,7 @@ message PendingAttestation { bytes aggregation_bits = 1 [ (ethereum.eth.ext.ssz_max) = "2048", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitlist" + "github.com/OffchainLabs/go-bitfield.Bitlist" ]; AttestationData data = 2; // The difference of when attestation gets created and get included on chain. @@ -236,7 +236,7 @@ message BeaconStateAltair { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; @@ -317,7 +317,7 @@ message BeaconStateBellatrix { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; @@ -390,7 +390,7 @@ message BeaconStateCapella { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; @@ -472,7 +472,7 @@ message BeaconStateDeneb { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; @@ -554,7 +554,7 @@ message BeaconStateElectra { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; @@ -665,7 +665,7 @@ message BeaconStateFulu { bytes justification_bits = 8001 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; Checkpoint previous_justified_checkpoint = 8002; Checkpoint current_justified_checkpoint = 8003; diff --git a/proto/prysm/v1alpha1/metadata/metadata_interfaces.go b/proto/prysm/v1alpha1/metadata/metadata_interfaces.go index 032fd26e3a..60d6d892d9 100644 --- a/proto/prysm/v1alpha1/metadata/metadata_interfaces.go +++ b/proto/prysm/v1alpha1/metadata/metadata_interfaces.go @@ -1,9 +1,9 @@ package metadata import ( + "github.com/OffchainLabs/go-bitfield" pb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" ssz "github.com/prysmaticlabs/fastssz" - "github.com/prysmaticlabs/go-bitfield" ) // Metadata returns the interface of a p2p metadata type. diff --git a/proto/prysm/v1alpha1/p2p_messages.pb.go b/proto/prysm/v1alpha1/p2p_messages.pb.go index 732890f35d..82f7a3ce95 100755 --- a/proto/prysm/v1alpha1/p2p_messages.pb.go +++ b/proto/prysm/v1alpha1/p2p_messages.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" _ "google.golang.org/protobuf/types/descriptorpb" @@ -308,7 +308,7 @@ func (x *ENRForkID) GetNextForkEpoch() github_com_OffchainLabs_prysm_v6_consensu type MetaDataV0 struct { state protoimpl.MessageState `protogen:"open.v1"` SeqNumber uint64 `protobuf:"varint,1,opt,name=seq_number,json=seqNumber,proto3" json:"seq_number,omitempty"` - Attnets github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,2,opt,name=attnets,proto3" json:"attnets,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector64" ssz-size:"8"` + Attnets github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,2,opt,name=attnets,proto3" json:"attnets,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector64" ssz-size:"8"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -360,8 +360,8 @@ func (x *MetaDataV0) GetAttnets() github_com_prysmaticlabs_go_bitfield.Bitvector type MetaDataV1 struct { state protoimpl.MessageState `protogen:"open.v1"` SeqNumber uint64 `protobuf:"varint,1,opt,name=seq_number,json=seqNumber,proto3" json:"seq_number,omitempty"` - Attnets github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,2,opt,name=attnets,proto3" json:"attnets,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector64" ssz-size:"8"` - Syncnets github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,3,opt,name=syncnets,proto3" json:"syncnets,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + Attnets github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,2,opt,name=attnets,proto3" json:"attnets,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector64" ssz-size:"8"` + Syncnets github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,3,opt,name=syncnets,proto3" json:"syncnets,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -420,8 +420,8 @@ func (x *MetaDataV1) GetSyncnets() github_com_prysmaticlabs_go_bitfield.Bitvecto type MetaDataV2 struct { state protoimpl.MessageState `protogen:"open.v1"` SeqNumber uint64 `protobuf:"varint,1,opt,name=seq_number,json=seqNumber,proto3" json:"seq_number,omitempty"` - Attnets github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,2,opt,name=attnets,proto3" json:"attnets,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector64" ssz-size:"8"` - Syncnets github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,3,opt,name=syncnets,proto3" json:"syncnets,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector4" ssz-size:"1"` + Attnets github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,2,opt,name=attnets,proto3" json:"attnets,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector64" ssz-size:"8"` + Syncnets github_com_prysmaticlabs_go_bitfield.Bitvector4 `protobuf:"bytes,3,opt,name=syncnets,proto3" json:"syncnets,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector4" ssz-size:"1"` CustodyGroupCount uint64 `protobuf:"varint,4,opt,name=custody_group_count,json=custodyGroupCount,proto3" json:"custody_group_count,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache diff --git a/proto/prysm/v1alpha1/p2p_messages.proto b/proto/prysm/v1alpha1/p2p_messages.proto index 7fbe1428b9..620e07b403 100644 --- a/proto/prysm/v1alpha1/p2p_messages.proto +++ b/proto/prysm/v1alpha1/p2p_messages.proto @@ -75,7 +75,7 @@ message MetaDataV0 { bytes attnets = 2 [ (ethereum.eth.ext.ssz_size) = "8", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector64" + "github.com/OffchainLabs/go-bitfield.Bitvector64" ]; } @@ -93,12 +93,12 @@ message MetaDataV1 { bytes attnets = 2 [ (ethereum.eth.ext.ssz_size) = "8", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector64" + "github.com/OffchainLabs/go-bitfield.Bitvector64" ]; bytes syncnets = 3 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; } @@ -117,12 +117,12 @@ message MetaDataV2 { bytes attnets = 2 [ (ethereum.eth.ext.ssz_size) = "8", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector64" + "github.com/OffchainLabs/go-bitfield.Bitvector64" ]; bytes syncnets = 3 [ (ethereum.eth.ext.ssz_size) = "1", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector4" + "github.com/OffchainLabs/go-bitfield.Bitvector4" ]; uint64 custody_group_count = 4; } diff --git a/proto/prysm/v1alpha1/sync_committee.pb.go b/proto/prysm/v1alpha1/sync_committee.pb.go index 7ba0085fe5..84628f75b6 100755 --- a/proto/prysm/v1alpha1/sync_committee.pb.go +++ b/proto/prysm/v1alpha1/sync_committee.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" github_com_OffchainLabs_prysm_v6_consensus_types_primitives "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -210,7 +210,7 @@ type SyncCommitteeContribution struct { Slot github_com_OffchainLabs_prysm_v6_consensus_types_primitives.Slot `protobuf:"varint,1,opt,name=slot,proto3" json:"slot,omitempty" cast-type:"github.com/OffchainLabs/prysm/v6/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"` + 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/OffchainLabs/go-bitfield.Bitvector128" ssz-size:"16"` Signature []byte `protobuf:"bytes,5,opt,name=signature,proto3" json:"signature,omitempty" ssz-size:"96"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache diff --git a/proto/prysm/v1alpha1/sync_committee_mainnet.go b/proto/prysm/v1alpha1/sync_committee_mainnet.go index 4dd2d62e8b..278128a416 100644 --- a/proto/prysm/v1alpha1/sync_committee_mainnet.go +++ b/proto/prysm/v1alpha1/sync_committee_mainnet.go @@ -3,7 +3,7 @@ package eth import ( - "github.com/prysmaticlabs/go-bitfield" + "github.com/OffchainLabs/go-bitfield" ) func NewSyncCommitteeAggregationBits() bitfield.Bitvector128 { diff --git a/proto/prysm/v1alpha1/sync_committee_minimal.go b/proto/prysm/v1alpha1/sync_committee_minimal.go index 40beedfab7..4cfbb889e1 100644 --- a/proto/prysm/v1alpha1/sync_committee_minimal.go +++ b/proto/prysm/v1alpha1/sync_committee_minimal.go @@ -3,7 +3,7 @@ package eth import ( - "github.com/prysmaticlabs/go-bitfield" + "github.com/OffchainLabs/go-bitfield" ) func NewSyncCommitteeAggregationBits() bitfield.Bitvector8 { diff --git a/proto/ssz_proto_library.bzl b/proto/ssz_proto_library.bzl index 47033b5aa2..1b677a977c 100644 --- a/proto/ssz_proto_library.bzl +++ b/proto/ssz_proto_library.bzl @@ -16,9 +16,9 @@ mainnet = { "slashings.size": "8192", # EPOCHS_PER_SLASHINGS_VECTOR "sync_committee_bits.size": "512", # SYNC_COMMITTEE_SIZE "sync_committee_bytes.size": "64", - "sync_committee_bits.type": "github.com/prysmaticlabs/go-bitfield.Bitvector512", + "sync_committee_bits.type": "github.com/OffchainLabs/go-bitfield.Bitvector512", "sync_committee_aggregate_bytes.size": "16", - "sync_committee_aggregate_bits.type": "github.com/prysmaticlabs/go-bitfield.Bitvector128", + "sync_committee_aggregate_bits.type": "github.com/OffchainLabs/go-bitfield.Bitvector128", "withdrawal.size": "16", "blob.size": "131072", # BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_BLOB "logs_bloom.size": "256", @@ -32,7 +32,7 @@ mainnet = { "max_attesting_indices.size": "131072", "max_committees_per_slot.size": "64", "committee_bits.size": "8", - "committee_bits.type": "github.com/prysmaticlabs/go-bitfield.Bitvector64", + "committee_bits.type": "github.com/OffchainLabs/go-bitfield.Bitvector64", "pending_deposits_limit": "134217728", "pending_partial_withdrawals_limit": "134217728", "pending_consolidations_limit": "262144", @@ -55,9 +55,9 @@ minimal = { "slashings.size": "64", "sync_committee_bits.size": "32", "sync_committee_bytes.size": "4", - "sync_committee_bits.type": "github.com/prysmaticlabs/go-bitfield.Bitvector32", + "sync_committee_bits.type": "github.com/OffchainLabs/go-bitfield.Bitvector32", "sync_committee_aggregate_bytes.size": "1", - "sync_committee_aggregate_bits.type": "github.com/prysmaticlabs/go-bitfield.Bitvector8", + "sync_committee_aggregate_bits.type": "github.com/OffchainLabs/go-bitfield.Bitvector8", "withdrawal.size": "4", "blob.size": "131072", "logs_bloom.size": "256", @@ -71,7 +71,7 @@ minimal = { "max_attesting_indices.size": "8192", "max_committees_per_slot.size": "4", "committee_bits.size": "1", - "committee_bits.type": "github.com/prysmaticlabs/go-bitfield.Bitvector4", + "committee_bits.type": "github.com/OffchainLabs/go-bitfield.Bitvector4", "pending_deposits_limit": "134217728", "pending_partial_withdrawals_limit": "64", "pending_consolidations_limit": "64", diff --git a/proto/ssz_query/testing/test_containers.pb.go b/proto/ssz_query/testing/test_containers.pb.go index 695e68103c..141885b2ce 100755 --- a/proto/ssz_query/testing/test_containers.pb.go +++ b/proto/ssz_query/testing/test_containers.pb.go @@ -10,8 +10,8 @@ import ( reflect "reflect" sync "sync" + github_com_prysmaticlabs_go_bitfield "github.com/OffchainLabs/go-bitfield" _ "github.com/OffchainLabs/prysm/v6/proto/eth/ext" - github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -84,8 +84,8 @@ type FixedTestContainer struct { Nested *FixedNestedContainer `protobuf:"bytes,5,opt,name=nested,proto3" json:"nested,omitempty"` VectorField []uint64 `protobuf:"varint,6,rep,packed,name=vector_field,json=vectorField,proto3" json:"vector_field,omitempty" ssz-size:"24"` TwoDimensionBytesField [][]byte `protobuf:"bytes,7,rep,name=two_dimension_bytes_field,json=twoDimensionBytesField,proto3" json:"two_dimension_bytes_field,omitempty" ssz-size:"5,32"` - Bitvector64Field github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,8,opt,name=bitvector64_field,json=bitvector64Field,proto3" json:"bitvector64_field,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector64" ssz-size:"8"` - Bitvector512Field github_com_prysmaticlabs_go_bitfield.Bitvector512 `protobuf:"bytes,9,opt,name=bitvector512_field,json=bitvector512Field,proto3" json:"bitvector512_field,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitvector512" ssz-size:"64"` + Bitvector64Field github_com_prysmaticlabs_go_bitfield.Bitvector64 `protobuf:"bytes,8,opt,name=bitvector64_field,json=bitvector64Field,proto3" json:"bitvector64_field,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector64" ssz-size:"8"` + Bitvector512Field github_com_prysmaticlabs_go_bitfield.Bitvector512 `protobuf:"bytes,9,opt,name=bitvector512_field,json=bitvector512Field,proto3" json:"bitvector512_field,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitvector512" ssz-size:"64"` TrailingField []byte `protobuf:"bytes,10,opt,name=trailing_field,json=trailingField,proto3" json:"trailing_field,omitempty" ssz-size:"56"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -311,7 +311,7 @@ type VariableTestContainer struct { FieldListBytes32 [][]byte `protobuf:"bytes,4,rep,name=field_list_bytes32,json=fieldListBytes32,proto3" json:"field_list_bytes32,omitempty" ssz-max:"100" ssz-size:"?,32"` Nested *VariableNestedContainer `protobuf:"bytes,5,opt,name=nested,proto3" json:"nested,omitempty"` VariableContainerList []*VariableOuterContainer `protobuf:"bytes,6,rep,name=variable_container_list,json=variableContainerList,proto3" json:"variable_container_list,omitempty" ssz-max:"10"` - BitlistField github_com_prysmaticlabs_go_bitfield.Bitlist `protobuf:"bytes,7,opt,name=bitlist_field,json=bitlistField,proto3" json:"bitlist_field,omitempty" cast-type:"github.com/prysmaticlabs/go-bitfield.Bitlist" ssz-max:"2048"` + BitlistField github_com_prysmaticlabs_go_bitfield.Bitlist `protobuf:"bytes,7,opt,name=bitlist_field,json=bitlistField,proto3" json:"bitlist_field,omitempty" cast-type:"github.com/OffchainLabs/go-bitfield.Bitlist" ssz-max:"2048"` NestedListField [][]byte `protobuf:"bytes,8,rep,name=nested_list_field,json=nestedListField,proto3" json:"nested_list_field,omitempty" ssz-max:"100,50" ssz-size:"?,?"` TrailingField []byte `protobuf:"bytes,9,opt,name=trailing_field,json=trailingField,proto3" json:"trailing_field,omitempty" ssz-size:"56"` unknownFields protoimpl.UnknownFields diff --git a/proto/ssz_query/testing/test_containers.proto b/proto/ssz_query/testing/test_containers.proto index a3a5656c22..506a187d27 100644 --- a/proto/ssz_query/testing/test_containers.proto +++ b/proto/ssz_query/testing/test_containers.proto @@ -45,13 +45,13 @@ message FixedTestContainer { bytes bitvector64_field = 8 [ (ethereum.eth.ext.ssz_size) = "8", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector64" + "github.com/OffchainLabs/go-bitfield.Bitvector64" ]; // Test: Bitvector64 (8 bytes), offset: 437 bytes bitvector512_field = 9 [ (ethereum.eth.ext.ssz_size) = "64", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitvector512" + "github.com/OffchainLabs/go-bitfield.Bitvector512" ]; // Test: Bitvector512 (64 bytes), offset: 445 // Additional bytes field - test field ordering and offset calculation @@ -108,7 +108,7 @@ message VariableTestContainer { bytes bitlist_field = 7 [ (ethereum.eth.ext.ssz_max) = "2048", (ethereum.eth.ext.cast_type) = - "github.com/prysmaticlabs/go-bitfield.Bitlist" + "github.com/OffchainLabs/go-bitfield.Bitlist" ]; // 2D bytes list - test list of bytelists. diff --git a/testing/endtoend/evaluators/slashing_helper.go b/testing/endtoend/evaluators/slashing_helper.go index 46367c230c..30d9112cd6 100644 --- a/testing/endtoend/evaluators/slashing_helper.go +++ b/testing/endtoend/evaluators/slashing_helper.go @@ -4,6 +4,7 @@ import ( "context" "crypto/rand" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" @@ -12,7 +13,6 @@ import ( eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/testing/util/altair.go b/testing/util/altair.go index dba6279944..e7a9c09d67 100644 --- a/testing/util/altair.go +++ b/testing/util/altair.go @@ -5,6 +5,7 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/encoding/bytesutil" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // 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 7c2cf7c9f8..96208edd5b 100644 --- a/testing/util/attestation.go +++ b/testing/util/attestation.go @@ -5,6 +5,7 @@ import ( "fmt" "math" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/transition" @@ -19,7 +20,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/runtime/version" "github.com/OffchainLabs/prysm/v6/time/slots" - "github.com/prysmaticlabs/go-bitfield" log "github.com/sirupsen/logrus" ) diff --git a/testing/util/bellatrix.go b/testing/util/bellatrix.go index 905fd43edd..4b38f36240 100644 --- a/testing/util/bellatrix.go +++ b/testing/util/bellatrix.go @@ -5,6 +5,7 @@ import ( "encoding/binary" "fmt" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/transition" @@ -19,7 +20,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // GenerateFullBlockBellatrix generates a fully valid Bellatrix block with the requested parameters. diff --git a/testing/util/capella_block.go b/testing/util/capella_block.go index b3c0548f24..68cfe01e6e 100644 --- a/testing/util/capella_block.go +++ b/testing/util/capella_block.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" @@ -18,7 +19,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // GenerateFullBlockCapella generates a fully valid Capella block with the requested parameters. diff --git a/testing/util/electra_block.go b/testing/util/electra_block.go index db434466cc..d61d8b32b7 100644 --- a/testing/util/electra_block.go +++ b/testing/util/electra_block.go @@ -6,6 +6,7 @@ import ( "fmt" "math/big" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" @@ -21,7 +22,6 @@ import ( "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // GenerateFullBlockElectra generates a fully valid Electra block with the requested parameters. diff --git a/testing/util/fulu_block.go b/testing/util/fulu_block.go index 059c0961b5..c9befda671 100644 --- a/testing/util/fulu_block.go +++ b/testing/util/fulu_block.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/time" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/transition" @@ -17,7 +18,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) // GenerateFullBlockFulu generates a fully valid Fulu block with the requested parameters. diff --git a/testing/util/state.go b/testing/util/state.go index a0cae966ac..319cb6e5af 100644 --- a/testing/util/state.go +++ b/testing/util/state.go @@ -5,6 +5,7 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" b "github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks" "github.com/OffchainLabs/prysm/v6/beacon-chain/db/iface" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" @@ -16,7 +17,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/go-bitfield" ) // FillRootsNaturalOpt is meant to be used as an option when calling NewBeaconState. diff --git a/testing/util/sync_aggregate.go b/testing/util/sync_aggregate.go index ff868032a6..3f2552e025 100644 --- a/testing/util/sync_aggregate.go +++ b/testing/util/sync_aggregate.go @@ -1,6 +1,7 @@ package util import ( + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" p2pType "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/types" "github.com/OffchainLabs/prysm/v6/beacon-chain/state" @@ -10,7 +11,6 @@ import ( ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" ) func generateSyncAggregate(st state.BeaconState, privs []bls.SecretKey, parentRoot [32]byte) (*ethpb.SyncAggregate, error) { diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index 3ed313ccaa..c0f955e873 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -23,6 +23,7 @@ import ( "os" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/async" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/config/params" @@ -42,7 +43,6 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/validator/client/aggregate_test.go b/validator/client/aggregate_test.go index 4741ba5739..dd29748fef 100644 --- a/validator/client/aggregate_test.go +++ b/validator/client/aggregate_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" @@ -17,7 +18,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/OffchainLabs/prysm/v6/validator/client/iface" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" "go.uber.org/mock/gomock" ) diff --git a/validator/client/attest.go b/validator/client/attest.go index 3e877084ca..87f99e9ab8 100644 --- a/validator/client/attest.go +++ b/validator/client/attest.go @@ -7,6 +7,7 @@ import ( "strings" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/async" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/config/features" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/time/slots" "github.com/OffchainLabs/prysm/v6/validator/client/iface" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" ) diff --git a/validator/client/attest_test.go b/validator/client/attest_test.go index 91faa36296..0d62ae7be1 100644 --- a/validator/client/attest_test.go +++ b/validator/client/attest_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/async/event" "github.com/OffchainLabs/prysm/v6/beacon-chain/core/signing" "github.com/OffchainLabs/prysm/v6/config/features" @@ -22,7 +23,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/OffchainLabs/prysm/v6/testing/util" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" "go.uber.org/mock/gomock" "gopkg.in/d4l3k/messagediff.v1" diff --git a/validator/client/runner_test.go b/validator/client/runner_test.go index c126f570af..9d332472fd 100644 --- a/validator/client/runner_test.go +++ b/validator/client/runner_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + "github.com/OffchainLabs/go-bitfield" "github.com/OffchainLabs/prysm/v6/async/event" "github.com/OffchainLabs/prysm/v6/cache/lru" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" @@ -29,7 +30,6 @@ import ( "github.com/OffchainLabs/prysm/v6/validator/keymanager/local" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" "go.uber.org/mock/gomock" diff --git a/validator/client/sync_committee_test.go b/validator/client/sync_committee_test.go index 6c49d86b2d..156500c046 100644 --- a/validator/client/sync_committee_test.go +++ b/validator/client/sync_committee_test.go @@ -6,6 +6,7 @@ import ( "fmt" "testing" + "github.com/OffchainLabs/go-bitfield" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" "github.com/OffchainLabs/prysm/v6/crypto/bls" @@ -14,7 +15,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/assert" "github.com/OffchainLabs/prysm/v6/testing/require" "github.com/pkg/errors" - "github.com/prysmaticlabs/go-bitfield" logTest "github.com/sirupsen/logrus/hooks/test" "go.uber.org/mock/gomock" "google.golang.org/protobuf/types/known/emptypb" diff --git a/validator/keymanager/remote-web3signer/types/custom_mappers_test.go b/validator/keymanager/remote-web3signer/types/custom_mappers_test.go index cda1c99830..2e1d230bcb 100644 --- a/validator/keymanager/remote-web3signer/types/custom_mappers_test.go +++ b/validator/keymanager/remote-web3signer/types/custom_mappers_test.go @@ -4,12 +4,12 @@ import ( "reflect" "testing" + "github.com/OffchainLabs/go-bitfield" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" "github.com/OffchainLabs/prysm/v6/validator/keymanager/remote-web3signer/types" "github.com/OffchainLabs/prysm/v6/validator/keymanager/remote-web3signer/types/mock" - "github.com/prysmaticlabs/go-bitfield" ) func TestMapAggregateAndProof(t *testing.T) { diff --git a/validator/keymanager/remote-web3signer/types/mock/mocks.go b/validator/keymanager/remote-web3signer/types/mock/mocks.go index 765980508a..4c70815f53 100644 --- a/validator/keymanager/remote-web3signer/types/mock/mocks.go +++ b/validator/keymanager/remote-web3signer/types/mock/mocks.go @@ -5,6 +5,7 @@ import ( "fmt" "strings" + "github.com/OffchainLabs/go-bitfield" fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams" "github.com/OffchainLabs/prysm/v6/config/params" "github.com/OffchainLabs/prysm/v6/consensus-types/primitives" @@ -14,7 +15,6 @@ import ( "github.com/OffchainLabs/prysm/v6/testing/util" "github.com/OffchainLabs/prysm/v6/validator/keymanager/remote-web3signer/types" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/prysmaticlabs/go-bitfield" ) /////////////////////////////////////////////////////////////////////////////////////////////////