diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5901e5aab8..0afe578115 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -34,7 +34,7 @@ jobs: - name: Gosec security scanner uses: securego/gosec@master with: - args: '-exclude-dir=shared/bls/herumi ./...' + args: '-exclude-dir=crypto/bls/herumi ./...' build: name: Build runs-on: ubuntu-latest diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index 20b05da513..d5539476fb 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -47,12 +47,12 @@ go_library( "//beacon-chain/state/stategen:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//monitoring/tracing:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/mputil:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index eff91ab1dd..9a1616065d 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -13,11 +13,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" diff --git a/beacon-chain/cache/BUILD.bazel b/beacon-chain/cache/BUILD.bazel index daa404c237..4df9d6755a 100644 --- a/beacon-chain/cache/BUILD.bazel +++ b/beacon-chain/cache/BUILD.bazel @@ -41,12 +41,12 @@ go_library( "//beacon-chain/state/v2:go_default_library", "//cache/lru:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//shared/sliceutil:go_default_library", "@com_github_hashicorp_golang_lru//:go_default_library", "@com_github_patrickmn_go_cache//:go_default_library", diff --git a/beacon-chain/cache/checkpoint_state.go b/beacon-chain/cache/checkpoint_state.go index 1ea3d9a038..0cf8bb03b4 100644 --- a/beacon-chain/cache/checkpoint_state.go +++ b/beacon-chain/cache/checkpoint_state.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prysmaticlabs/prysm/beacon-chain/state" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" ) var ( @@ -47,7 +47,7 @@ func NewCheckpointStateCache() *CheckpointStateCache { func (c *CheckpointStateCache) StateByCheckpoint(cp *ethpb.Checkpoint) (state.BeaconState, error) { c.lock.RLock() defer c.lock.RUnlock() - h, err := hashutil.HashProto(cp) + h, err := hash.HashProto(cp) if err != nil { return nil, err } @@ -69,7 +69,7 @@ func (c *CheckpointStateCache) StateByCheckpoint(cp *ethpb.Checkpoint) (state.Be func (c *CheckpointStateCache) AddCheckpointState(cp *ethpb.Checkpoint, s state.ReadOnlyBeaconState) error { c.lock.Lock() defer c.lock.Unlock() - h, err := hashutil.HashProto(cp) + h, err := hash.HashProto(cp) if err != nil { return err } diff --git a/beacon-chain/cache/depositcache/BUILD.bazel b/beacon-chain/cache/depositcache/BUILD.bazel index 91ae9961be..b72837fe6f 100644 --- a/beacon-chain/cache/depositcache/BUILD.bazel +++ b/beacon-chain/cache/depositcache/BUILD.bazel @@ -10,9 +10,9 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache", visibility = ["//beacon-chain:__subpackages__"], deps = [ + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/trieutil:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/cache/depositcache/pending_deposits.go b/beacon-chain/cache/depositcache/pending_deposits.go index fe65bc1a9d..a0f04544fa 100644 --- a/beacon-chain/cache/depositcache/pending_deposits.go +++ b/beacon-chain/cache/depositcache/pending_deposits.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/prysmaticlabs/prysm/crypto/hash" dbpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) @@ -99,7 +99,7 @@ func (dc *DepositCache) RemovePendingDeposit(ctx context.Context, d *ethpb.Depos return } - depRoot, err := hashutil.HashProto(d) + depRoot, err := hash.HashProto(d) if err != nil { log.Errorf("Could not remove deposit %v", err) return @@ -110,7 +110,7 @@ func (dc *DepositCache) RemovePendingDeposit(ctx context.Context, d *ethpb.Depos idx := -1 for i, ctnr := range dc.pendingDeposits { - hash, err := hashutil.HashProto(ctnr.Deposit) + hash, err := hash.HashProto(ctnr.Deposit) if err != nil { log.Errorf("Could not hash deposit %v", err) continue diff --git a/beacon-chain/cache/sync_subnet_ids.go b/beacon-chain/cache/sync_subnet_ids.go index ba7fe8b195..99c02804fd 100644 --- a/beacon-chain/cache/sync_subnet_ids.go +++ b/beacon-chain/cache/sync_subnet_ids.go @@ -6,9 +6,9 @@ import ( "github.com/patrickmn/go-cache" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/sliceutil" ) diff --git a/beacon-chain/core/altair/BUILD.bazel b/beacon-chain/core/altair/BUILD.bazel index 03698ad441..574a957b6c 100644 --- a/beacon-chain/core/altair/BUILD.bazel +++ b/beacon-chain/core/altair/BUILD.bazel @@ -29,12 +29,12 @@ go_library( "//beacon-chain/p2p/types:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v2:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", "@com_github_pkg_errors//:go_default_library", @@ -66,10 +66,10 @@ go_test( "//beacon-chain/p2p/types:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v2:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/core/altair/attestation_test.go b/beacon-chain/core/altair/attestation_test.go index a19a0d618a..a3c3c0a385 100644 --- a/beacon-chain/core/altair/attestation_test.go +++ b/beacon-chain/core/altair/attestation_test.go @@ -13,10 +13,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/altair/block.go b/beacon-chain/core/altair/block.go index 4ec0674acd..cdf5618c8d 100644 --- a/beacon-chain/core/altair/block.go +++ b/beacon-chain/core/altair/block.go @@ -8,8 +8,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2pType "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/altair/block_test.go b/beacon-chain/core/altair/block_test.go index b4f8246065..f7a15399c5 100644 --- a/beacon-chain/core/altair/block_test.go +++ b/beacon-chain/core/altair/block_test.go @@ -11,8 +11,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2pType "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/altair/deposit_test.go b/beacon-chain/core/altair/deposit_test.go index a306b0601f..42d8bfa718 100644 --- a/beacon-chain/core/altair/deposit_test.go +++ b/beacon-chain/core/altair/deposit_test.go @@ -7,8 +7,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/altair/sync_committee.go b/beacon-chain/core/altair/sync_committee.go index bbaea47491..ff615a074f 100644 --- a/beacon-chain/core/altair/sync_committee.go +++ b/beacon-chain/core/altair/sync_committee.go @@ -10,10 +10,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -110,7 +110,7 @@ func NextSyncCommitteeIndices(ctx context.Context, s state.BeaconStateAltair) ([ cfg := params.BeaconConfig() syncCommitteeSize := cfg.SyncCommitteeSize cIndices := make([]types.ValidatorIndex, 0, syncCommitteeSize) - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() for i := types.ValidatorIndex(0); uint64(len(cIndices)) < params.BeaconConfig().SyncCommitteeSize; i++ { if ctx.Err() != nil { @@ -179,7 +179,7 @@ func IsSyncCommitteeAggregator(sig []byte) (bool, error) { cfg := params.BeaconConfig() modulo := mathutil.Max(1, cfg.SyncCommitteeSize/cfg.SyncCommitteeSubnetCount/cfg.TargetAggregatorsPerSyncSubcommittee) - hashedSig := hashutil.Hash(sig) + hashedSig := hash.Hash(sig) return bytesutil.FromBytes8(hashedSig[:8])%modulo == 0, nil } diff --git a/beacon-chain/core/altair/sync_committee_test.go b/beacon-chain/core/altair/sync_committee_test.go index 5d7721ba8f..31149c8b0b 100644 --- a/beacon-chain/core/altair/sync_committee_test.go +++ b/beacon-chain/core/altair/sync_committee_test.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/core/blocks/BUILD.bazel b/beacon-chain/core/blocks/BUILD.bazel index f349af95de..798012f947 100644 --- a/beacon-chain/core/blocks/BUILD.bazel +++ b/beacon-chain/core/blocks/BUILD.bazel @@ -28,13 +28,13 @@ go_library( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/validators:go_default_library", "//beacon-chain/state:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/depositutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", @@ -79,12 +79,12 @@ go_test( "//beacon-chain/p2p/types:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/core/blocks/attestation.go b/beacon-chain/core/blocks/attestation.go index 7b31bafa6a..d51eefcaa9 100644 --- a/beacon-chain/core/blocks/attestation.go +++ b/beacon-chain/core/blocks/attestation.go @@ -9,10 +9,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/blocks/attestation_test.go b/beacon-chain/core/blocks/attestation_test.go index a10267f10c..baee0977bc 100644 --- a/beacon-chain/core/blocks/attestation_test.go +++ b/beacon-chain/core/blocks/attestation_test.go @@ -9,11 +9,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/attester_slashing_test.go b/beacon-chain/core/blocks/attester_slashing_test.go index 1185609a28..33128d5493 100644 --- a/beacon-chain/core/blocks/attester_slashing_test.go +++ b/beacon-chain/core/blocks/attester_slashing_test.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/block_regression_test.go b/beacon-chain/core/blocks/block_regression_test.go index 397aea44e4..45ef943fa2 100644 --- a/beacon-chain/core/blocks/block_regression_test.go +++ b/beacon-chain/core/blocks/block_regression_test.go @@ -8,8 +8,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/blocks/deposit.go b/beacon-chain/core/blocks/deposit.go index e8f337611c..d1fee5f298 100644 --- a/beacon-chain/core/blocks/deposit.go +++ b/beacon-chain/core/blocks/deposit.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/depositutil" "github.com/prysmaticlabs/prysm/shared/mathutil" diff --git a/beacon-chain/core/blocks/deposit_test.go b/beacon-chain/core/blocks/deposit_test.go index ccde178509..9b84052c14 100644 --- a/beacon-chain/core/blocks/deposit_test.go +++ b/beacon-chain/core/blocks/deposit_test.go @@ -8,8 +8,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/exit_test.go b/beacon-chain/core/blocks/exit_test.go index 0e9659a6b5..7daa48601c 100644 --- a/beacon-chain/core/blocks/exit_test.go +++ b/beacon-chain/core/blocks/exit_test.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/core/blocks/header_test.go b/beacon-chain/core/blocks/header_test.go index 654cc20ccc..dd4a41f0b0 100644 --- a/beacon-chain/core/blocks/header_test.go +++ b/beacon-chain/core/blocks/header_test.go @@ -9,9 +9,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/proposer_slashing_test.go b/beacon-chain/core/blocks/proposer_slashing_test.go index eb299cf6fb..add090449d 100644 --- a/beacon-chain/core/blocks/proposer_slashing_test.go +++ b/beacon-chain/core/blocks/proposer_slashing_test.go @@ -12,8 +12,8 @@ import ( v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/blocks/randao.go b/beacon-chain/core/blocks/randao.go index bc9b38d003..901c61973e 100644 --- a/beacon-chain/core/blocks/randao.go +++ b/beacon-chain/core/blocks/randao.go @@ -7,8 +7,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -71,7 +71,7 @@ func ProcessRandaoNoVerify( if err != nil { return nil, err } - blockRandaoReveal := hashutil.Hash(randaoReveal) + blockRandaoReveal := hash.Hash(randaoReveal) if len(blockRandaoReveal) != len(latestMixSlice) { return nil, errors.New("blockRandaoReveal length doesnt match latestMixSlice length") } diff --git a/beacon-chain/core/blocks/signature.go b/beacon-chain/core/blocks/signature.go index 835be55e58..1c8099005f 100644 --- a/beacon-chain/core/blocks/signature.go +++ b/beacon-chain/core/blocks/signature.go @@ -9,10 +9,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/p2putils" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/helpers/BUILD.bazel b/beacon-chain/core/helpers/BUILD.bazel index dcf77de29d..a9a01459af 100644 --- a/beacon-chain/core/helpers/BUILD.bazel +++ b/beacon-chain/core/helpers/BUILD.bazel @@ -37,11 +37,11 @@ go_library( "//beacon-chain/cache:go_default_library", "//beacon-chain/core:go_default_library", "//beacon-chain/state:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", @@ -79,10 +79,10 @@ go_test( "//beacon-chain/state/v1:go_default_library", "//beacon-chain/state/v2:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/core/helpers/attestation.go b/beacon-chain/core/helpers/attestation.go index efdc20b158..4396457a69 100644 --- a/beacon-chain/core/helpers/attestation.go +++ b/beacon-chain/core/helpers/attestation.go @@ -8,9 +8,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" prysmTime "github.com/prysmaticlabs/prysm/time" ) @@ -61,7 +61,7 @@ func IsAggregator(committeeCount uint64, slotSig []byte) (bool, error) { modulo = committeeCount / params.BeaconConfig().TargetAggregatorsPerCommittee } - b := hashutil.Hash(slotSig) + b := hash.Hash(slotSig) return binary.LittleEndian.Uint64(b[:8])%modulo == 0, nil } diff --git a/beacon-chain/core/helpers/attestation_test.go b/beacon-chain/core/helpers/attestation_test.go index 5cec1ebd33..ee98bcd849 100644 --- a/beacon-chain/core/helpers/attestation_test.go +++ b/beacon-chain/core/helpers/attestation_test.go @@ -9,8 +9,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/helpers/beacon_committee.go b/beacon-chain/core/helpers/beacon_committee.go index c2e2399a57..0f2d7373e5 100644 --- a/beacon-chain/core/helpers/beacon_committee.go +++ b/beacon-chain/core/helpers/beacon_committee.go @@ -13,9 +13,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/mathutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" @@ -413,7 +413,7 @@ func computeCommittee( // This computes proposer indices of the current epoch and returns a list of proposer indices, // the index of the list represents the slot number. func precomputeProposerIndices(state state.ReadOnlyBeaconState, activeIndices []types.ValidatorIndex) ([]types.ValidatorIndex, error) { - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() proposerIndices := make([]types.ValidatorIndex, params.BeaconConfig().SlotsPerEpoch) e := core.CurrentEpoch(state) diff --git a/beacon-chain/core/helpers/beacon_committee_test.go b/beacon-chain/core/helpers/beacon_committee_test.go index 9882f11abd..d8e016e600 100644 --- a/beacon-chain/core/helpers/beacon_committee_test.go +++ b/beacon-chain/core/helpers/beacon_committee_test.go @@ -9,9 +9,9 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" @@ -620,7 +620,7 @@ func TestPrecomputeProposerIndices_Ok(t *testing.T) { require.NoError(t, err) for i := uint64(0); i < uint64(params.BeaconConfig().SlotsPerEpoch); i++ { seedWithSlot := append(seed[:], bytesutil.Bytes8(i)...) - seedWithSlotHash := hashutil.Hash(seedWithSlot) + seedWithSlotHash := hash.Hash(seedWithSlot) index, err := ComputeProposerIndex(state, indices, seedWithSlotHash) require.NoError(t, err) wantedProposerIndices = append(wantedProposerIndices, index) diff --git a/beacon-chain/core/helpers/randao.go b/beacon-chain/core/helpers/randao.go index 6942d38516..ed5402bd03 100644 --- a/beacon-chain/core/helpers/randao.go +++ b/beacon-chain/core/helpers/randao.go @@ -3,9 +3,9 @@ package helpers import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -31,7 +31,7 @@ func Seed(state state.ReadOnlyBeaconState, epoch types.Epoch, domain [bls.Domain seed := append(domain[:], bytesutil.Bytes8(uint64(epoch))...) seed = append(seed, randaoMix...) - seed32 := hashutil.Hash(seed) + seed32 := hash.Hash(seed) return seed32, nil } diff --git a/beacon-chain/core/helpers/shuffle.go b/beacon-chain/core/helpers/shuffle.go index dedc893b20..202f9b8dde 100644 --- a/beacon-chain/core/helpers/shuffle.go +++ b/beacon-chain/core/helpers/shuffle.go @@ -5,8 +5,8 @@ import ( "fmt" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" ) @@ -90,7 +90,7 @@ func ComputeShuffledIndex(index types.ValidatorIndex, indexCount uint64, seed [3 } buf := make([]byte, totalSize) posBuffer := make([]byte, 8) - hashfunc := hashutil.CustomSHA256Hasher() + hashfunc := hash.CustomSHA256Hasher() // Seed is always the first 32 bytes of the hash input, we never have to change this part of the buffer. copy(buf[:32], seed[:]) @@ -168,7 +168,7 @@ func innerShuffleList(input []types.ValidatorIndex, seed [32]byte, shuffle bool) len(input)) } rounds := uint8(params.BeaconConfig().ShuffleRoundCount) - hashfunc := hashutil.CustomSHA256Hasher() + hashfunc := hash.CustomSHA256Hasher() if rounds == 0 { return input, nil } diff --git a/beacon-chain/core/helpers/signing_root.go b/beacon-chain/core/helpers/signing_root.go index 38927d2c4f..e3c56db631 100644 --- a/beacon-chain/core/helpers/signing_root.go +++ b/beacon-chain/core/helpers/signing_root.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/beacon-chain/core/helpers/signing_root_test.go b/beacon-chain/core/helpers/signing_root_test.go index 5848b84546..f1ed978f59 100644 --- a/beacon-chain/core/helpers/signing_root_test.go +++ b/beacon-chain/core/helpers/signing_root_test.go @@ -8,9 +8,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/helpers/validators.go b/beacon-chain/core/helpers/validators.go index e2f2e288c6..e14940d712 100644 --- a/beacon-chain/core/helpers/validators.go +++ b/beacon-chain/core/helpers/validators.go @@ -7,10 +7,10 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -216,7 +216,7 @@ func BeaconProposerIndex(state state.ReadOnlyBeaconState) (types.ValidatorIndex, } seedWithSlot := append(seed[:], bytesutil.Bytes8(uint64(state.Slot()))...) - seedWithSlotHash := hashutil.Hash(seedWithSlot) + seedWithSlotHash := hash.Hash(seedWithSlot) indices, err := ActiveValidatorIndices(state, e) if err != nil { @@ -250,7 +250,7 @@ func ComputeProposerIndex(bState state.ReadOnlyValidators, activeIndices []types return 0, errors.New("empty active indices list") } maxRandomByte := uint64(1<<8 - 1) - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() for i := uint64(0); ; i++ { candidateIndex, err := ComputeShuffledIndex(types.ValidatorIndex(i%length), length, seed, true /* shuffle */) diff --git a/beacon-chain/core/helpers/validators_test.go b/beacon-chain/core/helpers/validators_test.go index 7208fec868..6e25da4d1f 100644 --- a/beacon-chain/core/helpers/validators_test.go +++ b/beacon-chain/core/helpers/validators_test.go @@ -8,9 +8,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/core" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" @@ -331,7 +331,7 @@ func TestComputeProposerIndex_Compatibility(t *testing.T) { require.NoError(t, err) for i := uint64(0); i < uint64(params.BeaconConfig().SlotsPerEpoch); i++ { seedWithSlot := append(seed[:], bytesutil.Bytes8(i)...) - seedWithSlotHash := hashutil.Hash(seedWithSlot) + seedWithSlotHash := hash.Hash(seedWithSlot) index, err := ComputeProposerIndex(state, indices, seedWithSlotHash) require.NoError(t, err) proposerIndices = append(proposerIndices, index) @@ -342,7 +342,7 @@ func TestComputeProposerIndex_Compatibility(t *testing.T) { require.NoError(t, err) for i := uint64(0); i < uint64(params.BeaconConfig().SlotsPerEpoch); i++ { seedWithSlot := append(seed[:], bytesutil.Bytes8(i)...) - seedWithSlotHash := hashutil.Hash(seedWithSlot) + seedWithSlotHash := hash.Hash(seedWithSlot) index, err := computeProposerIndexWithValidators(state.Validators(), indices, seedWithSlotHash) require.NoError(t, err) wantedProposerIndices = append(wantedProposerIndices, index) @@ -770,7 +770,7 @@ func computeProposerIndexWithValidators(validators []*ethpb.Validator, activeInd return 0, errors.New("empty active indices list") } maxRandomByte := uint64(1<<8 - 1) - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() for i := uint64(0); ; i++ { candidateIndex, err := ComputeShuffledIndex(types.ValidatorIndex(i%length), length, seed, true /* shuffle */) diff --git a/beacon-chain/core/transition/BUILD.bazel b/beacon-chain/core/transition/BUILD.bazel index 6a976c1da3..a7e6db0bf3 100644 --- a/beacon-chain/core/transition/BUILD.bazel +++ b/beacon-chain/core/transition/BUILD.bazel @@ -37,12 +37,12 @@ go_library( "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", "//shared/version:go_default_library", @@ -82,12 +82,12 @@ go_test( "//beacon-chain/p2p/types:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go b/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go index 56f04811a9..ba15e28c72 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 @@ -11,9 +11,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" p2pType "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/core/transition/skip_slot_cache.go b/beacon-chain/core/transition/skip_slot_cache.go index d38d787abf..f51ee536d6 100644 --- a/beacon-chain/core/transition/skip_slot_cache.go +++ b/beacon-chain/core/transition/skip_slot_cache.go @@ -6,8 +6,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" ) // SkipSlotCache exists for the unlikely scenario that is a large gap between the head state and @@ -28,5 +28,5 @@ func cacheKey(ctx context.Context, state state.ReadOnlyBeaconState) ([32]byte, e if err != nil { return [32]byte{}, err } - return hashutil.Hash(append(bytesutil.Bytes32(uint64(state.Slot())), r[:]...)), nil + return hash.Hash(append(bytesutil.Bytes32(uint64(state.Slot())), r[:]...)), nil } diff --git a/beacon-chain/core/transition/state_test.go b/beacon-chain/core/transition/state_test.go index e7ec1dbb8e..a53001c303 100644 --- a/beacon-chain/core/transition/state_test.go +++ b/beacon-chain/core/transition/state_test.go @@ -7,8 +7,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" @@ -103,8 +103,8 @@ func TestGenesisState_HashEquality(t *testing.T) { pbstate, err := v1.ProtobufBeaconState(state.CloneInnerState()) require.NoError(t, err) - root1, err1 := hashutil.HashProto(pbState1) - root2, err2 := hashutil.HashProto(pbstate) + root1, err1 := hash.HashProto(pbState1) + root2, err2 := hash.HashProto(pbstate) if err1 != nil || err2 != nil { t.Fatalf("Failed to marshal state to bytes: %v %v", err1, err2) diff --git a/beacon-chain/core/transition/transition_no_verify_sig.go b/beacon-chain/core/transition/transition_no_verify_sig.go index 1dd5267d01..4722c03579 100644 --- a/beacon-chain/core/transition/transition_no_verify_sig.go +++ b/beacon-chain/core/transition/transition_no_verify_sig.go @@ -13,9 +13,9 @@ import ( v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/version" "go.opencensus.io/trace" ) diff --git a/beacon-chain/core/transition/transition_test.go b/beacon-chain/core/transition/transition_test.go index 2cf53533f0..3a2c35f847 100644 --- a/beacon-chain/core/transition/transition_test.go +++ b/beacon-chain/core/transition/transition_test.go @@ -13,10 +13,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/forkchoice/protoarray/BUILD.bazel b/beacon-chain/forkchoice/protoarray/BUILD.bazel index 52d31cd33e..64f92e3d1c 100644 --- a/beacon-chain/forkchoice/protoarray/BUILD.bazel +++ b/beacon-chain/forkchoice/protoarray/BUILD.bazel @@ -38,8 +38,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//crypto/hash:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/beacon-chain/forkchoice/protoarray/helpers_test.go b/beacon-chain/forkchoice/protoarray/helpers_test.go index d8eaa5b090..a51ebaba1b 100644 --- a/beacon-chain/forkchoice/protoarray/helpers_test.go +++ b/beacon-chain/forkchoice/protoarray/helpers_test.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "testing" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" @@ -245,5 +245,5 @@ func TestComputeDelta_ValidatorDisappears(t *testing.T) { func indexToHash(i uint64) [32]byte { var b [8]byte binary.LittleEndian.PutUint64(b[:], i) - return hashutil.Hash(b[:]) + return hash.Hash(b[:]) } diff --git a/beacon-chain/operations/attestations/BUILD.bazel b/beacon-chain/operations/attestations/BUILD.bazel index 8011a5577d..b639b47642 100644 --- a/beacon-chain/operations/attestations/BUILD.bazel +++ b/beacon-chain/operations/attestations/BUILD.bazel @@ -19,9 +19,9 @@ go_library( deps = [ "//beacon-chain/operations/attestations/kv:go_default_library", "//cache/lru:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", @@ -46,9 +46,9 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/operations/attestations/kv:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", - "//shared/bls:go_default_library", "//shared/params:go_default_library", "//shared/runutil:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/operations/attestations/kv/BUILD.bazel b/beacon-chain/operations/attestations/kv/BUILD.bazel index 46c6d07c64..5a5055cf99 100644 --- a/beacon-chain/operations/attestations/kv/BUILD.bazel +++ b/beacon-chain/operations/attestations/kv/BUILD.bazel @@ -14,9 +14,9 @@ go_library( visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation/attestations:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "@com_github_patrickmn_go_cache//:go_default_library", "@com_github_pkg_errors//:go_default_library", @@ -39,8 +39,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/beacon-chain/operations/attestations/kv/aggregated_test.go b/beacon-chain/operations/attestations/kv/aggregated_test.go index 0960bc9507..88ac33adfb 100644 --- a/beacon-chain/operations/attestations/kv/aggregated_test.go +++ b/beacon-chain/operations/attestations/kv/aggregated_test.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/operations/attestations/kv/kv.go b/beacon-chain/operations/attestations/kv/kv.go index 66ab4cc80d..ff72535ba6 100644 --- a/beacon-chain/operations/attestations/kv/kv.go +++ b/beacon-chain/operations/attestations/kv/kv.go @@ -8,12 +8,12 @@ import ( "time" "github.com/patrickmn/go-cache" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) -var hashFn = hashutil.HashProto +var hashFn = hash.HashProto // AttCaches defines the caches used to satisfy attestation pool interface. // These caches are KV store for various attestations diff --git a/beacon-chain/operations/attestations/prepare_forkchoice.go b/beacon-chain/operations/attestations/prepare_forkchoice.go index 29a326b91f..1d57d7b799 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice.go @@ -7,9 +7,9 @@ import ( "time" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/time/slots" "go.opencensus.io/trace" ) @@ -100,7 +100,7 @@ func (s *Service) aggregateAndSaveForkChoiceAtts(atts []*ethpb.Attestation) erro // This checks if the attestation has previously been aggregated for fork choice // return true if yes, false if no. func (s *Service) seen(att *ethpb.Attestation) (bool, error) { - attRoot, err := hashutil.HashProto(att.Data) + attRoot, err := hash.HashProto(att.Data) if err != nil { return false, err } diff --git a/beacon-chain/operations/attestations/prepare_forkchoice_test.go b/beacon-chain/operations/attestations/prepare_forkchoice_test.go index aefd40673a..e9f298172d 100644 --- a/beacon-chain/operations/attestations/prepare_forkchoice_test.go +++ b/beacon-chain/operations/attestations/prepare_forkchoice_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/operations/slashings/BUILD.bazel b/beacon-chain/operations/slashings/BUILD.bazel index dd30b7a23b..e8f083bace 100644 --- a/beacon-chain/operations/slashings/BUILD.bazel +++ b/beacon-chain/operations/slashings/BUILD.bazel @@ -44,8 +44,8 @@ go_test( embed = [":go_default_library"], deps = [ "//beacon-chain/state:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/operations/slashings/service_attester_test.go b/beacon-chain/operations/slashings/service_attester_test.go index e49f036933..612af333e2 100644 --- a/beacon-chain/operations/slashings/service_attester_test.go +++ b/beacon-chain/operations/slashings/service_attester_test.go @@ -6,8 +6,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/p2p/BUILD.bazel b/beacon-chain/p2p/BUILD.bazel index 9fb9347840..853e8d151d 100644 --- a/beacon-chain/p2p/BUILD.bazel +++ b/beacon-chain/p2p/BUILD.bazel @@ -54,6 +54,7 @@ go_library( "//beacon-chain/p2p/types:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", @@ -61,7 +62,6 @@ go_library( "//shared:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/iputils:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", @@ -141,13 +141,13 @@ go_test( "//beacon-chain/p2p/peers/scorers:go_default_library", "//beacon-chain/p2p/testing:go_default_library", "//beacon-chain/p2p/types:go_default_library", + "//crypto/hash:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//proto/testing:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", - "//shared/hashutil:go_default_library", "//shared/iputils:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/p2p/broadcaster.go b/beacon-chain/p2p/broadcaster.go index 7d384a32b7..95e98a40c0 100644 --- a/beacon-chain/p2p/broadcaster.go +++ b/beacon-chain/p2p/broadcaster.go @@ -11,10 +11,10 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/monitoring/tracing" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" @@ -212,7 +212,7 @@ func (s *Service) broadcastObject(ctx context.Context, obj ssz.Marshaler, topic } if span.IsRecordingEvents() { - id := hashutil.FastSum64(buf.Bytes()) + id := hash.FastSum64(buf.Bytes()) messageLen := int64(buf.Len()) span.AddMessageSendEvent(int64(id), messageLen /*uncompressed*/, messageLen /*compressed*/) } diff --git a/beacon-chain/p2p/message_id.go b/beacon-chain/p2p/message_id.go index fda26ad50a..c9054f8761 100644 --- a/beacon-chain/p2p/message_id.go +++ b/beacon-chain/p2p/message_id.go @@ -3,8 +3,8 @@ package p2p import ( pubsub_pb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/p2putils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -50,11 +50,11 @@ func MsgID(genesisValidatorsRoot []byte, pmsg *pubsub_pb.Message) string { decodedData, err := encoder.DecodeSnappy(pmsg.Data, params.BeaconNetworkConfig().GossipMaxSize) if err != nil { combinedData := append(params.BeaconNetworkConfig().MessageDomainInvalidSnappy[:], pmsg.Data...) - h := hashutil.Hash(combinedData) + h := hash.Hash(combinedData) return string(h[:20]) } combinedData := append(params.BeaconNetworkConfig().MessageDomainValidSnappy[:], decodedData...) - h := hashutil.Hash(combinedData) + h := hash.Hash(combinedData) return string(h[:20]) } @@ -82,7 +82,7 @@ func altairMsgID(pmsg *pubsub_pb.Message) string { combinedData = append(combinedData, topicLenBytes...) combinedData = append(combinedData, topic...) combinedData = append(combinedData, pmsg.Data...) - h := hashutil.Hash(combinedData) + h := hash.Hash(combinedData) return string(h[:20]) } totalLength := len(params.BeaconNetworkConfig().MessageDomainValidSnappy) + len(topicLenBytes) + int(topicLen) + len(decodedData) @@ -91,6 +91,6 @@ func altairMsgID(pmsg *pubsub_pb.Message) string { combinedData = append(combinedData, topicLenBytes...) combinedData = append(combinedData, topic...) combinedData = append(combinedData, decodedData...) - h := hashutil.Hash(combinedData) + h := hash.Hash(combinedData) return string(h[:20]) } diff --git a/beacon-chain/p2p/message_id_test.go b/beacon-chain/p2p/message_id_test.go index 70a0e91d55..0ccc87e692 100644 --- a/beacon-chain/p2p/message_id_test.go +++ b/beacon-chain/p2p/message_id_test.go @@ -9,8 +9,8 @@ import ( pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/p2putils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" @@ -23,14 +23,14 @@ func TestMsgID_HashesCorrectly(t *testing.T) { tpc := fmt.Sprintf(p2p.BlockSubnetTopicFormat, d) invalidSnappy := [32]byte{'J', 'U', 'N', 'K'} pMsg := &pubsubpb.Message{Data: invalidSnappy[:], Topic: &tpc} - hashedData := hashutil.Hash(append(params.BeaconNetworkConfig().MessageDomainInvalidSnappy[:], pMsg.Data...)) + hashedData := hash.Hash(append(params.BeaconNetworkConfig().MessageDomainInvalidSnappy[:], pMsg.Data...)) msgID := string(hashedData[:20]) assert.Equal(t, msgID, p2p.MsgID(genesisValidatorsRoot, pMsg), "Got incorrect msg id") validObj := [32]byte{'v', 'a', 'l', 'i', 'd'} enc := snappy.Encode(nil, validObj[:]) nMsg := &pubsubpb.Message{Data: enc, Topic: &tpc} - hashedData = hashutil.Hash(append(params.BeaconNetworkConfig().MessageDomainValidSnappy[:], validObj[:]...)) + hashedData = hash.Hash(append(params.BeaconNetworkConfig().MessageDomainValidSnappy[:], validObj[:]...)) msgID = string(hashedData[:20]) assert.Equal(t, msgID, p2p.MsgID(genesisValidatorsRoot, nMsg), "Got incorrect msg id") } @@ -48,7 +48,7 @@ func TestMessageIDFunction_HashesCorrectlyAltair(t *testing.T) { combinedObj := append(params.BeaconNetworkConfig().MessageDomainInvalidSnappy[:], topicLenBytes...) combinedObj = append(combinedObj, tpc...) combinedObj = append(combinedObj, pMsg.Data...) - hashedData := hashutil.Hash(combinedObj) + hashedData := hash.Hash(combinedObj) msgID := string(hashedData[:20]) assert.Equal(t, msgID, p2p.MsgID(genesisValidatorsRoot, pMsg), "Got incorrect msg id") @@ -59,7 +59,7 @@ func TestMessageIDFunction_HashesCorrectlyAltair(t *testing.T) { combinedObj = append(params.BeaconNetworkConfig().MessageDomainValidSnappy[:], topicLenBytes...) combinedObj = append(combinedObj, tpc...) combinedObj = append(combinedObj, validObj[:]...) - hashedData = hashutil.Hash(combinedObj) + hashedData = hash.Hash(combinedObj) msgID = string(hashedData[:20]) assert.Equal(t, msgID, p2p.MsgID(genesisValidatorsRoot, nMsg), "Got incorrect msg id") } diff --git a/beacon-chain/p2p/peers/BUILD.bazel b/beacon-chain/p2p/peers/BUILD.bazel index 9fb70ffc25..20d2737491 100644 --- a/beacon-chain/p2p/peers/BUILD.bazel +++ b/beacon-chain/p2p/peers/BUILD.bazel @@ -9,10 +9,10 @@ go_library( "//beacon-chain/core:go_default_library", "//beacon-chain/p2p/peers/peerdata:go_default_library", "//beacon-chain/p2p/peers/scorers:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//time:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", "@com_github_libp2p_go_libp2p_core//network:go_default_library", diff --git a/beacon-chain/p2p/peers/scorers/BUILD.bazel b/beacon-chain/p2p/peers/scorers/BUILD.bazel index 667058ace3..72f93e2187 100644 --- a/beacon-chain/p2p/peers/scorers/BUILD.bazel +++ b/beacon-chain/p2p/peers/scorers/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "//beacon-chain/p2p/types:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/rand:go_default_library", "//time:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", @@ -41,8 +41,8 @@ go_test( "//beacon-chain/p2p/types:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/rand:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "//time:go_default_library", diff --git a/beacon-chain/p2p/peers/scorers/block_providers.go b/beacon-chain/p2p/peers/scorers/block_providers.go index 2c6951f90b..77b362a1ce 100644 --- a/beacon-chain/p2p/peers/scorers/block_providers.go +++ b/beacon-chain/p2p/peers/scorers/block_providers.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/peerdata" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" "github.com/prysmaticlabs/prysm/config/features" - "github.com/prysmaticlabs/prysm/shared/rand" + "github.com/prysmaticlabs/prysm/crypto/rand" prysmTime "github.com/prysmaticlabs/prysm/time" ) diff --git a/beacon-chain/p2p/peers/scorers/block_providers_test.go b/beacon-chain/p2p/peers/scorers/block_providers_test.go index a6b2422af7..fcf3213d8a 100644 --- a/beacon-chain/p2p/peers/scorers/block_providers_test.go +++ b/beacon-chain/p2p/peers/scorers/block_providers_test.go @@ -12,7 +12,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/scorers" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" "github.com/prysmaticlabs/prysm/config/features" - "github.com/prysmaticlabs/prysm/shared/rand" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/time" ) diff --git a/beacon-chain/p2p/peers/status.go b/beacon-chain/p2p/peers/status.go index 1a1f1a4075..d58acf132a 100644 --- a/beacon-chain/p2p/peers/status.go +++ b/beacon-chain/p2p/peers/status.go @@ -38,10 +38,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/peerdata" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/scorers" + "github.com/prysmaticlabs/prysm/crypto/rand" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/metadata" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" prysmTime "github.com/prysmaticlabs/prysm/time" ) diff --git a/beacon-chain/powchain/BUILD.bazel b/beacon-chain/powchain/BUILD.bazel index a3949dcb3a..50d6f4f827 100644 --- a/beacon-chain/powchain/BUILD.bazel +++ b/beacon-chain/powchain/BUILD.bazel @@ -31,11 +31,11 @@ go_library( "//beacon-chain/state/stategen:go_default_library", "//beacon-chain/state/v1:go_default_library", "//contracts/deposit-contract:go_default_library", + "//crypto/hash:go_default_library", "//monitoring/clientstats:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/httputils:go_default_library", "//shared/httputils/authorizationmethod:go_default_library", "//shared/logutil:go_default_library", @@ -83,9 +83,9 @@ go_test( "//beacon-chain/powchain/testing:go_default_library", "//beacon-chain/powchain/types:go_default_library", "//contracts/deposit-contract:go_default_library", + "//crypto/bls:go_default_library", "//monitoring/clientstats:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/httputils:go_default_library", diff --git a/beacon-chain/powchain/deposit_test.go b/beacon-chain/powchain/deposit_test.go index 80ce872f80..d4932382a3 100644 --- a/beacon-chain/powchain/deposit_test.go +++ b/beacon-chain/powchain/deposit_test.go @@ -8,8 +8,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/powchain/log_processing.go b/beacon-chain/powchain/log_processing.go index 0e5c4f930d..9c4960327c 100644 --- a/beacon-chain/powchain/log_processing.go +++ b/beacon-chain/powchain/log_processing.go @@ -18,16 +18,16 @@ import ( coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" protodb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/sirupsen/logrus" ) var ( - depositEventSignature = hashutil.HashKeccak256([]byte("DepositEvent(bytes,bytes,bytes,bytes,bytes)")) + depositEventSignature = hash.HashKeccak256([]byte("DepositEvent(bytes,bytes,bytes,bytes,bytes)")) ) const eth1DataSavingInterval = 100 diff --git a/beacon-chain/rpc/eth/beacon/BUILD.bazel b/beacon-chain/rpc/eth/beacon/BUILD.bazel index 4854b4086b..af3aeda8ec 100644 --- a/beacon-chain/rpc/eth/beacon/BUILD.bazel +++ b/beacon-chain/rpc/eth/beacon/BUILD.bazel @@ -36,13 +36,13 @@ go_library( "//beacon-chain/state/stategen:go_default_library", "//beacon-chain/state/v1:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/eth/v1:go_default_library", "//proto/eth/v2:go_default_library", "//proto/migration:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/grpcutils:go_default_library", "//shared/p2putils:go_default_library", @@ -90,6 +90,7 @@ go_test( "//beacon-chain/rpc/testutil:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", + "//crypto/bls:go_default_library", "//proto/eth/service:go_default_library", "//proto/eth/v1:go_default_library", "//proto/eth/v2:go_default_library", @@ -97,7 +98,6 @@ go_test( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/grpcutils:go_default_library", "//shared/params:go_default_library", diff --git a/beacon-chain/rpc/eth/beacon/pool.go b/beacon-chain/rpc/eth/beacon/pool.go index 97fa8ed202..c2e0847ff4 100644 --- a/beacon-chain/rpc/eth/beacon/pool.go +++ b/beacon-chain/rpc/eth/beacon/pool.go @@ -10,10 +10,10 @@ import ( corehelpers "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/helpers" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" "github.com/prysmaticlabs/prysm/proto/migration" ethpbalpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/grpcutils" "go.opencensus.io/trace" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/eth/beacon/pool_test.go b/beacon-chain/rpc/eth/beacon/pool_test.go index 0675aae971..07fac897ed 100644 --- a/beacon-chain/rpc/eth/beacon/pool_test.go +++ b/beacon-chain/rpc/eth/beacon/pool_test.go @@ -17,10 +17,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/operations/slashings" "github.com/prysmaticlabs/prysm/beacon-chain/operations/voluntaryexits" p2pMock "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1" "github.com/prysmaticlabs/prysm/proto/migration" ethpb_v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/beacon-chain/rpc/eth/validator/BUILD.bazel b/beacon-chain/rpc/eth/validator/BUILD.bazel index c36e73343b..e66fb5c267 100644 --- a/beacon-chain/rpc/eth/validator/BUILD.bazel +++ b/beacon-chain/rpc/eth/validator/BUILD.bazel @@ -64,12 +64,12 @@ go_test( "//beacon-chain/rpc/testutil:go_default_library", "//beacon-chain/state/stategen:go_default_library", "//beacon-chain/sync/initial-sync/testing:go_default_library", + "//crypto/bls:go_default_library", "//proto/eth/v1:go_default_library", "//proto/eth/v2:go_default_library", "//proto/migration:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/rpc/eth/validator/validator_test.go b/beacon-chain/rpc/eth/validator/validator_test.go index 6d0d114b8e..984ee6bb0f 100644 --- a/beacon-chain/rpc/eth/validator/validator_test.go +++ b/beacon-chain/rpc/eth/validator/validator_test.go @@ -28,12 +28,12 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/rpc/testutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpbv2 "github.com/prysmaticlabs/prysm/proto/eth/v2" "github.com/prysmaticlabs/prysm/proto/migration" ethpbalpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" sharedtestutil "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index 12e1988e4f..5943bf5f9d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -42,6 +42,9 @@ go_library( "//beacon-chain/state/stategen:go_default_library", "//beacon-chain/sync:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", + "//crypto/rand:go_default_library", "//monitoring/tracing:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", @@ -50,14 +53,11 @@ go_library( "//shared/aggregation:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/aggregation/sync_contribution:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/depositutil:go_default_library", "//shared/event:go_default_library", - "//shared/hashutil:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//shared/trieutil:go_default_library", "//shared/version:go_default_library", "//time:go_default_library", @@ -119,12 +119,12 @@ go_test( "//beacon-chain/state/v1:go_default_library", "//beacon-chain/sync/initial-sync/testing:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/aggregation/attestations:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/mock:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go index c317b19f0c..be5f975e20 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/aggregator_test.go @@ -14,10 +14,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go index 4a57a4c0b0..699fafda02 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go @@ -13,11 +13,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" beaconState "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/rand" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" prysmTime "github.com/prysmaticlabs/prysm/time" "github.com/prysmaticlabs/prysm/time/slots" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go index 03eea5a59f..861c9fb6a1 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go @@ -13,8 +13,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go index 43cc5dda8c..1cb51976e8 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester_test.go @@ -17,9 +17,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go index 93d4926fef..2c1556d0e6 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go @@ -21,17 +21,17 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/interop" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" + "github.com/prysmaticlabs/prysm/crypto/rand" dbpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" synccontribution "github.com/prysmaticlabs/prysm/shared/aggregation/sync_contribution" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/trieutil" "github.com/sirupsen/logrus" "go.opencensus.io/trace" @@ -550,8 +550,8 @@ func (vs *Server) mockETH1DataVote(ctx context.Context, slot types.Slot) (*ethpb } var enc []byte enc = fastssz.MarshalUint64(enc, uint64(core.SlotToEpoch(slot))+uint64(slotInVotingPeriod)) - depRoot := hashutil.Hash(enc) - blockHash := hashutil.Hash(depRoot[:]) + depRoot := hash.Hash(enc) + blockHash := hash.Hash(depRoot[:]) return ðpb.Eth1Data{ DepositRoot: depRoot[:], DepositCount: headState.Eth1DepositIndex(), @@ -572,8 +572,8 @@ func (vs *Server) randomETH1DataVote(ctx context.Context) (*ethpb.Eth1Data, erro // set random roots and block hashes to prevent a majority from being // built if the eth1 node is offline randGen := rand.NewGenerator() - depRoot := hashutil.Hash(bytesutil.Bytes32(randGen.Uint64())) - blockHash := hashutil.Hash(bytesutil.Bytes32(randGen.Uint64())) + depRoot := hash.Hash(bytesutil.Bytes32(randGen.Uint64())) + blockHash := hash.Hash(bytesutil.Bytes32(randGen.Uint64())) return ðpb.Eth1Data{ DepositRoot: depRoot[:], DepositCount: headState.Eth1DepositIndex(), diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go index 8b370d2ee7..7e9a0114c7 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go @@ -22,13 +22,13 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" dbpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" statepb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go index 3afb86903e..ef8b648d66 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/server_test.go @@ -14,8 +14,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go index 47fd0d8754..18b5ade930 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/status_test.go @@ -16,8 +16,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go index 500a34fa7d..c0665743d6 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "golang.org/x/sync/errgroup" diff --git a/beacon-chain/state/fieldtrie/BUILD.bazel b/beacon-chain/state/fieldtrie/BUILD.bazel index 1e3d59e020..bded299c78 100644 --- a/beacon-chain/state/fieldtrie/BUILD.bazel +++ b/beacon-chain/state/fieldtrie/BUILD.bazel @@ -11,8 +11,8 @@ go_library( deps = [ "//beacon-chain/state/stateutil:go_default_library", "//beacon-chain/state/types:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/hashutil:go_default_library", "//shared/version:go_default_library", "@com_github_pkg_errors//:go_default_library", ], diff --git a/beacon-chain/state/fieldtrie/field_trie_helpers.go b/beacon-chain/state/fieldtrie/field_trie_helpers.go index 257d732a7d..5ea39f8681 100644 --- a/beacon-chain/state/fieldtrie/field_trie_helpers.go +++ b/beacon-chain/state/fieldtrie/field_trie_helpers.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/types" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/version" ) @@ -72,7 +72,7 @@ func HandleEth1DataSlice(val []*ethpb.Eth1Data, indices []uint64, convertAll boo length = len(val) } roots := make([][32]byte, 0, length) - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.Eth1Data) error { newRoot, err := stateutil.Eth1DataRootWithHasher(hasher, input) if err != nil { @@ -110,7 +110,7 @@ func handlePendingAttestation(val []*ethpb.PendingAttestation, indices []uint64, length = len(val) } roots := make([][32]byte, 0, length) - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.PendingAttestation) error { newRoot, err := stateutil.PendingAttRootWithHasher(hasher, input) if err != nil { diff --git a/beacon-chain/state/stateutil/BUILD.bazel b/beacon-chain/state/stateutil/BUILD.bazel index d57e54c11d..d6acfb527c 100644 --- a/beacon-chain/state/stateutil/BUILD.bazel +++ b/beacon-chain/state/stateutil/BUILD.bazel @@ -27,9 +27,9 @@ go_library( ], deps = [ "//beacon-chain/core/transition/stateutils:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/params:go_default_library", "//shared/trieutil:go_default_library", @@ -52,9 +52,9 @@ go_test( deps = [ "//beacon-chain/state/v1:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/interop:go_default_library", "//shared/params:go_default_library", @@ -81,8 +81,8 @@ go_test( ], deps = [ "//beacon-chain/state/stateutil:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/beacon-chain/state/stateutil/benchmark_test.go b/beacon-chain/state/stateutil/benchmark_test.go index b72712c7e7..98b54a8246 100644 --- a/beacon-chain/state/stateutil/benchmark_test.go +++ b/beacon-chain/state/stateutil/benchmark_test.go @@ -3,7 +3,7 @@ package stateutil_test import ( "testing" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) @@ -18,7 +18,7 @@ func BenchmarkMerkleize_Buffered(b *testing.B) { leafIndexer := func(i uint64) []byte { return chunks[i][:] } - return htrutils.Merkleize(htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()), count, limit, leafIndexer), nil + return htrutils.Merkleize(htrutils.NewHasherFunc(hash.CustomSHA256Hasher()), count, limit, leafIndexer), nil } b.ResetTimer() diff --git a/beacon-chain/state/stateutil/block_header_root.go b/beacon-chain/state/stateutil/block_header_root.go index a2edfa045c..53f0baabf7 100644 --- a/beacon-chain/state/stateutil/block_header_root.go +++ b/beacon-chain/state/stateutil/block_header_root.go @@ -3,9 +3,9 @@ package stateutil import ( "encoding/binary" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" ) @@ -30,5 +30,5 @@ func BlockHeaderRoot(header *ethpb.BeaconBlockHeader) ([32]byte, error) { bodyRoot := bytesutil.ToBytes32(header.BodyRoot) fieldRoots[4] = bodyRoot[:] } - return htrutils.BitwiseMerkleize(hashutil.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return htrutils.BitwiseMerkleize(hash.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } diff --git a/beacon-chain/state/stateutil/eth1_root.go b/beacon-chain/state/stateutil/eth1_root.go index 4eabd14022..269b70ecd5 100644 --- a/beacon-chain/state/stateutil/eth1_root.go +++ b/beacon-chain/state/stateutil/eth1_root.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -65,7 +65,7 @@ func Eth1DataRootWithHasher(hasher htrutils.HashFn, eth1Data *ethpb.Eth1Data) ([ // Eth1DatasEncKey returns the encoded key in bytes of input `eth1Data`s, // the returned key bytes can be used for caching purposes. func Eth1DatasEncKey(eth1Datas []*ethpb.Eth1Data) ([32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() enc := make([]byte, len(eth1Datas)*32) for i := 0; i < len(eth1Datas); i++ { eth1, err := Eth1DataRootWithHasher(hasher, eth1Datas[i]) @@ -74,13 +74,13 @@ func Eth1DatasEncKey(eth1Datas []*ethpb.Eth1Data) ([32]byte, error) { } copy(enc[(i*32):(i+1)*32], eth1[:]) } - hashKey := hashutil.FastSum256(enc) + hashKey := hash.FastSum256(enc) return hashKey, nil } // Eth1DatasRoot returns the hash tree root of input `eth1Datas`. func Eth1DatasRoot(eth1Datas []*ethpb.Eth1Data) ([32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() eth1VotesRoots := make([][]byte, 0) for i := 0; i < len(eth1Datas); i++ { eth1, err := Eth1DataRootWithHasher(hasher, eth1Datas[i]) diff --git a/beacon-chain/state/stateutil/trie_helpers.go b/beacon-chain/state/stateutil/trie_helpers.go index f01ced5d7c..266fdea6a4 100644 --- a/beacon-chain/state/stateutil/trie_helpers.go +++ b/beacon-chain/state/stateutil/trie_helpers.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/trieutil" ) @@ -14,7 +14,7 @@ import ( // provided with the elements of a fixed sized trie and the corresponding depth of // it. func ReturnTrieLayer(elements [][32]byte, length uint64) [][]*[32]byte { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() leaves := elements if len(leaves) == 1 { @@ -65,7 +65,7 @@ func merkleizeTrieLeaves(layers [][][32]byte, hashLayer [][32]byte, // provided with the elements of a variable sized trie and the corresponding depth of // it. func ReturnTrieLayerVariable(elements [][32]byte, length uint64) [][]*[32]byte { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() depth := htrutils.Depth(length) layers := make([][]*[32]byte, depth+1) // Return zerohash at depth @@ -107,7 +107,7 @@ func ReturnTrieLayerVariable(elements [][32]byte, length uint64) [][]*[32]byte { // RecomputeFromLayer recomputes specific branches of a fixed sized trie depending on the provided changed indexes. func RecomputeFromLayer(changedLeaves [][32]byte, changedIdx []uint64, layer [][]*[32]byte) ([32]byte, [][]*[32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() for i, idx := range changedIdx { layer[0][idx] = &changedLeaves[i] } @@ -140,7 +140,7 @@ func RecomputeFromLayer(changedLeaves [][32]byte, changedIdx []uint64, layer [][ // RecomputeFromLayerVariable recomputes specific branches of a variable sized trie depending on the provided changed indexes. func RecomputeFromLayerVariable(changedLeaves [][32]byte, changedIdx []uint64, layer [][]*[32]byte) ([32]byte, [][]*[32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() if len(changedIdx) == 0 { return *layer[0][0], layer, nil } @@ -259,7 +259,7 @@ func AddInMixin(root [32]byte, length uint64) ([32]byte, error) { // the resulting layers of the trie based on the appropriate depth. This function // pads the leaves to a length of 32. func Merkleize(leaves [][]byte) [][][]byte { - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() layers := make([][][]byte, htrutils.Depth(uint64(len(leaves)))+1) for len(leaves) != 32 { leaves = append(leaves, make([]byte, 32)) diff --git a/beacon-chain/state/stateutil/trie_helpers_test.go b/beacon-chain/state/stateutil/trie_helpers_test.go index 2db7a3ad6d..6918bab562 100644 --- a/beacon-chain/state/stateutil/trie_helpers_test.go +++ b/beacon-chain/state/stateutil/trie_helpers_test.go @@ -6,9 +6,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" @@ -33,7 +33,7 @@ func TestReturnTrieLayerVariable_OK(t *testing.T) { newState, _ := testutil.DeterministicGenesisState(t, 32) root, err := v1.ValidatorRegistryRoot(newState.Validators()) require.NoError(t, err) - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() validators := newState.Validators() roots := make([][32]byte, 0, len(validators)) for _, val := range validators { @@ -72,7 +72,7 @@ func TestRecomputeFromLayer_FixedSizedArray(t *testing.T) { func TestRecomputeFromLayer_VariableSizedArray(t *testing.T) { newState, _ := testutil.DeterministicGenesisState(t, 32) validators := newState.Validators() - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() roots := make([][32]byte, 0, len(validators)) for _, val := range validators { rt, err := stateutil.ValidatorRootWithHasher(hasher, val) diff --git a/beacon-chain/state/stateutil/validator_root.go b/beacon-chain/state/stateutil/validator_root.go index 0b08bad0df..704f49f283 100644 --- a/beacon-chain/state/stateutil/validator_root.go +++ b/beacon-chain/state/stateutil/validator_root.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -58,7 +58,7 @@ func ValidatorRootWithHasher(hasher htrutils.HashFn, validator *ethpb.Validator) // Uint64ListRootWithRegistryLimit computes the HashTreeRoot Merkleization of // a list of uint64 and mixed with registry limit. func Uint64ListRootWithRegistryLimit(balances []uint64) ([32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() balancesMarshaling := make([][]byte, 0) for i := 0; i < len(balances); i++ { balanceBuf := make([]byte, 8) @@ -135,7 +135,7 @@ func HandleValidatorSlice(val []*ethpb.Validator, indices []uint64, convertAll b length = len(val) } roots := make([][32]byte, 0, length) - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() rootCreator := func(input *ethpb.Validator) error { newRoot, err := ValidatorRootWithHasher(hasher, input) if err != nil { diff --git a/beacon-chain/state/v1/BUILD.bazel b/beacon-chain/state/v1/BUILD.bazel index a0354ed8a2..0c5ea582e5 100644 --- a/beacon-chain/state/v1/BUILD.bazel +++ b/beacon-chain/state/v1/BUILD.bazel @@ -48,10 +48,10 @@ go_library( "//beacon-chain/state/stateutil:go_default_library", "//beacon-chain/state/types:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", diff --git a/beacon-chain/state/v1/field_roots.go b/beacon-chain/state/v1/field_roots.go index cf2f8d8576..7cedd69601 100644 --- a/beacon-chain/state/v1/field_roots.go +++ b/beacon-chain/state/v1/field_roots.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" @@ -63,7 +63,7 @@ func (h *stateRootHasher) computeFieldRootsWithHasher(ctx context.Context, state if state == nil { return nil, errors.New("nil state") } - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() fieldRoots := make([][]byte, params.BeaconConfig().BeaconStateFieldCount) // Genesis time root. diff --git a/beacon-chain/state/v1/getters_attestation.go b/beacon-chain/state/v1/getters_attestation.go index b5d0e0a440..f915573598 100644 --- a/beacon-chain/state/v1/getters_attestation.go +++ b/beacon-chain/state/v1/getters_attestation.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -69,7 +69,7 @@ func (h *stateRootHasher) epochAttestationsRoot(atts []*ethpb.PendingAttestation return [32]byte{}, fmt.Errorf("epoch attestation exceeds max length %d", max) } - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() roots := make([][]byte, len(atts)) for i := 0; i < len(atts); i++ { pendingRoot, err := h.pendingAttestationRoot(hasher, atts[i]) diff --git a/beacon-chain/state/v1/getters_misc.go b/beacon-chain/state/v1/getters_misc.go index 3f9b531739..61036f03e8 100644 --- a/beacon-chain/state/v1/getters_misc.go +++ b/beacon-chain/state/v1/getters_misc.go @@ -5,9 +5,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/version" @@ -179,7 +179,7 @@ func RootsArrayHashTreeRoot(vals [][]byte, length uint64, fieldName string) ([32 func (h *stateRootHasher) arraysRoot(input [][]byte, length uint64, fieldName string) ([32]byte, error) { lock.Lock() defer lock.Unlock() - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() if _, ok := layersCache[fieldName]; !ok && h.rootsCache != nil { depth := htrutils.Depth(length) layersCache[fieldName] = make([][][32]byte, depth+1) diff --git a/beacon-chain/state/v1/getters_validator.go b/beacon-chain/state/v1/getters_validator.go index e36bb61182..939438824e 100644 --- a/beacon-chain/state/v1/getters_validator.go +++ b/beacon-chain/state/v1/getters_validator.go @@ -10,9 +10,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -306,8 +306,8 @@ func (b *BeaconState) slashings() []uint64 { func (h *stateRootHasher) validatorRegistryRoot(validators []*ethpb.Validator) ([32]byte, error) { hashKeyElements := make([]byte, len(validators)*32) roots := make([][32]byte, len(validators)) - emptyKey := hashutil.FastSum256(hashKeyElements) - hasher := hashutil.CustomSHA256Hasher() + emptyKey := hash.FastSum256(hashKeyElements) + hasher := hash.CustomSHA256Hasher() bytesProcessed := 0 for i := 0; i < len(validators); i++ { val, err := h.validatorRoot(hasher, validators[i]) @@ -319,7 +319,7 @@ func (h *stateRootHasher) validatorRegistryRoot(validators []*ethpb.Validator) ( bytesProcessed += 32 } - hashKey := hashutil.FastSum256(hashKeyElements) + hashKey := hash.FastSum256(hashKeyElements) if hashKey != emptyKey && h.rootsCache != nil { if found, ok := h.rootsCache.Get(string(hashKey[:])); found != nil && ok { return found.([32]byte), nil diff --git a/beacon-chain/state/v1/setters_misc.go b/beacon-chain/state/v1/setters_misc.go index 62e1e3bbaf..f3cef51867 100644 --- a/beacon-chain/state/v1/setters_misc.go +++ b/beacon-chain/state/v1/setters_misc.go @@ -5,8 +5,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" stateTypes "github.com/prysmaticlabs/prysm/beacon-chain/state/types" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "google.golang.org/protobuf/proto" ) @@ -131,7 +131,7 @@ func (b *BeaconState) AppendHistoricalRoots(root [32]byte) error { // of the beacon state. This method performs slice reads and the caller MUST // hold the lock before calling this method. func (b *BeaconState) recomputeRoot(idx int) { - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() layers := b.merkleLayers // The merkle tree structure looks as follows: // [[r1, r2, r3, r4], [parent1, parent2], [root]] diff --git a/beacon-chain/state/v1/state_trie.go b/beacon-chain/state/v1/state_trie.go index 7802955207..1327cb4b1a 100644 --- a/beacon-chain/state/v1/state_trie.go +++ b/beacon-chain/state/v1/state_trie.go @@ -12,10 +12,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/fieldtrie" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/types" + "github.com/prysmaticlabs/prysm/crypto/hash" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" @@ -391,7 +391,7 @@ func (b *BeaconState) rootSelector(ctx context.Context, field types.FieldIndex) defer span.End() span.AddAttributes(trace.StringAttribute("field", field.String(b.Version()))) - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() switch field { case genesisTime: return htrutils.Uint64Root(b.state.GenesisTime), nil diff --git a/beacon-chain/state/v2/BUILD.bazel b/beacon-chain/state/v2/BUILD.bazel index 467b7ce489..abd9600a38 100644 --- a/beacon-chain/state/v2/BUILD.bazel +++ b/beacon-chain/state/v2/BUILD.bazel @@ -30,10 +30,10 @@ go_library( "//beacon-chain/state/types:go_default_library", "//beacon-chain/state/v1:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/htrutils:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", diff --git a/beacon-chain/state/v2/field_root_participation_bit.go b/beacon-chain/state/v2/field_root_participation_bit.go index 46be679bbc..2a44fd29de 100644 --- a/beacon-chain/state/v2/field_root_participation_bit.go +++ b/beacon-chain/state/v2/field_root_participation_bit.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -12,7 +12,7 @@ import ( // participationBitsRoot computes the HashTreeRoot merkleization of // participation roots. func participationBitsRoot(bits []byte) ([32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() chunkedRoots, err := packParticipationBits(bits) if err != nil { return [32]byte{}, err diff --git a/beacon-chain/state/v2/field_root_sync_committee.go b/beacon-chain/state/v2/field_root_sync_committee.go index 611a9d118d..aaddd6f9b9 100644 --- a/beacon-chain/state/v2/field_root_sync_committee.go +++ b/beacon-chain/state/v2/field_root_sync_committee.go @@ -1,8 +1,8 @@ package v2 import ( + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" ) @@ -10,7 +10,7 @@ import ( // a SyncCommitteeRoot struct according to the eth2 // Simple Serialize specification. func syncCommitteeRoot(committee *ethpb.SyncCommittee) ([32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() var fieldRoots [][32]byte if committee == nil { return [32]byte{}, nil diff --git a/beacon-chain/state/v2/field_root_validator.go b/beacon-chain/state/v2/field_root_validator.go index 7b7df74aaa..606d436e15 100644 --- a/beacon-chain/state/v2/field_root_validator.go +++ b/beacon-chain/state/v2/field_root_validator.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -16,8 +16,8 @@ import ( func (h *stateRootHasher) validatorRegistryRoot(validators []*ethpb.Validator) ([32]byte, error) { hashKeyElements := make([]byte, len(validators)*32) roots := make([][32]byte, len(validators)) - emptyKey := hashutil.FastSum256(hashKeyElements) - hasher := hashutil.CustomSHA256Hasher() + emptyKey := hash.FastSum256(hashKeyElements) + hasher := hash.CustomSHA256Hasher() bytesProcessed := 0 for i := 0; i < len(validators); i++ { val, err := h.validatorRoot(hasher, validators[i]) @@ -29,7 +29,7 @@ func (h *stateRootHasher) validatorRegistryRoot(validators []*ethpb.Validator) ( bytesProcessed += 32 } - hashKey := hashutil.FastSum256(hashKeyElements) + hashKey := hash.FastSum256(hashKeyElements) if hashKey != emptyKey && h.rootsCache != nil { if found, ok := h.rootsCache.Get(string(hashKey[:])); found != nil && ok { return found.([32]byte), nil diff --git a/beacon-chain/state/v2/field_root_vector.go b/beacon-chain/state/v2/field_root_vector.go index ca90dce34d..c581f96b52 100644 --- a/beacon-chain/state/v2/field_root_vector.go +++ b/beacon-chain/state/v2/field_root_vector.go @@ -3,14 +3,14 @@ package v2 import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" ) func (h *stateRootHasher) arraysRoot(input [][]byte, length uint64, fieldName string) ([32]byte, error) { lock.Lock() defer lock.Unlock() - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() if _, ok := layersCache[fieldName]; !ok && h.rootsCache != nil { depth := htrutils.Depth(length) layersCache[fieldName] = make([][][32]byte, depth+1) diff --git a/beacon-chain/state/v2/field_roots.go b/beacon-chain/state/v2/field_roots.go index bbcd5c0ae0..637ebd9670 100644 --- a/beacon-chain/state/v2/field_roots.go +++ b/beacon-chain/state/v2/field_roots.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -58,7 +58,7 @@ func (h *stateRootHasher) computeFieldRootsWithHasher(state *ethpb.BeaconStateAl if state == nil { return nil, errors.New("nil state") } - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() fieldRoots := make([][]byte, params.BeaconConfig().BeaconStateAltairFieldCount) // Genesis time root. diff --git a/beacon-chain/state/v2/setters.go b/beacon-chain/state/v2/setters.go index cf2bba5329..3388fc2e98 100644 --- a/beacon-chain/state/v2/setters.go +++ b/beacon-chain/state/v2/setters.go @@ -8,9 +8,9 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" stateTypes "github.com/prysmaticlabs/prysm/beacon-chain/state/types" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "google.golang.org/protobuf/proto" ) @@ -769,7 +769,7 @@ func (b *BeaconState) SetInactivityScores(val []uint64) error { // of the beacon state. This method performs map reads and the caller MUST // hold the lock before calling this method. func (b *BeaconState) recomputeRoot(idx int) { - hashFunc := hashutil.CustomSHA256Hasher() + hashFunc := hash.CustomSHA256Hasher() layers := b.merkleLayers // The merkle tree structure looks as follows: // [[r1, r2, r3, r4], [parent1, parent2], [root]] diff --git a/beacon-chain/state/v2/state_trie.go b/beacon-chain/state/v2/state_trie.go index 614965bc29..6ea446717e 100644 --- a/beacon-chain/state/v2/state_trie.go +++ b/beacon-chain/state/v2/state_trie.go @@ -10,9 +10,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/fieldtrie" "github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil" "github.com/prysmaticlabs/prysm/beacon-chain/state/types" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" @@ -237,7 +237,7 @@ func (b *BeaconState) IsNil() bool { } func (b *BeaconState) rootSelector(field types.FieldIndex) ([32]byte, error) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() switch field { case genesisTime: return htrutils.Uint64Root(b.state.GenesisTime), nil diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel index 006d72d494..fd2d6e2367 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/sync/BUILD.bazel @@ -77,6 +77,8 @@ go_library( "//cache/lru:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/rand:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", @@ -84,13 +86,11 @@ go_library( "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared:go_default_library", "//shared/abool:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/messagehandler:go_default_library", "//shared/mputil:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//shared/runutil:go_default_library", "//shared/sliceutil:go_default_library", "//shared/sszutil:go_default_library", @@ -184,17 +184,17 @@ go_test( "//beacon-chain/sync/initial-sync/testing:go_default_library", "//cache/lru:go_default_library", "//cmd/beacon-chain/flags:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/abool:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//shared/sszutil:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/sync/batch_verifier.go b/beacon-chain/sync/batch_verifier.go index f66f08c2a9..6fdeb5dd87 100644 --- a/beacon-chain/sync/batch_verifier.go +++ b/beacon-chain/sync/batch_verifier.go @@ -6,8 +6,8 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" - "github.com/prysmaticlabs/prysm/shared/bls" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/batch_verifier_test.go b/beacon-chain/sync/batch_verifier_test.go index 90fda60ea3..5bd06c59ef 100644 --- a/beacon-chain/sync/batch_verifier_test.go +++ b/beacon-chain/sync/batch_verifier_test.go @@ -5,7 +5,7 @@ import ( "testing" pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/beacon-chain/sync/initial-sync/BUILD.bazel b/beacon-chain/sync/initial-sync/BUILD.bazel index e47e0bfb1b..8159392656 100644 --- a/beacon-chain/sync/initial-sync/BUILD.bazel +++ b/beacon-chain/sync/initial-sync/BUILD.bazel @@ -28,6 +28,7 @@ go_library( "//beacon-chain/p2p/types:go_default_library", "//beacon-chain/sync:go_default_library", "//cmd/beacon-chain/flags:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//shared:go_default_library", @@ -35,7 +36,6 @@ go_library( "//shared/bytesutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//time:go_default_library", "@com_github_kevinms_leakybucket_go//:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", @@ -73,10 +73,10 @@ go_test( "//beacon-chain/sync:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", "//shared/testutil:go_default_library", @@ -121,13 +121,13 @@ go_test( "//beacon-chain/sync:go_default_library", "//cmd/beacon-chain/flags:go_default_library", "//config/features:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/abool:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", "//shared/testutil:go_default_library", diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher.go b/beacon-chain/sync/initial-sync/blocks_fetcher.go index 0b0b0e4bc0..3d303f0a0d 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher.go @@ -15,10 +15,10 @@ import ( p2pTypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" prysmsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" + "github.com/prysmaticlabs/prysm/crypto/rand" p2ppb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/sirupsen/logrus" "go.opencensus.io/trace" ) diff --git a/beacon-chain/sync/initial-sync/initial_sync_test.go b/beacon-chain/sync/initial-sync/initial_sync_test.go index cda07c7d1b..47c12577e7 100644 --- a/beacon-chain/sync/initial-sync/initial_sync_test.go +++ b/beacon-chain/sync/initial-sync/initial_sync_test.go @@ -22,11 +22,11 @@ import ( beaconsync "github.com/prysmaticlabs/prysm/beacon-chain/sync" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" p2ppb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/testutil" @@ -205,7 +205,7 @@ func connectPeer(t *testing.T, host *p2pt.TestP2P, datum *peerData, peerStatus * blk.Block.ParentRoot = parentRoot[:] // If forked peer, give a different parent root. if datum.forkedPeer { - newRoot := hashutil.Hash(parentRoot[:]) + newRoot := hash.Hash(parentRoot[:]) blk.Block.ParentRoot = newRoot[:] } ret = append(ret, blk) diff --git a/beacon-chain/sync/pending_attestations_queue.go b/beacon-chain/sync/pending_attestations_queue.go index 667145e74a..e7dcf0c9f6 100644 --- a/beacon-chain/sync/pending_attestations_queue.go +++ b/beacon-chain/sync/pending_attestations_queue.go @@ -9,10 +9,10 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/rand" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/runutil" "github.com/prysmaticlabs/prysm/time/slots" "github.com/sirupsen/logrus" diff --git a/beacon-chain/sync/pending_attestations_queue_test.go b/beacon-chain/sync/pending_attestations_queue_test.go index c6932fca43..55188d819a 100644 --- a/beacon-chain/sync/pending_attestations_queue_test.go +++ b/beacon-chain/sync/pending_attestations_queue_test.go @@ -16,12 +16,12 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/abool" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/pending_blocks_queue.go b/beacon-chain/sync/pending_blocks_queue.go index 05d8f3280e..58dcfdf92f 100644 --- a/beacon-chain/sync/pending_blocks_queue.go +++ b/beacon-chain/sync/pending_blocks_queue.go @@ -12,11 +12,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/monitoring/tracing" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/runutil" "github.com/prysmaticlabs/prysm/shared/sszutil" "github.com/prysmaticlabs/prysm/time/slots" diff --git a/beacon-chain/sync/pending_blocks_queue_test.go b/beacon-chain/sync/pending_blocks_queue_test.go index d101dcdb0b..4df7a5847b 100644 --- a/beacon-chain/sync/pending_blocks_queue_test.go +++ b/beacon-chain/sync/pending_blocks_queue_test.go @@ -19,10 +19,10 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" + "github.com/prysmaticlabs/prysm/crypto/rand" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/sync/service_test.go b/beacon-chain/sync/service_test.go index b7be42d93b..9922f966a6 100644 --- a/beacon-chain/sync/service_test.go +++ b/beacon-chain/sync/service_test.go @@ -13,9 +13,9 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/abool" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/sync/validate_aggregate_proof.go b/beacon-chain/sync/validate_aggregate_proof.go index 4c5c0fe200..ac6cca6f43 100644 --- a/beacon-chain/sync/validate_aggregate_proof.go +++ b/beacon-chain/sync/validate_aggregate_proof.go @@ -16,9 +16,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" diff --git a/beacon-chain/sync/validate_aggregate_proof_test.go b/beacon-chain/sync/validate_aggregate_proof_test.go index e5c75f0d37..27ac23b058 100644 --- a/beacon-chain/sync/validate_aggregate_proof_test.go +++ b/beacon-chain/sync/validate_aggregate_proof_test.go @@ -19,10 +19,10 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/validate_attester_slashing_test.go b/beacon-chain/sync/validate_attester_slashing_test.go index 10bcd7eb96..b52c6d7822 100644 --- a/beacon-chain/sync/validate_attester_slashing_test.go +++ b/beacon-chain/sync/validate_attester_slashing_test.go @@ -17,8 +17,8 @@ import ( p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" "github.com/prysmaticlabs/prysm/beacon-chain/state" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/beacon-chain/sync/validate_beacon_blocks_test.go b/beacon-chain/sync/validate_beacon_blocks_test.go index ae1f2a2ec9..7f02c8a979 100644 --- a/beacon-chain/sync/validate_beacon_blocks_test.go +++ b/beacon-chain/sync/validate_beacon_blocks_test.go @@ -23,10 +23,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/abool" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/validate_proposer_slashing_test.go b/beacon-chain/sync/validate_proposer_slashing_test.go index 2bebcc24e1..d3134feea5 100644 --- a/beacon-chain/sync/validate_proposer_slashing_test.go +++ b/beacon-chain/sync/validate_proposer_slashing_test.go @@ -21,8 +21,8 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/beacon-chain/sync/validate_sync_committee_message.go b/beacon-chain/sync/validate_sync_committee_message.go index 6b43891c5d..da78420765 100644 --- a/beacon-chain/sync/validate_sync_committee_message.go +++ b/beacon-chain/sync/validate_sync_committee_message.go @@ -14,9 +14,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" diff --git a/beacon-chain/sync/validate_sync_contribution_proof.go b/beacon-chain/sync/validate_sync_contribution_proof.go index f4516aeb64..108aeda815 100644 --- a/beacon-chain/sync/validate_sync_contribution_proof.go +++ b/beacon-chain/sync/validate_sync_contribution_proof.go @@ -11,9 +11,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" diff --git a/beacon-chain/sync/validate_sync_contribution_proof_test.go b/beacon-chain/sync/validate_sync_contribution_proof_test.go index 4339ec1492..9c81bba28c 100644 --- a/beacon-chain/sync/validate_sync_contribution_proof_test.go +++ b/beacon-chain/sync/validate_sync_contribution_proof_test.go @@ -26,9 +26,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/beacon-chain/sync/validate_voluntary_exit_test.go b/beacon-chain/sync/validate_voluntary_exit_test.go index be9e6f044f..c612825c34 100644 --- a/beacon-chain/sync/validate_voluntary_exit_test.go +++ b/beacon-chain/sync/validate_voluntary_exit_test.go @@ -19,8 +19,8 @@ import ( v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/shared/bls/BUILD.bazel b/crypto/bls/BUILD.bazel similarity index 67% rename from shared/bls/BUILD.bazel rename to crypto/bls/BUILD.bazel index a2b5eeef26..cb7fa686b3 100644 --- a/shared/bls/BUILD.bazel +++ b/crypto/bls/BUILD.bazel @@ -9,12 +9,12 @@ go_library( "interface.go", "signature_set.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/bls", + importpath = "github.com/prysmaticlabs/prysm/crypto/bls", visibility = ["//visibility:public"], deps = [ - "//shared/bls/blst:go_default_library", - "//shared/bls/common:go_default_library", - "//shared/bls/herumi:go_default_library", + "//crypto/bls/blst:go_default_library", + "//crypto/bls/common:go_default_library", + "//crypto/bls/herumi:go_default_library", "@com_github_pkg_errors//:go_default_library", ], ) @@ -27,8 +27,8 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//shared/bls/common:go_default_library", - "//shared/rand:go_default_library", + "//crypto/bls/common:go_default_library", + "//crypto/rand:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", ], diff --git a/shared/bls/bls.go b/crypto/bls/bls.go similarity index 93% rename from shared/bls/bls.go rename to crypto/bls/bls.go index 16c191a30a..d1ff9c0425 100644 --- a/shared/bls/bls.go +++ b/crypto/bls/bls.go @@ -7,9 +7,9 @@ import ( "math/big" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/bls/blst" - "github.com/prysmaticlabs/prysm/shared/bls/common" - "github.com/prysmaticlabs/prysm/shared/bls/herumi" + "github.com/prysmaticlabs/prysm/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/crypto/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/herumi" ) // Initialize herumi temporarily while we transition to blst for ethdo. diff --git a/shared/bls/bls_test.go b/crypto/bls/bls_test.go similarity index 94% rename from shared/bls/bls_test.go rename to crypto/bls/bls_test.go index 7239d42d5e..61e6e968fe 100644 --- a/shared/bls/bls_test.go +++ b/crypto/bls/bls_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/prysmaticlabs/prysm/shared/bls/common" - "github.com/prysmaticlabs/prysm/shared/rand" + "github.com/prysmaticlabs/prysm/crypto/bls/common" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/bls/blst/BUILD.bazel b/crypto/bls/blst/BUILD.bazel similarity index 90% rename from shared/bls/blst/BUILD.bazel rename to crypto/bls/blst/BUILD.bazel index 3205ac5709..97ce153dc5 100644 --- a/shared/bls/blst/BUILD.bazel +++ b/crypto/bls/blst/BUILD.bazel @@ -94,9 +94,9 @@ go_library( "stub.go", ], }), - importpath = "github.com/prysmaticlabs/prysm/shared/bls/blst", + importpath = "github.com/prysmaticlabs/prysm/crypto/bls/blst", visibility = [ - "//shared/bls:__pkg__", + "//crypto/bls:__pkg__", ], deps = selects.with_or({ ( @@ -107,15 +107,15 @@ go_library( ":android_amd64", ":android_arm64", ): [ - "//shared/bls/common:go_default_library", + "//crypto/bls/common:go_default_library", "//config/features:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", + "//crypto/rand:go_default_library", "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_supranational_blst//:go_default_library", ], - "//conditions:default": ["//shared/bls/common:go_default_library"], + "//conditions:default": ["//crypto/bls/common:go_default_library"], }), ) @@ -145,8 +145,8 @@ go_test( ":android_amd64", ":android_arm64", ): [ - "//shared/bls/blst:go_default_library", - "//shared/bls/common:go_default_library", + "//crypto/bls/blst:go_default_library", + "//crypto/bls/common:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", @@ -181,7 +181,7 @@ go_test( ":android_amd64", ":android_arm64", ): [ - "//shared/bls/common:go_default_library", + "//crypto/bls/common:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", @@ -208,8 +208,8 @@ go_test( ], deps = [ ":go_default_library", - "//shared/bls/common:go_default_library", + "//crypto/bls/common:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", + "//crypto/hash:go_default_library", ], ) diff --git a/shared/bls/blst/aliases.go b/crypto/bls/blst/aliases.go similarity index 100% rename from shared/bls/blst/aliases.go rename to crypto/bls/blst/aliases.go diff --git a/shared/bls/blst/bls_benchmark_test.go b/crypto/bls/blst/bls_benchmark_test.go similarity index 92% rename from shared/bls/blst/bls_benchmark_test.go rename to crypto/bls/blst/bls_benchmark_test.go index 16aa7f4742..d710c6c15c 100644 --- a/shared/bls/blst/bls_benchmark_test.go +++ b/crypto/bls/blst/bls_benchmark_test.go @@ -6,8 +6,8 @@ package blst_test import ( "testing" - "github.com/prysmaticlabs/prysm/shared/bls/blst" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/bls/blst/doc.go b/crypto/bls/blst/doc.go similarity index 100% rename from shared/bls/blst/doc.go rename to crypto/bls/blst/doc.go diff --git a/shared/bls/blst/init.go b/crypto/bls/blst/init.go similarity index 100% rename from shared/bls/blst/init.go rename to crypto/bls/blst/init.go diff --git a/shared/bls/blst/public_key.go b/crypto/bls/blst/public_key.go similarity index 98% rename from shared/bls/blst/public_key.go rename to crypto/bls/blst/public_key.go index 5818d0fa69..d77e9801b9 100644 --- a/shared/bls/blst/public_key.go +++ b/crypto/bls/blst/public_key.go @@ -9,7 +9,7 @@ import ( "github.com/dgraph-io/ristretto" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/config/features" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/shared/bls/blst/public_key_test.go b/crypto/bls/blst/public_key_test.go similarity index 98% rename from shared/bls/blst/public_key_test.go rename to crypto/bls/blst/public_key_test.go index 8194434f1a..7aaba28956 100644 --- a/shared/bls/blst/public_key_test.go +++ b/crypto/bls/blst/public_key_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/shared/bls/blst" + "github.com/prysmaticlabs/prysm/crypto/bls/blst" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/bls/blst/secret_key.go b/crypto/bls/blst/secret_key.go similarity index 96% rename from shared/bls/blst/secret_key.go rename to crypto/bls/blst/secret_key.go index bdc45cab3a..a9ab9973d0 100644 --- a/shared/bls/blst/secret_key.go +++ b/crypto/bls/blst/secret_key.go @@ -8,9 +8,9 @@ import ( "fmt" "github.com/prysmaticlabs/prysm/config/features" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/common" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" blst "github.com/supranational/blst/bindings/go" ) diff --git a/shared/bls/blst/secret_key_test.go b/crypto/bls/blst/secret_key_test.go similarity index 96% rename from shared/bls/blst/secret_key_test.go rename to crypto/bls/blst/secret_key_test.go index 16fc0cb57f..312baa5ca7 100644 --- a/shared/bls/blst/secret_key_test.go +++ b/crypto/bls/blst/secret_key_test.go @@ -9,8 +9,8 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/shared/bls/blst" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/blst" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/shared/bls/blst/signature.go b/crypto/bls/blst/signature.go similarity index 98% rename from shared/bls/blst/signature.go rename to crypto/bls/blst/signature.go index 2ca9cf9120..47bfe14af8 100644 --- a/shared/bls/blst/signature.go +++ b/crypto/bls/blst/signature.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/config/features" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/common" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" blst "github.com/supranational/blst/bindings/go" ) diff --git a/shared/bls/blst/signature_test.go b/crypto/bls/blst/signature_test.go similarity index 99% rename from shared/bls/blst/signature_test.go rename to crypto/bls/blst/signature_test.go index afe332103e..968a3b993e 100644 --- a/shared/bls/blst/signature_test.go +++ b/crypto/bls/blst/signature_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/bls/blst/stub.go b/crypto/bls/blst/stub.go similarity index 97% rename from shared/bls/blst/stub.go rename to crypto/bls/blst/stub.go index 5675843c5d..c9b346b4fb 100644 --- a/shared/bls/blst/stub.go +++ b/crypto/bls/blst/stub.go @@ -3,7 +3,7 @@ package blst import ( - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/common" ) // This stub file exists until build issues can be resolved for libfuzz. diff --git a/shared/bls/common/BUILD.bazel b/crypto/bls/common/BUILD.bazel similarity index 71% rename from shared/bls/common/BUILD.bazel rename to crypto/bls/common/BUILD.bazel index b1e7e4f39d..c5f6faaf41 100644 --- a/shared/bls/common/BUILD.bazel +++ b/crypto/bls/common/BUILD.bazel @@ -7,9 +7,9 @@ go_library( "error.go", "interface.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/bls/common", + importpath = "github.com/prysmaticlabs/prysm/crypto/bls/common", visibility = [ - "//shared/bls:__subpackages__", + "//crypto/bls:__subpackages__", "//testing/spectest:__subpackages__", ], ) diff --git a/shared/bls/common/constants.go b/crypto/bls/common/constants.go similarity index 100% rename from shared/bls/common/constants.go rename to crypto/bls/common/constants.go diff --git a/shared/bls/common/error.go b/crypto/bls/common/error.go similarity index 100% rename from shared/bls/common/error.go rename to crypto/bls/common/error.go diff --git a/shared/bls/common/interface.go b/crypto/bls/common/interface.go similarity index 93% rename from shared/bls/common/interface.go rename to crypto/bls/common/interface.go index 494a69ecca..f04a7de82b 100644 --- a/shared/bls/common/interface.go +++ b/crypto/bls/common/interface.go @@ -1,7 +1,7 @@ // Package common provides the BLS interfaces that are implemented by the various BLS wrappers. // // This package should not be used by downstream consumers. These interfaces are re-exporter by -// github.com/prysmaticlabs/prysm/shared/bls. This package exists to prevent an import circular +// github.com/prysmaticlabs/prysm/crypto/bls. This package exists to prevent an import circular // dependency. package common diff --git a/shared/bls/constants.go b/crypto/bls/constants.go similarity index 100% rename from shared/bls/constants.go rename to crypto/bls/constants.go diff --git a/shared/bls/error.go b/crypto/bls/error.go similarity index 100% rename from shared/bls/error.go rename to crypto/bls/error.go diff --git a/shared/bls/herumi/BUILD.bazel b/crypto/bls/herumi/BUILD.bazel similarity index 77% rename from shared/bls/herumi/BUILD.bazel rename to crypto/bls/herumi/BUILD.bazel index f8623d11af..735a334933 100644 --- a/shared/bls/herumi/BUILD.bazel +++ b/crypto/bls/herumi/BUILD.bazel @@ -5,9 +5,9 @@ load("@prysm//tools/go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["init.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/bls/herumi", + importpath = "github.com/prysmaticlabs/prysm/crypto/bls/herumi", visibility = [ - "//shared/bls:__pkg__", + "//crypto/bls:__pkg__", ], deps = [ "@herumi_bls_eth_go_binary//:go_default_library", diff --git a/shared/bls/herumi/init.go b/crypto/bls/herumi/init.go similarity index 100% rename from shared/bls/herumi/init.go rename to crypto/bls/herumi/init.go diff --git a/shared/bls/interface.go b/crypto/bls/interface.go similarity index 83% rename from shared/bls/interface.go rename to crypto/bls/interface.go index 62a8255fd7..1732caefbf 100644 --- a/shared/bls/interface.go +++ b/crypto/bls/interface.go @@ -1,7 +1,7 @@ package bls import ( - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls/common" ) // PublicKey represents a BLS public key. diff --git a/shared/bls/signature_set.go b/crypto/bls/signature_set.go similarity index 100% rename from shared/bls/signature_set.go rename to crypto/bls/signature_set.go diff --git a/shared/bls/signature_set_test.go b/crypto/bls/signature_set_test.go similarity index 100% rename from shared/bls/signature_set_test.go rename to crypto/bls/signature_set_test.go diff --git a/shared/hashutil/BUILD.bazel b/crypto/hash/BUILD.bazel similarity index 90% rename from shared/hashutil/BUILD.bazel rename to crypto/hash/BUILD.bazel index f2a84dab11..b52c2a8a04 100644 --- a/shared/hashutil/BUILD.bazel +++ b/crypto/hash/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["hash.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/hashutil", + importpath = "github.com/prysmaticlabs/prysm/crypto/hash", visibility = ["//visibility:public"], deps = [ "//shared/bytesutil:go_default_library", @@ -21,9 +21,9 @@ go_test( srcs = ["hash_test.go"], deps = [ ":go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/testing:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/shared/hashutil/hash.go b/crypto/hash/hash.go similarity index 99% rename from shared/hashutil/hash.go rename to crypto/hash/hash.go index ace81a158b..d179957a55 100644 --- a/shared/hashutil/hash.go +++ b/crypto/hash/hash.go @@ -1,5 +1,5 @@ // Package hashutil includes all hash-function related helpers for Prysm. -package hashutil +package hash import ( "errors" diff --git a/shared/hashutil/hash_test.go b/crypto/hash/hash_test.go similarity index 76% rename from shared/hashutil/hash_test.go rename to crypto/hash/hash_test.go index 8d19347a1c..7124b67ac5 100644 --- a/shared/hashutil/hash_test.go +++ b/crypto/hash/hash_test.go @@ -1,57 +1,57 @@ -package hashutil_test +package hash_test import ( "encoding/hex" "testing" fuzz "github.com/google/gofuzz" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/testing" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) func TestHash(t *testing.T) { hashOf0 := [32]byte{110, 52, 11, 156, 255, 179, 122, 152, 156, 165, 68, 230, 187, 120, 10, 44, 120, 144, 29, 63, 179, 55, 56, 118, 133, 17, 163, 6, 23, 175, 160, 29} - hash := hashutil.Hash([]byte{0}) - assert.Equal(t, hashOf0, hash) + h := hash.Hash([]byte{0}) + assert.Equal(t, hashOf0, h) hashOf1 := [32]byte{75, 245, 18, 47, 52, 69, 84, 197, 59, 222, 46, 187, 140, 210, 183, 227, 209, 96, 10, 214, 49, 195, 133, 165, 215, 204, 226, 60, 119, 133, 69, 154} - hash = hashutil.Hash([]byte{1}) - assert.Equal(t, hashOf1, hash) + h = hash.Hash([]byte{1}) + assert.Equal(t, hashOf1, h) assert.Equal(t, false, hashOf0 == hashOf1) } func BenchmarkHash(b *testing.B) { for i := 0; i < b.N; i++ { - hashutil.Hash([]byte("abc")) + hash.Hash([]byte("abc")) } } func TestHashKeccak256(t *testing.T) { hashOf0 := [32]byte{188, 54, 120, 158, 122, 30, 40, 20, 54, 70, 66, 41, 130, 143, 129, 125, 102, 18, 247, 180, 119, 214, 101, 145, 255, 150, 169, 224, 100, 188, 201, 138} - hash := hashutil.HashKeccak256([]byte{0}) - assert.Equal(t, hashOf0, hash) + h := hash.HashKeccak256([]byte{0}) + assert.Equal(t, hashOf0, h) hashOf1 := [32]byte{95, 231, 249, 119, 231, 29, 186, 46, 161, 166, 142, 33, 5, 123, 238, 187, 155, 226, 172, 48, 198, 65, 10, 163, 141, 79, 63, 190, 65, 220, 255, 210} - hash = hashutil.HashKeccak256([]byte{1}) - assert.Equal(t, hashOf1, hash) + h = hash.HashKeccak256([]byte{1}) + assert.Equal(t, hashOf1, h) assert.Equal(t, false, hashOf0 == hashOf1) // Same hashing test from go-ethereum for keccak256 hashOfabc, err := hex.DecodeString("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45") require.NoError(t, err) - hash = hashutil.HashKeccak256([]byte("abc")) - h := bytesutil.ToBytes32(hashOfabc) - assert.Equal(t, hash, h) + h = hash.HashKeccak256([]byte("abc")) + h32 := bytesutil.ToBytes32(hashOfabc) + assert.Equal(t, h32, h) } func BenchmarkHashKeccak256(b *testing.B) { for i := 0; i < b.N; i++ { - hashutil.HashKeccak256([]byte("abc")) + hash.HashKeccak256([]byte("abc")) } } @@ -62,9 +62,9 @@ func TestHashProto(t *testing.T) { msg2 := &pb.Puzzle{ Challenge: "hello", } - h1, err := hashutil.HashProto(msg1) + h1, err := hash.HashProto(msg1) require.NoError(t, err) - h2, err := hashutil.HashProto(msg2) + h2, err := hash.HashProto(msg2) require.NoError(t, err) assert.Equal(t, h1, h2) } @@ -80,7 +80,7 @@ func TestHashProtoFuzz(t *testing.T) { for i := 0; i < 1000; i++ { msg := &pb.AddressBook{} f.Fuzz(msg) - _, err := hashutil.HashProto(msg) + _, err := hash.HashProto(msg) _ = err } } @@ -99,7 +99,7 @@ func BenchmarkHashProto(b *testing.B) { } for i := 0; i < b.N; i++ { - if _, err := hashutil.HashProto(att); err != nil { + if _, err := hash.HashProto(att); err != nil { b.Log(err) } } diff --git a/shared/keystore/BUILD.bazel b/crypto/keystore/BUILD.bazel similarity index 88% rename from shared/keystore/BUILD.bazel rename to crypto/keystore/BUILD.bazel index 003d077dc8..dc1ea2d610 100644 --- a/shared/keystore/BUILD.bazel +++ b/crypto/keystore/BUILD.bazel @@ -8,10 +8,10 @@ go_library( "keystore.go", "utils.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/keystore", + importpath = "github.com/prysmaticlabs/prysm/crypto/keystore", visibility = ["//visibility:public"], deps = [ - "//shared/bls:go_default_library", + "//crypto/bls:go_default_library", "//shared/fileutil:go_default_library", "//time:go_default_library", "@com_github_minio_sha256_simd//:go_default_library", @@ -32,7 +32,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//shared/bls:go_default_library", + "//crypto/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/shared/keystore/keccak256.go b/crypto/keystore/keccak256.go similarity index 100% rename from shared/keystore/keccak256.go rename to crypto/keystore/keccak256.go diff --git a/shared/keystore/key.go b/crypto/keystore/key.go similarity index 99% rename from shared/keystore/key.go rename to crypto/keystore/key.go index 4ca5b53f5c..cdbbe35bb2 100644 --- a/shared/keystore/key.go +++ b/crypto/keystore/key.go @@ -26,7 +26,7 @@ import ( "path/filepath" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/fileutil" ) diff --git a/shared/keystore/key_test.go b/crypto/keystore/key_test.go similarity index 97% rename from shared/keystore/key_test.go rename to crypto/keystore/key_test.go index 31907da47f..a557e7ec20 100644 --- a/shared/keystore/key_test.go +++ b/crypto/keystore/key_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/keystore/keystore.go b/crypto/keystore/keystore.go similarity index 99% rename from shared/keystore/keystore.go rename to crypto/keystore/keystore.go index b0919295b1..84cc18e43e 100644 --- a/shared/keystore/keystore.go +++ b/crypto/keystore/keystore.go @@ -34,7 +34,7 @@ import ( "github.com/minio/sha256-simd" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" log "github.com/sirupsen/logrus" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/shared/keystore/keystore_test.go b/crypto/keystore/keystore_test.go similarity index 98% rename from shared/keystore/keystore_test.go rename to crypto/keystore/keystore_test.go index e6b4da8c0b..33a4f660a2 100644 --- a/shared/keystore/keystore_test.go +++ b/crypto/keystore/keystore_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/pborman/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/shared/keystore/utils.go b/crypto/keystore/utils.go similarity index 97% rename from shared/keystore/utils.go rename to crypto/keystore/utils.go index d6b18cdd31..bae75efb05 100644 --- a/shared/keystore/utils.go +++ b/crypto/keystore/utils.go @@ -25,7 +25,7 @@ import ( "fmt" "time" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" prysmTime "github.com/prysmaticlabs/prysm/time" ) diff --git a/shared/rand/BUILD.bazel b/crypto/rand/BUILD.bazel similarity index 81% rename from shared/rand/BUILD.bazel rename to crypto/rand/BUILD.bazel index f9a47c6a44..96061f756a 100644 --- a/shared/rand/BUILD.bazel +++ b/crypto/rand/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["rand.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/rand", + importpath = "github.com/prysmaticlabs/prysm/crypto/rand", visibility = ["//visibility:public"], ) diff --git a/shared/rand/rand.go b/crypto/rand/rand.go similarity index 96% rename from shared/rand/rand.go rename to crypto/rand/rand.go index 16c1eddd1f..f23dfb966e 100644 --- a/shared/rand/rand.go +++ b/crypto/rand/rand.go @@ -7,7 +7,7 @@ This limits the scope of code that needs to be hardened. There are two modes, one for deterministic and another non-deterministic randomness: 1. If deterministic pseudo-random generator is enough, use: - import "github.com/prysmaticlabs/prysm/shared/rand" + import "github.com/prysmaticlabs/prysm/crypto/rand" randGen := rand.NewDeterministicGenerator() randGen.Intn(32) // or any other func defined in math.rand API @@ -19,7 +19,7 @@ There are two modes, one for deterministic and another non-deterministic randomn 2. For cryptographically secure non-deterministic mode (CSPRNG), use: - import "github.com/prysmaticlabs/prysm/shared/rand" + import "github.com/prysmaticlabs/prysm/crypto/rand" randGen := rand.NewGenerator() randGen.Intn(32) // or any other func defined in math.rand API diff --git a/shared/rand/rand_test.go b/crypto/rand/rand_test.go similarity index 100% rename from shared/rand/rand_test.go rename to crypto/rand/rand_test.go diff --git a/fuzz/BUILD.bazel b/fuzz/BUILD.bazel index 225597439c..484dc52332 100644 --- a/fuzz/BUILD.bazel +++ b/fuzz/BUILD.bazel @@ -85,7 +85,7 @@ go_fuzz_test( "//beacon-chain/blockchain/testing:go_default_library", "//beacon-chain/cache:go_default_library", "//beacon-chain/state/stategen:go_default_library", - "//shared/rand:go_default_library", + "//crypto/rand:go_default_library", ] + COMMON_DEPS, ) @@ -189,7 +189,7 @@ go_library( "//shared/bytesutil:go_default_library", "//config/features:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", + "//crypto/rand:go_default_library", "//shared/testutil:go_default_library", "@com_github_libp2p_go_libp2p_core//host:go_default_library", "@com_github_libp2p_go_libp2p_core//network:go_default_library", diff --git a/fuzz/block_fuzz.go b/fuzz/block_fuzz.go index 5ed1c9503a..dc0a3094a9 100644 --- a/fuzz/block_fuzz.go +++ b/fuzz/block_fuzz.go @@ -28,9 +28,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" "github.com/prysmaticlabs/prysm/beacon-chain/sync" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/sirupsen/logrus" ) diff --git a/nogo_config.json b/nogo_config.json index c80c0e321f..37b76c75a4 100644 --- a/nogo_config.json +++ b/nogo_config.json @@ -100,7 +100,7 @@ }, "exclude_files": { ".*/.*_test\\.go": "Tests are OK to use weak crypto", - "shared/rand/rand\\.go": "Abstracts CSPRNGs for common use", + "crypto/rand/rand\\.go": "Abstracts CSPRNGs for common use", "shared/aggregation/testing/bitlistutils.go": "Test-only package" } }, diff --git a/shared/aggregation/attestations/BUILD.bazel b/shared/aggregation/attestations/BUILD.bazel index bda24e383e..9393545b1a 100644 --- a/shared/aggregation/attestations/BUILD.bazel +++ b/shared/aggregation/attestations/BUILD.bazel @@ -11,9 +11,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation:go_default_library", - "//shared/bls:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", @@ -30,10 +30,10 @@ go_test( embed = [":go_default_library"], deps = [ "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/testing:go_default_library", - "//shared/bls:go_default_library", "//shared/params:go_default_library", "//shared/sszutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/shared/aggregation/attestations/attestations.go b/shared/aggregation/attestations/attestations.go index 15317ed692..5357f169fb 100644 --- a/shared/aggregation/attestations/attestations.go +++ b/shared/aggregation/attestations/attestations.go @@ -3,9 +3,9 @@ package attestations import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/sirupsen/logrus" ) diff --git a/shared/aggregation/attestations/attestations_bench_test.go b/shared/aggregation/attestations/attestations_bench_test.go index efa90bf5a5..be16deeece 100644 --- a/shared/aggregation/attestations/attestations_bench_test.go +++ b/shared/aggregation/attestations/attestations_bench_test.go @@ -6,9 +6,9 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" aggtesting "github.com/prysmaticlabs/prysm/shared/aggregation/testing" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/aggregation/attestations/attestations_test.go b/shared/aggregation/attestations/attestations_test.go index 1a3a6090d6..936563f200 100644 --- a/shared/aggregation/attestations/attestations_test.go +++ b/shared/aggregation/attestations/attestations_test.go @@ -8,10 +8,10 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" aggtesting "github.com/prysmaticlabs/prysm/shared/aggregation/testing" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sszutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/shared/aggregation/attestations/maxcover.go b/shared/aggregation/attestations/maxcover.go index 5732afcb42..7ed8712de8 100644 --- a/shared/aggregation/attestations/maxcover.go +++ b/shared/aggregation/attestations/maxcover.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" - "github.com/prysmaticlabs/prysm/shared/bls" ) // MaxCoverAttestationAggregation relies on Maximum Coverage greedy algorithm for aggregation. diff --git a/shared/aggregation/attestations/maxcover_test.go b/shared/aggregation/attestations/maxcover_test.go index aab0be6574..e68fd0a903 100644 --- a/shared/aggregation/attestations/maxcover_test.go +++ b/shared/aggregation/attestations/maxcover_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) diff --git a/shared/aggregation/sync_contribution/BUILD.bazel b/shared/aggregation/sync_contribution/BUILD.bazel index 1090d92ccd..8ec4666127 100644 --- a/shared/aggregation/sync_contribution/BUILD.bazel +++ b/shared/aggregation/sync_contribution/BUILD.bazel @@ -9,9 +9,9 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/aggregation/sync_contribution", visibility = ["//visibility:public"], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation:go_default_library", - "//shared/bls:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ], @@ -23,10 +23,10 @@ go_test( embed = [":go_default_library"], deps = [ "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/aggregation:go_default_library", "//shared/aggregation/testing:go_default_library", - "//shared/bls:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", diff --git a/shared/aggregation/sync_contribution/naive.go b/shared/aggregation/sync_contribution/naive.go index 6e6b5ed257..302ef898fd 100644 --- a/shared/aggregation/sync_contribution/naive.go +++ b/shared/aggregation/sync_contribution/naive.go @@ -1,9 +1,9 @@ package sync_contribution import ( + "github.com/prysmaticlabs/prysm/crypto/bls" v2 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" - "github.com/prysmaticlabs/prysm/shared/bls" ) // naiveSyncContributionAggregation aggregates naively, without any complex algorithms or optimizations. diff --git a/shared/aggregation/sync_contribution/naive_test.go b/shared/aggregation/sync_contribution/naive_test.go index 719402924b..417761af0e 100644 --- a/shared/aggregation/sync_contribution/naive_test.go +++ b/shared/aggregation/sync_contribution/naive_test.go @@ -7,10 +7,10 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/aggregation" aggtesting "github.com/prysmaticlabs/prysm/shared/aggregation/testing" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/shared/aggregation/testing/BUILD.bazel b/shared/aggregation/testing/BUILD.bazel index d853394668..3fb566c190 100644 --- a/shared/aggregation/testing/BUILD.bazel +++ b/shared/aggregation/testing/BUILD.bazel @@ -6,8 +6,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/aggregation/testing", visibility = ["//visibility:public"], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//time:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", diff --git a/shared/aggregation/testing/bitlistutils.go b/shared/aggregation/testing/bitlistutils.go index 170d84cf68..06c0b01f73 100644 --- a/shared/aggregation/testing/bitlistutils.go +++ b/shared/aggregation/testing/bitlistutils.go @@ -6,8 +6,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/time" ) diff --git a/shared/attestationutil/BUILD.bazel b/shared/attestationutil/BUILD.bazel index 8c1f42a00f..6462dc4438 100644 --- a/shared/attestationutil/BUILD.bazel +++ b/shared/attestationutil/BUILD.bazel @@ -7,8 +7,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/params:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/shared/attestationutil/attestation_utils.go b/shared/attestationutil/attestation_utils.go index 4b71c85660..fab3191fe2 100644 --- a/shared/attestationutil/attestation_utils.go +++ b/shared/attestationutil/attestation_utils.go @@ -12,8 +12,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" ) diff --git a/shared/depositutil/BUILD.bazel b/shared/depositutil/BUILD.bazel index 53db2e0678..81481e01f4 100644 --- a/shared/depositutil/BUILD.bazel +++ b/shared/depositutil/BUILD.bazel @@ -8,9 +8,9 @@ go_library( deps = [ "//beacon-chain/core/helpers:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "@com_github_pkg_errors//:go_default_library", ], @@ -22,8 +22,8 @@ go_test( deps = [ ":go_default_library", "//beacon-chain/core/helpers:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/shared/depositutil/deposit.go b/shared/depositutil/deposit.go index b48cb1760d..cf46e29b54 100644 --- a/shared/depositutil/deposit.go +++ b/shared/depositutil/deposit.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -73,7 +73,7 @@ func DepositInput(depositKey, withdrawalKey bls.SecretKey, amountInGwei uint64) // withdrawal_credentials[1:] == hash(withdrawal_pubkey)[1:] // where withdrawal_credentials is of type bytes32. func WithdrawalCredentialsHash(withdrawalKey bls.SecretKey) []byte { - h := hashutil.Hash(withdrawalKey.PublicKey().Marshal()) + h := hash.Hash(withdrawalKey.PublicKey().Marshal()) return append([]byte{params.BeaconConfig().BLSWithdrawalPrefixByte}, h[1:]...)[:32] } diff --git a/shared/depositutil/deposit_test.go b/shared/depositutil/deposit_test.go index ad83792569..39357e79c0 100644 --- a/shared/depositutil/deposit_test.go +++ b/shared/depositutil/deposit_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/depositutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" diff --git a/shared/htrutils/BUILD.bazel b/shared/htrutils/BUILD.bazel index 34ddf22445..5466c002f9 100644 --- a/shared/htrutils/BUILD.bazel +++ b/shared/htrutils/BUILD.bazel @@ -11,9 +11,9 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/htrutils", visibility = ["//visibility:public"], deps = [ + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/trieutil:go_default_library", "@com_github_minio_sha256_simd//:go_default_library", @@ -33,8 +33,8 @@ go_test( ], deps = [ ":go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/hashutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", diff --git a/shared/htrutils/hashers_test.go b/shared/htrutils/hashers_test.go index 71c40dfb42..dab6f22844 100644 --- a/shared/htrutils/hashers_test.go +++ b/shared/htrutils/hashers_test.go @@ -3,14 +3,14 @@ package htrutils_test import ( "testing" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) func TestHash(t *testing.T) { byteSlice := []byte{1, 2, 3, 4, 5, 6, 7, 8, 9} - hasher := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hasher := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) expected := [32]byte{71, 228, 238, 127, 33, 31, 115, 38, 93, 209, 118, 88, 246, 226, 28, 19, 24, 189, 108, 129, 243, 117, 152, 226, 10, 39, 86, 41, 149, 66, 239, 207} result := hasher.Hash(byteSlice) assert.Equal(t, expected, result) @@ -19,7 +19,7 @@ func TestHash(t *testing.T) { func TestCombi(t *testing.T) { byteSlice1 := [32]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32} byteSlice2 := [32]byte{32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1} - hasher := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hasher := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) expected := [32]byte{203, 73, 0, 148, 142, 9, 145, 147, 186, 232, 143, 117, 95, 44, 38, 46, 102, 69, 101, 74, 50, 37, 87, 189, 40, 196, 203, 140, 19, 233, 161, 225} result := hasher.Combi(byteSlice1, byteSlice2) assert.Equal(t, expected, result) @@ -28,7 +28,7 @@ func TestCombi(t *testing.T) { func TestMixIn(t *testing.T) { byteSlice := [32]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32} intToAdd := uint64(33) - hasher := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hasher := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) expected := [32]byte{170, 90, 0, 249, 34, 60, 140, 68, 77, 51, 218, 139, 54, 119, 179, 238, 80, 72, 13, 20, 212, 218, 124, 215, 68, 122, 214, 157, 178, 85, 225, 213} result := hasher.MixIn(byteSlice, intToAdd) assert.Equal(t, expected, result) diff --git a/shared/htrutils/helpers_test.go b/shared/htrutils/helpers_test.go index c5b06e72e9..a71b4ef5f9 100644 --- a/shared/htrutils/helpers_test.go +++ b/shared/htrutils/helpers_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" @@ -13,7 +13,7 @@ import ( const merkleizingListLimitError = "merkleizing list that is too large, over limit" func TestBitlistRoot(t *testing.T) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() capacity := uint64(10) bfield := bitfield.NewBitlist(capacity) expected := [32]byte{176, 76, 194, 203, 142, 166, 117, 79, 148, 194, 231, 64, 60, 245, 142, 32, 201, 2, 58, 152, 53, 12, 132, 40, 41, 102, 224, 189, 103, 41, 211, 202} @@ -24,7 +24,7 @@ func TestBitlistRoot(t *testing.T) { } func TestBitwiseMerkleize(t *testing.T) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() chunks := [][]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, {11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, @@ -39,7 +39,7 @@ func TestBitwiseMerkleize(t *testing.T) { } func TestBitwiseMerkleizeOverLimit(t *testing.T) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() chunks := [][]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, {11, 12, 13, 14, 15, 16, 17, 18, 19, 20}, @@ -52,7 +52,7 @@ func TestBitwiseMerkleizeOverLimit(t *testing.T) { } func TestBitwiseMerkleizeArrays(t *testing.T) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() chunks := [][32]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}, {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 62, 62, 63, 64}, @@ -67,7 +67,7 @@ func TestBitwiseMerkleizeArrays(t *testing.T) { } func TestBitwiseMerkleizeArraysOverLimit(t *testing.T) { - hasher := hashutil.CustomSHA256Hasher() + hasher := hash.CustomSHA256Hasher() chunks := [][32]byte{ {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32}, {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 62, 62, 63, 64}, diff --git a/shared/htrutils/htrutils.go b/shared/htrutils/htrutils.go index e9ec27117d..624c121cc4 100644 --- a/shared/htrutils/htrutils.go +++ b/shared/htrutils/htrutils.go @@ -6,9 +6,9 @@ import ( "encoding/binary" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" ) @@ -37,7 +37,7 @@ func ForkRoot(fork *ethpb.Fork) ([32]byte, error) { epochRoot := bytesutil.ToBytes32(forkEpochBuf) fieldRoots[2] = epochRoot[:] } - return BitwiseMerkleize(hashutil.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) + return BitwiseMerkleize(hash.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots))) } // CheckpointRoot computes the HashTreeRoot Merkleization of @@ -60,7 +60,7 @@ func CheckpointRoot(hasher HashFn, checkpoint *ethpb.Checkpoint) ([32]byte, erro // a list of [32]byte historical block roots according to the Ethereum // Simple Serialize specification. func HistoricalRootsRoot(historicalRoots [][]byte) ([32]byte, error) { - result, err := BitwiseMerkleize(hashutil.CustomSHA256Hasher(), historicalRoots, uint64(len(historicalRoots)), params.BeaconConfig().HistoricalRootsLimit) + result, err := BitwiseMerkleize(hash.CustomSHA256Hasher(), historicalRoots, uint64(len(historicalRoots)), params.BeaconConfig().HistoricalRootsLimit) if err != nil { return [32]byte{}, errors.Wrap(err, "could not compute historical roots merkleization") } @@ -89,5 +89,5 @@ func SlashingsRoot(slashings []uint64) ([32]byte, error) { if err != nil { return [32]byte{}, errors.Wrap(err, "could not pack slashings into chunks") } - return BitwiseMerkleize(hashutil.CustomSHA256Hasher(), slashingChunks, uint64(len(slashingChunks)), uint64(len(slashingChunks))) + return BitwiseMerkleize(hash.CustomSHA256Hasher(), slashingChunks, uint64(len(slashingChunks)), uint64(len(slashingChunks))) } diff --git a/shared/htrutils/htrutils_test.go b/shared/htrutils/htrutils_test.go index ed65e05696..5590fb5dd3 100644 --- a/shared/htrutils/htrutils_test.go +++ b/shared/htrutils/htrutils_test.go @@ -3,8 +3,8 @@ package htrutils_test import ( "testing" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" @@ -32,7 +32,7 @@ func TestForkRoot(t *testing.T) { } func TestCheckPointRoot(t *testing.T) { - testHasher := hashutil.CustomSHA256Hasher() + testHasher := hash.CustomSHA256Hasher() testCheckpoint := ethpb.Checkpoint{ Epoch: 1234567890, Root: []byte{222}, diff --git a/shared/htrutils/merkleize_test.go b/shared/htrutils/merkleize_test.go index 33ced3bb9d..18de02a479 100644 --- a/shared/htrutils/merkleize_test.go +++ b/shared/htrutils/merkleize_test.go @@ -3,7 +3,7 @@ package htrutils_test import ( "testing" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/htrutils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" ) @@ -17,7 +17,7 @@ func TestGetDepth(t *testing.T) { } func TestMerkleizeCountGreaterThanLimit(t *testing.T) { - hashFn := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hashFn := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) count := uint64(2) limit := uint64(1) chunks := [][]byte{{}} @@ -34,7 +34,7 @@ func TestMerkleizeCountGreaterThanLimit(t *testing.T) { } func TestMerkleizeLimitAndCountAreZero(t *testing.T) { - hashFn := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hashFn := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) count := uint64(0) limit := uint64(0) chunks := [][]byte{{}} @@ -47,7 +47,7 @@ func TestMerkleizeLimitAndCountAreZero(t *testing.T) { } func TestMerkleizeNormalPath(t *testing.T) { - hashFn := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hashFn := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) count := uint64(2) limit := uint64(3) chunks := [][]byte{{1, 2, 3, 4}, {5, 6, 7, 8}, {9, 10, 11, 12}} @@ -60,7 +60,7 @@ func TestMerkleizeNormalPath(t *testing.T) { } func TestConstructProofCountGreaterThanLimit(t *testing.T) { - hashFn := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hashFn := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) count := uint64(2) limit := uint64(1) chunks := [][]byte{{}} @@ -77,7 +77,7 @@ func TestConstructProofCountGreaterThanLimit(t *testing.T) { } func TestConstructProofIndexGreaterThanEqualToLimit(t *testing.T) { - hashFn := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hashFn := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) count := uint64(1) limit := uint64(1) chunks := [][]byte{{}} @@ -94,7 +94,7 @@ func TestConstructProofIndexGreaterThanEqualToLimit(t *testing.T) { } func TestConstructProofNormalPath(t *testing.T) { - hashFn := htrutils.NewHasherFunc(hashutil.CustomSHA256Hasher()) + hashFn := htrutils.NewHasherFunc(hash.CustomSHA256Hasher()) count := uint64(2) limit := uint64(3) chunks := [][]byte{{1, 2, 3, 4}, {5, 6, 7, 8}, {9, 10, 11, 12}} diff --git a/shared/interop/BUILD.bazel b/shared/interop/BUILD.bazel index 7bd9bd9479..11a2059964 100644 --- a/shared/interop/BUILD.bazel +++ b/shared/interop/BUILD.bazel @@ -12,9 +12,9 @@ go_library( "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state/v1:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mputil:go_default_library", "//shared/params:go_default_library", "//shared/trieutil:go_default_library", diff --git a/shared/interop/generate_genesis_state.go b/shared/interop/generate_genesis_state.go index be4aea1281..841d4b070c 100644 --- a/shared/interop/generate_genesis_state.go +++ b/shared/interop/generate_genesis_state.go @@ -10,9 +10,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/mputil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/trieutil" @@ -187,6 +187,6 @@ func createDepositData(privKey bls.SecretKey, pubKey bls.PublicKey) (*ethpb.Depo // withdrawal_credentials[1:] == hash(withdrawal_pubkey)[1:] // where withdrawal_credentials is of type bytes32. func withdrawalCredentialsHash(pubKey []byte) []byte { - h := hashutil.Hash(pubKey) + h := hash.Hash(pubKey) return append([]byte{blsWithdrawalPrefixByte}, h[1:]...)[:32] } diff --git a/shared/interop/generate_keys.go b/shared/interop/generate_keys.go index fcddafb2e7..5b8481ca9d 100644 --- a/shared/interop/generate_keys.go +++ b/shared/interop/generate_keys.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/mputil" ) @@ -49,7 +49,7 @@ func deterministicallyGenerateKeys(startIndex, numKeys uint64) ([]bls.SecretKey, for i := startIndex; i < startIndex+numKeys; i++ { enc := make([]byte, 32) binary.LittleEndian.PutUint32(enc, uint32(i)) - hash := hashutil.Hash(enc) + hash := hash.Hash(enc) // Reverse byte order to big endian for use with big ints. b := reverseByteOrder(hash[:]) num := new(big.Int) diff --git a/shared/logutil/BUILD.bazel b/shared/logutil/BUILD.bazel index 27aabbef56..0cdedaa6ba 100644 --- a/shared/logutil/BUILD.bazel +++ b/shared/logutil/BUILD.bazel @@ -10,9 +10,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cache/lru:go_default_library", + "//crypto/rand:go_default_library", "//shared/event:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "@com_github_hashicorp_golang_lru//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ], diff --git a/shared/logutil/stream.go b/shared/logutil/stream.go index 3d214a497d..75ce3d841a 100644 --- a/shared/logutil/stream.go +++ b/shared/logutil/stream.go @@ -5,8 +5,8 @@ import ( lru "github.com/hashicorp/golang-lru" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/event" - "github.com/prysmaticlabs/prysm/shared/rand" ) const ( diff --git a/shared/petnames/BUILD.bazel b/shared/petnames/BUILD.bazel index d49bedd005..10614ac81d 100644 --- a/shared/petnames/BUILD.bazel +++ b/shared/petnames/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/petnames", visibility = ["//visibility:public"], deps = [ - "//shared/hashutil:go_default_library", - "//shared/rand:go_default_library", + "//crypto/hash:go_default_library", + "//crypto/rand:go_default_library", ], ) diff --git a/shared/petnames/names.go b/shared/petnames/names.go index 24f700c45a..cfcf3bb086 100644 --- a/shared/petnames/names.go +++ b/shared/petnames/names.go @@ -3,8 +3,8 @@ package petnames import ( "strings" - "github.com/prysmaticlabs/prysm/shared/hashutil" - "github.com/prysmaticlabs/prysm/shared/rand" + "github.com/prysmaticlabs/prysm/crypto/hash" + "github.com/prysmaticlabs/prysm/crypto/rand" ) var ( @@ -17,7 +17,7 @@ var ( // given a random seed for initialization. func DeterministicName(seed []byte, separator string) string { rng := rand.NewDeterministicGenerator() - hashedValue := hashutil.FastSum64(seed) + hashedValue := hash.FastSum64(seed) rng.Seed(int64(hashedValue)) adverb := adverbs[rng.Intn(len(adverbs)-1)] adjective := adjectives[rng.Intn(len(adjectives)-1)] diff --git a/shared/testutil/BUILD.bazel b/shared/testutil/BUILD.bazel index 8db82be163..b057e30c50 100644 --- a/shared/testutil/BUILD.bazel +++ b/shared/testutil/BUILD.bazel @@ -27,15 +27,15 @@ go_library( "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//beacon-chain/state/v2:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", + "//crypto/rand:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/interop:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//shared/trieutil:go_default_library", "//shared/version:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", diff --git a/shared/testutil/altair.go b/shared/testutil/altair.go index dcaf565672..6b5af82939 100644 --- a/shared/testutil/altair.go +++ b/shared/testutil/altair.go @@ -16,9 +16,9 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" ) diff --git a/shared/testutil/attestation.go b/shared/testutil/attestation.go index b8f0047f0c..d7fdb651fa 100644 --- a/shared/testutil/attestation.go +++ b/shared/testutil/attestation.go @@ -14,11 +14,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" v2 "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/rand" attv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/version" log "github.com/sirupsen/logrus" ) diff --git a/shared/testutil/block.go b/shared/testutil/block.go index d2375aefec..b3ddf6ef61 100644 --- a/shared/testutil/block.go +++ b/shared/testutil/block.go @@ -9,12 +9,12 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/rand" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" ) // BlockGenConfig is used to define the requested conditions diff --git a/shared/testutil/deposits.go b/shared/testutil/deposits.go index 777d427de2..309d37e26e 100644 --- a/shared/testutil/deposits.go +++ b/shared/testutil/deposits.go @@ -9,10 +9,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/trieutil" @@ -162,7 +162,7 @@ func signedDeposit( withdrawalKey []byte, balance uint64, ) (*ethpb.Deposit, error) { - withdrawalCreds := hashutil.Hash(withdrawalKey) + withdrawalCreds := hash.Hash(withdrawalKey) withdrawalCreds[0] = params.BeaconConfig().BLSWithdrawalPrefixByte depositMessage := ðpb.DepositMessage{ PublicKey: publicKey, @@ -325,7 +325,7 @@ func DeterministicDepositsAndKeysSameValidator(numDeposits uint64) ([]*ethpb.Dep // Create the new deposits and add them to the trie. Always use the first validator to create deposit for i := uint64(0); i < numRequired; i++ { - withdrawalCreds := hashutil.Hash(publicKeys[1].Marshal()) + withdrawalCreds := hash.Hash(publicKeys[1].Marshal()) withdrawalCreds[0] = params.BeaconConfig().BLSWithdrawalPrefixByte depositMessage := ðpb.DepositMessage{ diff --git a/shared/testutil/helpers.go b/shared/testutil/helpers.go index 15ef3e8368..b5dba8bfcb 100644 --- a/shared/testutil/helpers.go +++ b/shared/testutil/helpers.go @@ -11,11 +11,11 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/rand" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" ) // RandaoReveal returns a signature of the requested epoch using the beacon proposer private key. diff --git a/shared/testutil/sync_aggregate.go b/shared/testutil/sync_aggregate.go index 7b2a63ac26..0ce36af8a0 100644 --- a/shared/testutil/sync_aggregate.go +++ b/shared/testutil/sync_aggregate.go @@ -7,8 +7,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2pType "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/version" diff --git a/shared/trieutil/BUILD.bazel b/shared/trieutil/BUILD.bazel index 4ca7e112a6..76dfbddb3a 100644 --- a/shared/trieutil/BUILD.bazel +++ b/shared/trieutil/BUILD.bazel @@ -9,9 +9,9 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/shared/trieutil", visibility = ["//visibility:public"], deps = [ + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", ], ) @@ -23,9 +23,9 @@ go_test( embed = [":go_default_library"], deps = [ "//contracts/deposit-contract:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", diff --git a/shared/trieutil/sparse_merkle.go b/shared/trieutil/sparse_merkle.go index fb9e91937f..46fd93e3e7 100644 --- a/shared/trieutil/sparse_merkle.go +++ b/shared/trieutil/sparse_merkle.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" + "github.com/prysmaticlabs/prysm/crypto/hash" protodb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/mathutil" ) @@ -61,7 +61,7 @@ func GenerateTrieFromItems(items [][]byte, depth uint64) (*SparseMerkleTrie, err } updatedValues := make([][]byte, 0) for j := 0; j < len(layers[i]); j += 2 { - concat := hashutil.Hash(append(layers[i][j], layers[i][j+1]...)) + concat := hash.Hash(append(layers[i][j], layers[i][j+1]...)) updatedValues = append(updatedValues, concat[:]) } layers[i+1] = updatedValues @@ -89,7 +89,7 @@ func (m *SparseMerkleTrie) HashTreeRoot() [32]byte { depositCount = 0 } binary.LittleEndian.PutUint64(enc[:], depositCount) - return hashutil.Hash(append(m.branches[len(m.branches)-1][0], enc[:]...)) + return hash.Hash(append(m.branches[len(m.branches)-1][0], enc[:]...)) } // Insert an item into the trie. @@ -116,10 +116,10 @@ func (m *SparseMerkleTrie) Insert(item []byte, index int) { neighbor = m.branches[i][neighborIdx] } if isLeft { - parentHash := hashutil.Hash(append(root[:], neighbor...)) + parentHash := hash.Hash(append(root[:], neighbor...)) root = parentHash } else { - parentHash := hashutil.Hash(append(neighbor, root[:]...)) + parentHash := hash.Hash(append(neighbor, root[:]...)) root = parentHash } parentIdx := currentIndex / 2 @@ -181,9 +181,9 @@ func VerifyMerkleBranch(root, item []byte, merkleIndex int, proof [][]byte, dept node := bytesutil.ToBytes32(item) for i := 0; i <= int(depth); i++ { if (uint64(merkleIndex) / mathutil.PowerOf2(uint64(i)) % 2) != 0 { - node = hashutil.Hash(append(proof[i], node[:]...)) + node = hash.Hash(append(proof[i], node[:]...)) } else { - node = hashutil.Hash(append(node[:], proof[i]...)) + node = hash.Hash(append(node[:], proof[i]...)) } } diff --git a/shared/trieutil/sparse_merkle_test.go b/shared/trieutil/sparse_merkle_test.go index 2389579af8..8cfff25156 100644 --- a/shared/trieutil/sparse_merkle_test.go +++ b/shared/trieutil/sparse_merkle_test.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) @@ -48,7 +48,7 @@ func TestMarshalDepositWithProof(t *testing.T) { } func TestMerkleTrie_MerkleProofOutOfRange(t *testing.T) { - h := hashutil.Hash([]byte("hi")) + h := hash.Hash([]byte("hi")) m := &SparseMerkleTrie{ branches: [][][]byte{ { diff --git a/slasher/db/kv/BUILD.bazel b/slasher/db/kv/BUILD.bazel index 1f3f8b0ca2..7af5bbf931 100644 --- a/slasher/db/kv/BUILD.bazel +++ b/slasher/db/kv/BUILD.bazel @@ -20,10 +20,10 @@ go_library( visibility = ["//slasher:__subpackages__"], deps = [ "//beacon-chain/core:go_default_library", + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/fileutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//slasher/cache:go_default_library", "//slasher/db/types:go_default_library", diff --git a/slasher/db/kv/attester_slashings.go b/slasher/db/kv/attester_slashings.go index e6081aa8d6..128d5ac028 100644 --- a/slasher/db/kv/attester_slashings.go +++ b/slasher/db/kv/attester_slashings.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" slashertypes "github.com/prysmaticlabs/prysm/slasher/db/types" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" @@ -62,7 +62,7 @@ func (s *Store) AttesterSlashings(ctx context.Context, status slashertypes.Slash func (s *Store) DeleteAttesterSlashing(ctx context.Context, attesterSlashing *ethpb.AttesterSlashing) error { ctx, span := trace.StartSpan(ctx, "slasherDB.deleteAttesterSlashing") defer span.End() - root, err := hashutil.HashProto(attesterSlashing) + root, err := hash.HashProto(attesterSlashing) if err != nil { return errors.Wrap(err, "failed to get hash root of attesterSlashing") } @@ -85,7 +85,7 @@ func (s *Store) HasAttesterSlashing(ctx context.Context, slashing *ethpb.Atteste defer span.End() var status slashertypes.SlashingStatus var found bool - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return found, status, errors.Wrap(err, "failed to get hash root of attesterSlashing") } @@ -110,7 +110,7 @@ func (s *Store) SaveAttesterSlashing(ctx context.Context, status slashertypes.Sl if err != nil { return errors.Wrap(err, "failed to marshal") } - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return err } @@ -134,7 +134,7 @@ func (s *Store) SaveAttesterSlashings(ctx context.Context, status slashertypes.S if err != nil { return errors.Wrap(err, "failed to marshal") } - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return err } diff --git a/slasher/db/kv/proposer_slashings.go b/slasher/db/kv/proposer_slashings.go index 2ae01d5d40..3a7cb9ad3c 100644 --- a/slasher/db/kv/proposer_slashings.go +++ b/slasher/db/kv/proposer_slashings.go @@ -5,8 +5,8 @@ import ( "context" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/slasher/db/types" bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" @@ -62,7 +62,7 @@ func (s *Store) ProposalSlashingsByStatus(ctx context.Context, status types.Slas func (s *Store) DeleteProposerSlashing(ctx context.Context, slashing *ethpb.ProposerSlashing) error { ctx, span := trace.StartSpan(ctx, "slasherDB.deleteProposerSlashing") defer span.End() - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return errors.Wrap(err, "failed to get hash root of proposerSlashing") } @@ -83,7 +83,7 @@ func (s *Store) HasProposerSlashing(ctx context.Context, slashing *ethpb.Propose defer span.End() var status types.SlashingStatus var found bool - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return found, status, errors.Wrap(err, "failed to get hash root of proposerSlashing") } @@ -109,7 +109,7 @@ func (s *Store) SaveProposerSlashing(ctx context.Context, status types.SlashingS if err != nil { return errors.Wrap(err, "failed to marshal") } - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return err } @@ -133,7 +133,7 @@ func (s *Store) SaveProposerSlashings(ctx context.Context, status types.Slashing if err != nil { return errors.Wrap(err, "failed to marshal") } - root, err := hashutil.HashProto(slashing) + root, err := hash.HashProto(slashing) if err != nil { return err } diff --git a/slasher/detection/BUILD.bazel b/slasher/detection/BUILD.bazel index ba8197a2fe..51d6a8be8b 100644 --- a/slasher/detection/BUILD.bazel +++ b/slasher/detection/BUILD.bazel @@ -12,12 +12,12 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection", visibility = ["//slasher:__subpackages__"], deps = [ + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", "//shared/blockutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", - "//shared/hashutil:go_default_library", "//shared/slashutil:go_default_library", "//shared/sliceutil:go_default_library", "//slasher/beaconclient:go_default_library", diff --git a/slasher/detection/detect.go b/slasher/detection/detect.go index 15bad4d0ac..f5e8a8a4b2 100644 --- a/slasher/detection/detect.go +++ b/slasher/detection/detect.go @@ -5,11 +5,11 @@ import ( "context" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/slashutil" "github.com/prysmaticlabs/prysm/shared/sliceutil" status "github.com/prysmaticlabs/prysm/slasher/db/types" @@ -63,7 +63,7 @@ func (s *Service) DetectAttesterSlashings( keys := make(map[[32]byte]bool) var slashingList []*ethpb.AttesterSlashing for _, ss := range slashings { - hash, err := hashutil.HashProto(ss) + hash, err := hash.HashProto(ss) if err != nil { return nil, errors.Wrap(err, "could not hash slashing") } @@ -198,7 +198,7 @@ func (s *Service) mapResultsToAtts(ctx context.Context, results []*types.Detecti func resultHash(result *types.DetectionResult) [32]byte { resultBytes := append(bytesutil.Bytes8(uint64(result.SlashableEpoch)), result.SigBytes[:]...) - return hashutil.Hash(resultBytes) + return hash.Hash(resultBytes) } func isDoublePropose(incomingBlockHeader, prevBlockHeader *ethpb.SignedBeaconBlockHeader) bool { diff --git a/slasher/detection/testing/BUILD.bazel b/slasher/detection/testing/BUILD.bazel index 5d328045a0..cf3d49b834 100644 --- a/slasher/detection/testing/BUILD.bazel +++ b/slasher/detection/testing/BUILD.bazel @@ -6,8 +6,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/slasher/detection/testing", visibility = ["//visibility:public"], deps = [ + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/rand:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", ], ) diff --git a/slasher/detection/testing/utils.go b/slasher/detection/testing/utils.go index 3f03a1299a..412b6d1f04 100644 --- a/slasher/detection/testing/utils.go +++ b/slasher/detection/testing/utils.go @@ -4,8 +4,8 @@ package testing import ( types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/crypto/rand" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/rand" ) // SignedBlockHeader given slot, proposer index this function generates signed block header. diff --git a/slasher/rpc/BUILD.bazel b/slasher/rpc/BUILD.bazel index a25e4f71ee..7e801fba8f 100644 --- a/slasher/rpc/BUILD.bazel +++ b/slasher/rpc/BUILD.bazel @@ -12,10 +12,10 @@ go_library( deps = [ "//beacon-chain/core:go_default_library", "//beacon-chain/core/helpers:go_default_library", + "//crypto/bls:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/attestationutil:go_default_library", - "//shared/bls:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", "//slasher/beaconclient:go_default_library", @@ -50,8 +50,8 @@ go_test( "//beacon-chain/core:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/p2p/types:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/mock:go_default_library", "//shared/p2putils:go_default_library", diff --git a/slasher/rpc/server.go b/slasher/rpc/server.go index 512f3b2b1f..6c5d5a8783 100644 --- a/slasher/rpc/server.go +++ b/slasher/rpc/server.go @@ -8,10 +8,10 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" slashpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/attestationutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/p2putils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/slasher/beaconclient" diff --git a/slasher/rpc/server_test.go b/slasher/rpc/server_test.go index 3d58e943e5..4936f9ce6c 100644 --- a/slasher/rpc/server_test.go +++ b/slasher/rpc/server_test.go @@ -11,8 +11,8 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/p2putils" diff --git a/testing/spectest/general/phase0/bls/BUILD.bazel b/testing/spectest/general/phase0/bls/BUILD.bazel index 7d43056c5a..ec8a7fc021 100644 --- a/testing/spectest/general/phase0/bls/BUILD.bazel +++ b/testing/spectest/general/phase0/bls/BUILD.bazel @@ -31,8 +31,8 @@ go_test( embed = [":go_default_library"], tags = ["spectest"], deps = [ - "//shared/bls:go_default_library", - "//shared/bls/common:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/bls/common:go_default_library", "//shared/bytesutil:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/testing/spectest/general/phase0/bls/aggregate_test.go b/testing/spectest/general/phase0/bls/aggregate_test.go index c5d8c481cb..b21a534bb3 100644 --- a/testing/spectest/general/phase0/bls/aggregate_test.go +++ b/testing/spectest/general/phase0/bls/aggregate_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/testing/spectest/utils" diff --git a/testing/spectest/general/phase0/bls/aggregate_verify_test.go b/testing/spectest/general/phase0/bls/aggregate_verify_test.go index f8201581a5..1b33a72eb4 100644 --- a/testing/spectest/general/phase0/bls/aggregate_verify_test.go +++ b/testing/spectest/general/phase0/bls/aggregate_verify_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go b/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go index e7c6b65583..88c4238beb 100644 --- a/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go +++ b/testing/spectest/general/phase0/bls/fast_aggregate_verify_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/testing/spectest/general/phase0/bls/sign_test.go b/testing/spectest/general/phase0/bls/sign_test.go index 09c75cc998..42bc626cc9 100644 --- a/testing/spectest/general/phase0/bls/sign_test.go +++ b/testing/spectest/general/phase0/bls/sign_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/testing/spectest/utils" diff --git a/testing/spectest/general/phase0/bls/verify_test.go b/testing/spectest/general/phase0/bls/verify_test.go index c76d95aa0e..48ee347536 100644 --- a/testing/spectest/general/phase0/bls/verify_test.go +++ b/testing/spectest/general/phase0/bls/verify_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/bls/common" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/bls/common" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/prysmaticlabs/prysm/testing/spectest/utils" diff --git a/third_party/herumi/bls_eth_go_binary.BUILD b/third_party/herumi/bls_eth_go_binary.BUILD index f95b8b927b..10ae150235 100644 --- a/third_party/herumi/bls_eth_go_binary.BUILD +++ b/third_party/herumi/bls_eth_go_binary.BUILD @@ -149,7 +149,7 @@ go_library( copts = OPTS, visibility = [ # Additional access will require security approval. - "@prysm//shared/bls/herumi:__pkg__", + "@prysm//crypto/bls/herumi:__pkg__", "@com_github_wealdtech_go_eth2_types_v2//:__pkg__", ], clinkopts = select({ diff --git a/tools/analyzers/cryptorand/analyzer.go b/tools/analyzers/cryptorand/analyzer.go index 9bd97250d4..6abe13b84a 100644 --- a/tools/analyzers/cryptorand/analyzer.go +++ b/tools/analyzers/cryptorand/analyzer.go @@ -16,7 +16,7 @@ import ( // Doc explaining the tool. const Doc = "Tool to enforce the use of stronger crypto: crypto/rand instead of math/rand" -var errWeakCrypto = errors.New("crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand") +var errWeakCrypto = errors.New("crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand") // Analyzer runs static analysis. var Analyzer = &analysis.Analyzer{ @@ -50,7 +50,7 @@ func run(pass *analysis.Pass) (interface{}, error) { case *ast.ImportSpec: // Collect aliases to rand packages. pkg := stmt.Path.Value - if strings.HasSuffix(pkg, "/rand\"") && !strings.Contains(pkg, "/prysm/shared/rand") { + if strings.HasSuffix(pkg, "/rand\"") && !strings.Contains(pkg, "/prysm/crypto/rand") { if stmt.Name != nil { aliases[stmt.Name.Name] = stmt.Path.Value } else { diff --git a/tools/analyzers/cryptorand/testdata/custom_import.go b/tools/analyzers/cryptorand/testdata/custom_import.go index de685d0293..62cbcf6224 100644 --- a/tools/analyzers/cryptorand/testdata/custom_import.go +++ b/tools/analyzers/cryptorand/testdata/custom_import.go @@ -9,25 +9,25 @@ import ( // UseRandNewCustomImport -- func UseRandNewCustomImport() { // #nosec G404 - source := mathRand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + source := mathRand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" // #nosec G404 - randGenerator := mathRand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + randGenerator := mathRand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" start := uint64(randGenerator.Intn(32)) _ = start // #nosec G404 - source = mathRand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + source = mathRand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" // #nosec G404 - randGenerator = mathRand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + randGenerator = mathRand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" } // UseWithoutSeeCustomImport -- func UseWithoutSeeCustomImport() { // #nosec G404 - assignedIndex := mathRand.Intn(128) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + assignedIndex := mathRand.Intn(128) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" _ = assignedIndex // #nosec G404 - foobar.Shuffle(10, func(i, j int) { // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + foobar.Shuffle(10, func(i, j int) { // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" }) } diff --git a/tools/analyzers/cryptorand/testdata/rand_new.go b/tools/analyzers/cryptorand/testdata/rand_new.go index 11011aee27..c1f31726f4 100644 --- a/tools/analyzers/cryptorand/testdata/rand_new.go +++ b/tools/analyzers/cryptorand/testdata/rand_new.go @@ -9,21 +9,21 @@ import ( // UseRandNew -- func UseRandNew() { // #nosec G404 - source := rand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + source := rand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" // #nosec G404 - randGenerator := mathRand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + randGenerator := mathRand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" start := uint64(randGenerator.Intn(32)) _ = start // #nosec G404 - source = rand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + source = rand.NewSource(time.Now().UnixNano()) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" // #nosec G404 - randGenerator = rand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + randGenerator = rand.New(source) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" } // UseWithoutSeed -- func UseWithoutSeed() { // #nosec G404 - assignedIndex := rand.Intn(128) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/shared/rand" + assignedIndex := rand.Intn(128) // want "crypto-secure RNGs are required, use CSPRNG or PRNG defined in github.com/prysmaticlabs/prysm/crypto/rand" _ = assignedIndex } diff --git a/tools/genesis-state-gen/BUILD.bazel b/tools/genesis-state-gen/BUILD.bazel index 1f48bce683..3a42c86e77 100644 --- a/tools/genesis-state-gen/BUILD.bazel +++ b/tools/genesis-state-gen/BUILD.bazel @@ -56,7 +56,7 @@ go_test( srcs = ["main_test.go"], embed = [":go_default_library"], deps = [ - "//shared/bls:go_default_library", + "//crypto/bls:go_default_library", "//shared/interop:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/tools/genesis-state-gen/main_test.go b/tools/genesis-state-gen/main_test.go index 9ff8facbcd..629ad41df8 100644 --- a/tools/genesis-state-gen/main_test.go +++ b/tools/genesis-state-gen/main_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/tools/keystores/BUILD.bazel b/tools/keystores/BUILD.bazel index 0a154ad321..67ede18682 100644 --- a/tools/keystores/BUILD.bazel +++ b/tools/keystores/BUILD.bazel @@ -7,7 +7,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/tools/keystores", visibility = ["//visibility:private"], deps = [ - "//shared/bls:go_default_library", + "//crypto/bls:go_default_library", "//shared/fileutil:go_default_library", "//shared/promptutil:go_default_library", "//validator/keymanager:go_default_library", @@ -30,7 +30,7 @@ go_test( srcs = ["main_test.go"], embed = [":go_default_library"], deps = [ - "//shared/bls:go_default_library", + "//crypto/bls:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/tools/keystores/main.go b/tools/keystores/main.go index a7c03fce74..85ca2b6acc 100644 --- a/tools/keystores/main.go +++ b/tools/keystores/main.go @@ -17,7 +17,7 @@ import ( "github.com/google/uuid" "github.com/logrusorgru/aurora" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/promptutil" "github.com/prysmaticlabs/prysm/validator/keymanager" diff --git a/tools/keystores/main_test.go b/tools/keystores/main_test.go index 48e2ffe44a..a95a00f272 100644 --- a/tools/keystores/main_test.go +++ b/tools/keystores/main_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/tools/unencrypted-keys-gen/BUILD.bazel b/tools/unencrypted-keys-gen/BUILD.bazel index 6dfb90aeb9..54d99860bb 100644 --- a/tools/unencrypted-keys-gen/BUILD.bazel +++ b/tools/unencrypted-keys-gen/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "//tools/interop/convert-keys:__pkg__", ], deps = [ - "//shared/bls:go_default_library", + "//crypto/bls:go_default_library", "//shared/interop:go_default_library", "//tools/unencrypted-keys-gen/keygen:go_default_library", ], diff --git a/tools/unencrypted-keys-gen/main.go b/tools/unencrypted-keys-gen/main.go index cdf237aaf4..42358bc5ba 100644 --- a/tools/unencrypted-keys-gen/main.go +++ b/tools/unencrypted-keys-gen/main.go @@ -5,7 +5,7 @@ import ( "log" "os" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/tools/unencrypted-keys-gen/keygen" ) diff --git a/validator/accounts/BUILD.bazel b/validator/accounts/BUILD.bazel index 3069e51e93..933459d8b5 100644 --- a/validator/accounts/BUILD.bazel +++ b/validator/accounts/BUILD.bazel @@ -25,8 +25,8 @@ go_library( deps = [ "//beacon-chain/core/blocks:go_default_library", "//cmd/validator/flags:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/cmd:go_default_library", "//shared/fileutil:go_default_library", @@ -71,9 +71,9 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/validator/flags:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", diff --git a/validator/accounts/accounts_backup.go b/validator/accounts/accounts_backup.go index b8847517e4..842ea0e778 100644 --- a/validator/accounts/accounts_backup.go +++ b/validator/accounts/accounts_backup.go @@ -13,7 +13,7 @@ import ( "github.com/manifoldco/promptui" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/petnames" diff --git a/validator/accounts/accounts_helper.go b/validator/accounts/accounts_helper.go index 57d0ca59b2..d6a9fe5a75 100644 --- a/validator/accounts/accounts_helper.go +++ b/validator/accounts/accounts_helper.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/urfave/cli/v2" ) diff --git a/validator/accounts/accounts_import.go b/validator/accounts/accounts_import.go index eac3c28f6a..c3fff8905c 100644 --- a/validator/accounts/accounts_import.go +++ b/validator/accounts/accounts_import.go @@ -15,7 +15,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/cmd/validator/flags" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/promptutil" diff --git a/validator/accounts/accounts_import_test.go b/validator/accounts/accounts_import_test.go index 1030c85611..b2a3e20ec3 100644 --- a/validator/accounts/accounts_import_test.go +++ b/validator/accounts/accounts_import_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/accounts/accounts_list_test.go b/validator/accounts/accounts_list_test.go index 157076e369..5515689fdb 100644 --- a/validator/accounts/accounts_list_test.go +++ b/validator/accounts/accounts_list_test.go @@ -13,9 +13,9 @@ import ( "github.com/golang/mock/gomock" "github.com/google/uuid" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index 4a6da468a2..98655ec564 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -26,21 +26,21 @@ go_library( "//beacon-chain/core/helpers:go_default_library", "//cache/lru:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/hash:go_default_library", + "//crypto/rand:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/blockutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/grpcutils:go_default_library", - "//shared/hashutil:go_default_library", "//shared/mathutil:go_default_library", "//shared/mputil:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//shared/slashutil:go_default_library", "//shared/version:go_default_library", "//time:go_default_library", @@ -108,11 +108,11 @@ go_test( "//beacon-chain/core/helpers:go_default_library", "//cache/lru:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", diff --git a/validator/client/aggregate.go b/validator/client/aggregate.go index c1f42c5d14..b8510b6918 100644 --- a/validator/client/aggregate.go +++ b/validator/client/aggregate.go @@ -8,10 +8,10 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" prysmTime "github.com/prysmaticlabs/prysm/time" "github.com/prysmaticlabs/prysm/time/slots" diff --git a/validator/client/aggregate_test.go b/validator/client/aggregate_test.go index 13d75c4619..6f7fc31361 100644 --- a/validator/client/aggregate_test.go +++ b/validator/client/aggregate_test.go @@ -8,8 +8,8 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/client/attest.go b/validator/client/attest.go index 4ee9998ca5..462081baf9 100644 --- a/validator/client/attest.go +++ b/validator/client/attest.go @@ -12,12 +12,12 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/mputil" "github.com/prysmaticlabs/prysm/shared/params" prysmTime "github.com/prysmaticlabs/prysm/time" @@ -232,7 +232,7 @@ func (v *validator) saveAttesterIndexToData(data *ethpb.AttestationData, index t v.attLogsLock.Lock() defer v.attLogsLock.Unlock() - h, err := hashutil.HashProto(data) + h, err := hash.HashProto(data) if err != nil { return err } diff --git a/validator/client/attest_test.go b/validator/client/attest_test.go index 6fae0e2f1f..b462b54909 100644 --- a/validator/client/attest_test.go +++ b/validator/client/attest_test.go @@ -14,10 +14,10 @@ import ( "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/validator/client/key_reload_test.go b/validator/client/key_reload_test.go index e1ade77976..93c2ec1f5a 100644 --- a/validator/client/key_reload_test.go +++ b/validator/client/key_reload_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/client/propose.go b/validator/client/propose.go index 5f400f5a2f..34981350ca 100644 --- a/validator/client/propose.go +++ b/validator/client/propose.go @@ -10,15 +10,15 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/rand" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" wrapper "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mputil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/version" prysmTime "github.com/prysmaticlabs/prysm/time" "github.com/prysmaticlabs/prysm/validator/client/iface" diff --git a/validator/client/propose_test.go b/validator/client/propose_test.go index 50ba7cf71f..350d3364c3 100644 --- a/validator/client/propose_test.go +++ b/validator/client/propose_test.go @@ -11,10 +11,10 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/params" diff --git a/validator/client/sync_committee.go b/validator/client/sync_committee.go index bd122ee103..b5b4d47565 100644 --- a/validator/client/sync_committee.go +++ b/validator/client/sync_committee.go @@ -10,10 +10,10 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/sirupsen/logrus" diff --git a/validator/client/sync_committee_test.go b/validator/client/sync_committee_test.go index 41fb199cc3..671dc6bf3b 100644 --- a/validator/client/sync_committee_test.go +++ b/validator/client/sync_committee_test.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/prysm/crypto/bls" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/client/validator.go b/validator/client/validator.go index cca0ff9785..3c870fa752 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -21,12 +21,12 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/hash" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" - "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/time/slots" accountsiface "github.com/prysmaticlabs/prysm/validator/accounts/iface" @@ -699,7 +699,7 @@ func (v *validator) isAggregator(ctx context.Context, committee []types.Validato return false, err } - b := hashutil.Hash(slotSig) + b := hash.Hash(slotSig) return binary.LittleEndian.Uint64(b[:8])%modulo == 0, nil } diff --git a/validator/client/validator_test.go b/validator/client/validator_test.go index 9f8711bfe5..72396d4ef3 100644 --- a/validator/client/validator_test.go +++ b/validator/client/validator_test.go @@ -13,9 +13,9 @@ import ( "github.com/golang/mock/gomock" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" diff --git a/validator/client/wait_for_activation_test.go b/validator/client/wait_for_activation_test.go index d5960183d4..d08db8ae91 100644 --- a/validator/client/wait_for_activation_test.go +++ b/validator/client/wait_for_activation_test.go @@ -9,8 +9,8 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/crypto/bls" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/db/kv/BUILD.bazel b/validator/db/kv/BUILD.bazel index d203b512be..b05949aabc 100644 --- a/validator/db/kv/BUILD.bazel +++ b/validator/db/kv/BUILD.bazel @@ -59,9 +59,9 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//crypto/hash:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/hashutil:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/validator/db/kv/graffiti_test.go b/validator/db/kv/graffiti_test.go index 52c7ca9bbc..1106f2ce2c 100644 --- a/validator/db/kv/graffiti_test.go +++ b/validator/db/kv/graffiti_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) @@ -21,30 +21,30 @@ func TestStore_GraffitiOrderedIndex_ReadAndWrite(t *testing.T) { name: "empty then write", want: 0, write: 15, - fileHash: hashutil.Hash([]byte("one")), + fileHash: hash.Hash([]byte("one")), }, { name: "update with same file hash", want: 15, write: 20, - fileHash: hashutil.Hash([]byte("one")), + fileHash: hash.Hash([]byte("one")), }, { name: "continued updates", want: 20, write: 21, - fileHash: hashutil.Hash([]byte("one")), + fileHash: hash.Hash([]byte("one")), }, { name: "reset with new file hash", want: 0, write: 10, - fileHash: hashutil.Hash([]byte("two")), + fileHash: hash.Hash([]byte("two")), }, { name: "read with new file hash", want: 10, - fileHash: hashutil.Hash([]byte("two")), + fileHash: hash.Hash([]byte("two")), }, } for _, tt := range tests { diff --git a/validator/graffiti/BUILD.bazel b/validator/graffiti/BUILD.bazel index 1a9a1dc51a..4a6aaaed5d 100644 --- a/validator/graffiti/BUILD.bazel +++ b/validator/graffiti/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/graffiti", visibility = ["//validator:__subpackages__"], deps = [ - "//shared/hashutil:go_default_library", + "//crypto/hash:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@in_gopkg_yaml_v2//:go_default_library", @@ -21,7 +21,7 @@ go_test( srcs = ["parse_graffiti_test.go"], embed = [":go_default_library"], deps = [ - "//shared/hashutil:go_default_library", + "//crypto/hash:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/validator/graffiti/parse_graffiti.go b/validator/graffiti/parse_graffiti.go index 2198d200c9..7b277f740b 100644 --- a/validator/graffiti/parse_graffiti.go +++ b/validator/graffiti/parse_graffiti.go @@ -6,7 +6,7 @@ import ( "strings" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "gopkg.in/yaml.v2" ) @@ -52,7 +52,7 @@ func ParseGraffitiFile(f string) (*Graffiti, error) { } g.Default = ParseHexGraffiti(g.Default) - g.Hash = hashutil.Hash(yamlFile) + g.Hash = hash.Hash(yamlFile) return g, nil } diff --git a/validator/graffiti/parse_graffiti_test.go b/validator/graffiti/parse_graffiti_test.go index 35e3ce4e0f..9974444553 100644 --- a/validator/graffiti/parse_graffiti_test.go +++ b/validator/graffiti/parse_graffiti_test.go @@ -7,7 +7,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/shared/hashutil" + "github.com/prysmaticlabs/prysm/crypto/hash" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) @@ -25,7 +25,7 @@ func TestParseGraffitiFile_Default(t *testing.T) { require.NoError(t, err) wanted := &Graffiti{ - Hash: hashutil.Hash(input), + Hash: hash.Hash(input), Default: "Mr T was here", } require.DeepEqual(t, wanted, got) @@ -47,7 +47,7 @@ func TestParseGraffitiFile_Random(t *testing.T) { require.NoError(t, err) wanted := &Graffiti{ - Hash: hashutil.Hash(input), + Hash: hash.Hash(input), Random: []string{ "Mr A was here", "Mr B was here", @@ -73,7 +73,7 @@ func TestParseGraffitiFile_Ordered(t *testing.T) { require.NoError(t, err) wanted := &Graffiti{ - Hash: hashutil.Hash(input), + Hash: hash.Hash(input), Ordered: []string{ "Mr D was here", "Mr E was here", @@ -100,7 +100,7 @@ specific: require.NoError(t, err) wanted := &Graffiti{ - Hash: hashutil.Hash(input), + Hash: hash.Hash(input), Specific: map[types.ValidatorIndex]string{ 1234: "Yolo", 555: "What's up", @@ -138,7 +138,7 @@ specific: require.NoError(t, err) wanted := &Graffiti{ - Hash: hashutil.Hash(input), + Hash: hash.Hash(input), Default: "Mr T was here", Random: []string{ "Mr A was here", diff --git a/validator/keymanager/BUILD.bazel b/validator/keymanager/BUILD.bazel index 14362123e2..8355b83d29 100644 --- a/validator/keymanager/BUILD.bazel +++ b/validator/keymanager/BUILD.bazel @@ -13,8 +13,8 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/event:go_default_library", ], ) diff --git a/validator/keymanager/derived/BUILD.bazel b/validator/keymanager/derived/BUILD.bazel index 7cf5b3a0bf..fc3e251a8b 100644 --- a/validator/keymanager/derived/BUILD.bazel +++ b/validator/keymanager/derived/BUILD.bazel @@ -13,11 +13,11 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//crypto/bls:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/event:go_default_library", "//shared/promptutil:go_default_library", - "//shared/rand:go_default_library", "//validator/accounts/iface:go_default_library", "//validator/keymanager:go_default_library", "//validator/keymanager/imported:go_default_library", @@ -37,9 +37,9 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//crypto/bls:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", - "//shared/rand:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "//validator/accounts/testing:go_default_library", diff --git a/validator/keymanager/derived/eip_test.go b/validator/keymanager/derived/eip_test.go index f15ea321e0..5af99a00f4 100644 --- a/validator/keymanager/derived/eip_test.go +++ b/validator/keymanager/derived/eip_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" util "github.com/wealdtech/go-eth2-util" diff --git a/validator/keymanager/derived/keymanager.go b/validator/keymanager/derived/keymanager.go index 4450b9d285..1eefed0334 100644 --- a/validator/keymanager/derived/keymanager.go +++ b/validator/keymanager/derived/keymanager.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/validator/accounts/iface" "github.com/prysmaticlabs/prysm/validator/keymanager" diff --git a/validator/keymanager/derived/keymanager_test.go b/validator/keymanager/derived/keymanager_test.go index e526325ea8..db2263cbe8 100644 --- a/validator/keymanager/derived/keymanager_test.go +++ b/validator/keymanager/derived/keymanager_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/rand" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" mock "github.com/prysmaticlabs/prysm/validator/accounts/testing" diff --git a/validator/keymanager/derived/mnemonic.go b/validator/keymanager/derived/mnemonic.go index b8ed4aef2d..870f5d4c29 100644 --- a/validator/keymanager/derived/mnemonic.go +++ b/validator/keymanager/derived/mnemonic.go @@ -5,8 +5,8 @@ import ( "os" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/promptutil" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/tyler-smith/go-bip39" ) diff --git a/validator/keymanager/imported/BUILD.bazel b/validator/keymanager/imported/BUILD.bazel index 5a9a231955..6acf9194e0 100644 --- a/validator/keymanager/imported/BUILD.bazel +++ b/validator/keymanager/imported/BUILD.bazel @@ -18,9 +18,9 @@ go_library( ], deps = [ "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//shared/asyncutil:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", @@ -50,8 +50,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/validator/keymanager/imported/backup.go b/validator/keymanager/imported/backup.go index fd6121625a..db340c2eff 100644 --- a/validator/keymanager/imported/backup.go +++ b/validator/keymanager/imported/backup.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/validator/keymanager" keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" diff --git a/validator/keymanager/imported/backup_test.go b/validator/keymanager/imported/backup_test.go index d2aaae5aa1..8ed3927407 100644 --- a/validator/keymanager/imported/backup_test.go +++ b/validator/keymanager/imported/backup_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "testing" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/keymanager/imported/import.go b/validator/keymanager/imported/import.go index fa6b5b8472..d21259b941 100644 --- a/validator/keymanager/imported/import.go +++ b/validator/keymanager/imported/import.go @@ -9,7 +9,7 @@ import ( "github.com/k0kubun/go-ansi" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/promptutil" "github.com/prysmaticlabs/prysm/validator/keymanager" "github.com/schollz/progressbar/v3" diff --git a/validator/keymanager/imported/import_test.go b/validator/keymanager/imported/import_test.go index 83ff85d415..f211fc64fd 100644 --- a/validator/keymanager/imported/import_test.go +++ b/validator/keymanager/imported/import_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" mock "github.com/prysmaticlabs/prysm/validator/accounts/testing" diff --git a/validator/keymanager/imported/keymanager.go b/validator/keymanager/imported/keymanager.go index fe2612f0da..b86a8c0e4e 100644 --- a/validator/keymanager/imported/keymanager.go +++ b/validator/keymanager/imported/keymanager.go @@ -10,8 +10,8 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/interop" diff --git a/validator/keymanager/imported/keymanager_test.go b/validator/keymanager/imported/keymanager_test.go index 752f680656..44477fff83 100644 --- a/validator/keymanager/imported/keymanager_test.go +++ b/validator/keymanager/imported/keymanager_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" diff --git a/validator/keymanager/imported/refresh.go b/validator/keymanager/imported/refresh.go index c1ffee0ec7..dfe630b8c5 100644 --- a/validator/keymanager/imported/refresh.go +++ b/validator/keymanager/imported/refresh.go @@ -9,8 +9,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/asyncutil" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/validator/keymanager" diff --git a/validator/keymanager/imported/refresh_test.go b/validator/keymanager/imported/refresh_test.go index 07378d103d..6ca8a3de25 100644 --- a/validator/keymanager/imported/refresh_test.go +++ b/validator/keymanager/imported/refresh_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/keymanager/remote/BUILD.bazel b/validator/keymanager/remote/BUILD.bazel index c28f73776a..042386761a 100644 --- a/validator/keymanager/remote/BUILD.bazel +++ b/validator/keymanager/remote/BUILD.bazel @@ -14,8 +14,8 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//validator/keymanager:go_default_library", @@ -33,8 +33,8 @@ go_test( srcs = ["keymanager_test.go"], embed = [":go_default_library"], deps = [ + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/mock:go_default_library", diff --git a/validator/keymanager/remote/keymanager.go b/validator/keymanager/remote/keymanager.go index 113918f7c7..64741fdd2a 100644 --- a/validator/keymanager/remote/keymanager.go +++ b/validator/keymanager/remote/keymanager.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/logrusorgru/aurora" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/validator/keymanager" diff --git a/validator/keymanager/remote/keymanager_test.go b/validator/keymanager/remote/keymanager_test.go index bdab10b159..039f2f0857 100644 --- a/validator/keymanager/remote/keymanager_test.go +++ b/validator/keymanager/remote/keymanager_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/mock" diff --git a/validator/keymanager/remote/mock_keymanager.go b/validator/keymanager/remote/mock_keymanager.go index 189046f76e..8deb04bcb8 100644 --- a/validator/keymanager/remote/mock_keymanager.go +++ b/validator/keymanager/remote/mock_keymanager.go @@ -3,8 +3,8 @@ package remote import ( "context" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/event" ) diff --git a/validator/keymanager/types.go b/validator/keymanager/types.go index cd1b6221f0..aea8f6de65 100644 --- a/validator/keymanager/types.go +++ b/validator/keymanager/types.go @@ -4,8 +4,8 @@ import ( "context" "fmt" + "github.com/prysmaticlabs/prysm/crypto/bls" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/event" ) diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel index dfe4a9e758..1eb3207e78 100644 --- a/validator/rpc/BUILD.bazel +++ b/validator/rpc/BUILD.bazel @@ -17,10 +17,11 @@ go_library( visibility = ["//validator:__subpackages__"], deps = [ "//config/features:go_default_library", + "//crypto/bls:go_default_library", + "//crypto/rand:go_default_library", "//monitoring/tracing:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/cmd:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", @@ -29,7 +30,6 @@ go_library( "//shared/pagination:go_default_library", "//shared/petnames:go_default_library", "//shared/promptutil:go_default_library", - "//shared/rand:go_default_library", "//shared/version:go_default_library", "//time:go_default_library", "//validator/accounts:go_default_library", @@ -80,9 +80,9 @@ go_test( deps = [ "//cmd/validator/flags:go_default_library", "//config/features:go_default_library", + "//crypto/bls:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", diff --git a/validator/rpc/accounts.go b/validator/rpc/accounts.go index 9542e2a8e9..d10e7f1d70 100644 --- a/validator/rpc/accounts.go +++ b/validator/rpc/accounts.go @@ -7,8 +7,8 @@ import ( "encoding/json" "fmt" + "github.com/prysmaticlabs/prysm/crypto/bls" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/cmd" "github.com/prysmaticlabs/prysm/shared/pagination" "github.com/prysmaticlabs/prysm/shared/petnames" diff --git a/validator/rpc/server.go b/validator/rpc/server.go index 4acbd73757..e6f8bded5e 100644 --- a/validator/rpc/server.go +++ b/validator/rpc/server.go @@ -11,13 +11,13 @@ import ( recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/monitoring/tracing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/logutil" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/validator/accounts/wallet" "github.com/prysmaticlabs/prysm/validator/client" "github.com/prysmaticlabs/prysm/validator/db" diff --git a/validator/rpc/wallet.go b/validator/rpc/wallet.go index f043752a87..e5e1631aff 100644 --- a/validator/rpc/wallet.go +++ b/validator/rpc/wallet.go @@ -11,10 +11,10 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/rand" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/promptutil" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/validator/accounts" "github.com/prysmaticlabs/prysm/validator/accounts/iface" "github.com/prysmaticlabs/prysm/validator/accounts/wallet" diff --git a/validator/rpc/wallet_test.go b/validator/rpc/wallet_test.go index 6008a85d30..e240b39e5f 100644 --- a/validator/rpc/wallet_test.go +++ b/validator/rpc/wallet_test.go @@ -11,8 +11,8 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/google/uuid" "github.com/prysmaticlabs/prysm/config/features" + "github.com/prysmaticlabs/prysm/crypto/bls" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/fileutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" diff --git a/validator/testing/BUILD.bazel b/validator/testing/BUILD.bazel index bc7e943d6a..67ecb949da 100644 --- a/validator/testing/BUILD.bazel +++ b/validator/testing/BUILD.bazel @@ -12,11 +12,11 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/testing", visibility = ["//validator:__subpackages__"], deps = [ + "//crypto/bls:go_default_library", + "//crypto/rand:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/params:go_default_library", - "//shared/rand:go_default_library", "//validator/db/kv:go_default_library", "//validator/slashing-protection/local/standard-protection-format/format:go_default_library", "@com_github_prysmaticlabs_eth2_types//:go_default_library", diff --git a/validator/testing/protection_history.go b/validator/testing/protection_history.go index 22b5413387..a4375fa0c3 100644 --- a/validator/testing/protection_history.go +++ b/validator/testing/protection_history.go @@ -4,10 +4,10 @@ import ( "fmt" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/shared/bls" + "github.com/prysmaticlabs/prysm/crypto/bls" + "github.com/prysmaticlabs/prysm/crypto/rand" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" - "github.com/prysmaticlabs/prysm/shared/rand" "github.com/prysmaticlabs/prysm/validator/db/kv" "github.com/prysmaticlabs/prysm/validator/slashing-protection/local/standard-protection-format/format" )