From b82e2e7d403ca1fcc66283066c824bae4d8aa55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= Date: Tue, 28 Jun 2022 15:03:24 +0200 Subject: [PATCH] Use `prysmaticlabs/fastssz` as a direct dependency (#10941) * Update dependency * Regenerate SSZ files * fix BUILD files Co-authored-by: Raul Jordan Co-authored-by: Preston Van Loon Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- beacon-chain/core/signing/BUILD.bazel | 2 +- beacon-chain/core/signing/signing_root.go | 2 +- beacon-chain/db/kv/BUILD.bazel | 2 +- beacon-chain/db/kv/blocks.go | 2 +- beacon-chain/db/kv/encoding.go | 2 +- beacon-chain/db/slasherkv/BUILD.bazel | 4 ++-- beacon-chain/db/slasherkv/pruning.go | 2 +- beacon-chain/db/slasherkv/slasher.go | 2 +- beacon-chain/db/slasherkv/slasher_test.go | 2 +- beacon-chain/node/BUILD.bazel | 2 +- beacon-chain/node/config.go | 2 +- beacon-chain/operations/attestations/kv/BUILD.bazel | 2 +- .../operations/attestations/kv/aggregated_test.go | 2 +- .../operations/attestations/kv/unaggregated_test.go | 2 +- beacon-chain/p2p/BUILD.bazel | 2 +- beacon-chain/p2p/broadcaster.go | 2 +- beacon-chain/p2p/encoder/BUILD.bazel | 2 +- beacon-chain/p2p/encoder/network_encoding.go | 2 +- beacon-chain/p2p/encoder/ssz.go | 2 +- beacon-chain/p2p/sender.go | 2 +- beacon-chain/p2p/testing/BUILD.bazel | 2 +- beacon-chain/p2p/testing/p2p.go | 2 +- beacon-chain/p2p/types/BUILD.bazel | 2 +- beacon-chain/p2p/types/types.go | 2 +- .../rpc/prysm/v1alpha1/validator/BUILD.bazel | 2 +- .../prysm/v1alpha1/validator/proposer_eth1data.go | 2 +- beacon-chain/slasher/BUILD.bazel | 4 ++-- beacon-chain/slasher/params.go | 2 +- beacon-chain/slasher/params_test.go | 2 +- beacon-chain/state/state-native/BUILD.bazel | 2 +- .../state/state-native/custom-types/BUILD.bazel | 2 +- .../state/state-native/custom-types/block_roots.go | 2 +- .../state/state-native/custom-types/byte32.go | 2 +- .../state-native/custom-types/historical_roots.go | 2 +- .../state/state-native/custom-types/randao_mixes.go | 2 +- .../state/state-native/custom-types/state_roots.go | 2 +- beacon-chain/state/state-native/ssz.go | 2 +- beacon-chain/sync/BUILD.bazel | 2 +- beacon-chain/sync/decode_pubsub.go | 2 +- beacon-chain/sync/rpc.go | 2 +- consensus-types/blocks/BUILD.bazel | 4 ++-- consensus-types/blocks/getters.go | 2 +- consensus-types/blocks/getters_test.go | 2 +- consensus-types/interfaces/BUILD.bazel | 2 +- consensus-types/interfaces/beacon_block.go | 2 +- consensus-types/mock/BUILD.bazel | 2 +- consensus-types/mock/block.go | 2 +- consensus-types/primitives/BUILD.bazel | 2 +- consensus-types/primitives/committee_index.go | 2 +- consensus-types/primitives/domain.go | 2 +- consensus-types/primitives/epoch.go | 2 +- consensus-types/primitives/slot.go | 2 +- consensus-types/primitives/sszbytes.go | 2 +- consensus-types/primitives/sszuint64.go | 2 +- consensus-types/primitives/validator.go | 2 +- consensus-types/wrapper/BUILD.bazel | 2 +- consensus-types/wrapper/beacon_block_altair.go | 2 +- consensus-types/wrapper/beacon_block_bellatrix.go | 2 +- consensus-types/wrapper/beacon_block_phase0.go | 2 +- .../wrapper/blinded_beacon_block_bellatrix.go | 2 +- crypto/hash/BUILD.bazel | 2 +- crypto/hash/hash.go | 2 +- deps.bzl | 12 +++++++++--- encoding/ssz/BUILD.bazel | 2 +- encoding/ssz/detect/BUILD.bazel | 2 +- encoding/ssz/detect/configfork.go | 2 +- encoding/ssz/htrutils_fuzz_test.go | 2 +- go.mod | 5 ++--- go.sum | 12 ++++-------- proto/engine/v1/BUILD.bazel | 2 +- proto/engine/v1/generated.ssz.go | 2 +- proto/eth/v1/generated.ssz.go | 4 ++-- proto/eth/v2/generated.ssz.go | 4 ++-- proto/prysm/v1alpha1/generated.ssz.go | 4 ++-- proto/prysm/v1alpha1/metadata/BUILD.bazel | 2 +- proto/prysm/v1alpha1/metadata/metadata_interfaces.go | 2 +- proto/testing/BUILD.bazel | 2 +- .../spectest/shared/altair/ssz_static/BUILD.bazel | 2 +- .../spectest/shared/altair/ssz_static/ssz_static.go | 2 +- .../spectest/shared/bellatrix/ssz_static/BUILD.bazel | 2 +- .../shared/bellatrix/ssz_static/ssz_static.go | 2 +- .../spectest/shared/common/ssz_static/BUILD.bazel | 4 ++-- .../spectest/shared/common/ssz_static/ssz_static.go | 2 +- .../common/ssz_static/ssz_static_example_test.go | 2 +- .../spectest/shared/phase0/ssz_static/BUILD.bazel | 2 +- .../spectest/shared/phase0/ssz_static/ssz_static.go | 2 +- tools/pcli/BUILD.bazel | 2 +- tools/pcli/main.go | 2 +- tools/ssz.bzl | 4 ++-- validator/node/BUILD.bazel | 2 +- validator/node/node.go | 2 +- 91 files changed, 111 insertions(+), 110 deletions(-) diff --git a/beacon-chain/core/signing/BUILD.bazel b/beacon-chain/core/signing/BUILD.bazel index a410ec790d..034f61a0a5 100644 --- a/beacon-chain/core/signing/BUILD.bazel +++ b/beacon-chain/core/signing/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "//crypto/bls:go_default_library", "//encoding/bytesutil:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/beacon-chain/core/signing/signing_root.go b/beacon-chain/core/signing/signing_root.go index 8ca98983e4..9eb72b68f6 100644 --- a/beacon-chain/core/signing/signing_root.go +++ b/beacon-chain/core/signing/signing_root.go @@ -1,8 +1,8 @@ package signing import ( - fssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/params" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" diff --git a/beacon-chain/db/kv/BUILD.bazel b/beacon-chain/db/kv/BUILD.bazel index c70d3db31c..dd828fe086 100644 --- a/beacon-chain/db/kv/BUILD.bazel +++ b/beacon-chain/db/kv/BUILD.bazel @@ -60,11 +60,11 @@ go_library( "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_golang_snappy//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_prombbolt//:go_default_library", "@com_github_schollz_progressbar_v3//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", diff --git a/beacon-chain/db/kv/blocks.go b/beacon-chain/db/kv/blocks.go index 5dba268c7c..b36868c3e3 100644 --- a/beacon-chain/db/kv/blocks.go +++ b/beacon-chain/db/kv/blocks.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - ssz "github.com/ferranbt/fastssz" "github.com/golang/snappy" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" "github.com/prysmaticlabs/prysm/config/params" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" diff --git a/beacon-chain/db/kv/encoding.go b/beacon-chain/db/kv/encoding.go index 97016a8437..6bb0a237cf 100644 --- a/beacon-chain/db/kv/encoding.go +++ b/beacon-chain/db/kv/encoding.go @@ -5,8 +5,8 @@ import ( "errors" "reflect" - fastssz "github.com/ferranbt/fastssz" "github.com/golang/snappy" + fastssz "github.com/prysmaticlabs/fastssz" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "go.opencensus.io/trace" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/db/slasherkv/BUILD.bazel b/beacon-chain/db/slasherkv/BUILD.bazel index ecccf7b915..6db4225b7f 100644 --- a/beacon-chain/db/slasherkv/BUILD.bazel +++ b/beacon-chain/db/slasherkv/BUILD.bazel @@ -21,11 +21,11 @@ go_library( "//io/file:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//time/slots:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_golang_snappy//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@io_etcd_go_bbolt//:go_default_library", "@io_opencensus_go//trace:go_default_library", @@ -51,7 +51,7 @@ go_test( "//testing/assert:go_default_library", "//testing/require:go_default_library", "//time/slots:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_sirupsen_logrus//hooks/test:go_default_library", "@io_etcd_go_bbolt//:go_default_library", diff --git a/beacon-chain/db/slasherkv/pruning.go b/beacon-chain/db/slasherkv/pruning.go index ef52b40508..58b862d7c6 100644 --- a/beacon-chain/db/slasherkv/pruning.go +++ b/beacon-chain/db/slasherkv/pruning.go @@ -5,7 +5,7 @@ import ( "context" "encoding/binary" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" "github.com/prysmaticlabs/prysm/time/slots" bolt "go.etcd.io/bbolt" diff --git a/beacon-chain/db/slasherkv/slasher.go b/beacon-chain/db/slasherkv/slasher.go index 874fd38b0a..315292487e 100644 --- a/beacon-chain/db/slasherkv/slasher.go +++ b/beacon-chain/db/slasherkv/slasher.go @@ -8,9 +8,9 @@ import ( "sort" "sync" - ssz "github.com/ferranbt/fastssz" "github.com/golang/snappy" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" slashertypes "github.com/prysmaticlabs/prysm/beacon-chain/slasher/types" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" "github.com/prysmaticlabs/prysm/encoding/bytesutil" diff --git a/beacon-chain/db/slasherkv/slasher_test.go b/beacon-chain/db/slasherkv/slasher_test.go index fd09f2e73e..6bf98d5232 100644 --- a/beacon-chain/db/slasherkv/slasher_test.go +++ b/beacon-chain/db/slasherkv/slasher_test.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" slashertypes "github.com/prysmaticlabs/prysm/beacon-chain/slasher/types" "github.com/prysmaticlabs/prysm/config/params" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel index 8314f7b4d6..0beac1b693 100644 --- a/beacon-chain/node/BUILD.bazel +++ b/beacon-chain/node/BUILD.bazel @@ -62,9 +62,9 @@ go_library( "//runtime/prereqs:go_default_library", "//runtime/version:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", ], diff --git a/beacon-chain/node/config.go b/beacon-chain/node/config.go index ed5ab03b22..3c943995f8 100644 --- a/beacon-chain/node/config.go +++ b/beacon-chain/node/config.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - fastssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + fastssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/cmd" "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags" "github.com/prysmaticlabs/prysm/config/features" diff --git a/beacon-chain/operations/attestations/kv/BUILD.bazel b/beacon-chain/operations/attestations/kv/BUILD.bazel index bfede4f549..0d30828c30 100644 --- a/beacon-chain/operations/attestations/kv/BUILD.bazel +++ b/beacon-chain/operations/attestations/kv/BUILD.bazel @@ -46,9 +46,9 @@ go_test( "//testing/assert:go_default_library", "//testing/require:go_default_library", "//testing/util:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_patrickmn_go_cache//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", ], ) diff --git a/beacon-chain/operations/attestations/kv/aggregated_test.go b/beacon-chain/operations/attestations/kv/aggregated_test.go index daa87491dc..fa35a8d214 100644 --- a/beacon-chain/operations/attestations/kv/aggregated_test.go +++ b/beacon-chain/operations/attestations/kv/aggregated_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" - fssz "github.com/ferranbt/fastssz" c "github.com/patrickmn/go-cache" "github.com/pkg/errors" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" "github.com/prysmaticlabs/prysm/crypto/bls" diff --git a/beacon-chain/operations/attestations/kv/unaggregated_test.go b/beacon-chain/operations/attestations/kv/unaggregated_test.go index 581bca3e8e..a42f863417 100644 --- a/beacon-chain/operations/attestations/kv/unaggregated_test.go +++ b/beacon-chain/operations/attestations/kv/unaggregated_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - fssz "github.com/ferranbt/fastssz" c "github.com/patrickmn/go-cache" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/beacon-chain/p2p/BUILD.bazel b/beacon-chain/p2p/BUILD.bazel index 6523fe974a..a8ee1978c5 100644 --- a/beacon-chain/p2p/BUILD.bazel +++ b/beacon-chain/p2p/BUILD.bazel @@ -74,7 +74,6 @@ go_library( "@com_github_ethereum_go_ethereum//p2p/discover:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enode:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_kevinms_leakybucket_go//:go_default_library", "@com_github_kr_pretty//:go_default_library", "@com_github_libp2p_go_libp2p//:go_default_library", @@ -96,6 +95,7 @@ go_library( "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@io_opencensus_go//trace:go_default_library", diff --git a/beacon-chain/p2p/broadcaster.go b/beacon-chain/p2p/broadcaster.go index a935a8836b..1f31f9c5eb 100644 --- a/beacon-chain/p2p/broadcaster.go +++ b/beacon-chain/p2p/broadcaster.go @@ -7,8 +7,8 @@ import ( "reflect" "time" - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/config/params" "github.com/prysmaticlabs/prysm/crypto/hash" diff --git a/beacon-chain/p2p/encoder/BUILD.bazel b/beacon-chain/p2p/encoder/BUILD.bazel index a0631bb718..a91751ef8e 100644 --- a/beacon-chain/p2p/encoder/BUILD.bazel +++ b/beacon-chain/p2p/encoder/BUILD.bazel @@ -15,10 +15,10 @@ go_library( deps = [ "//config/params:go_default_library", "//math:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_golang_snappy//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/beacon-chain/p2p/encoder/network_encoding.go b/beacon-chain/p2p/encoder/network_encoding.go index fea919f521..849da5c495 100644 --- a/beacon-chain/p2p/encoder/network_encoding.go +++ b/beacon-chain/p2p/encoder/network_encoding.go @@ -3,7 +3,7 @@ package encoder import ( "io" - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" ) // NetworkEncoding represents an encoder compatible with Ethereum consensus p2p. diff --git a/beacon-chain/p2p/encoder/ssz.go b/beacon-chain/p2p/encoder/ssz.go index 6fe6308f8d..3a10a55372 100644 --- a/beacon-chain/p2p/encoder/ssz.go +++ b/beacon-chain/p2p/encoder/ssz.go @@ -5,10 +5,10 @@ import ( "io" "sync" - fastssz "github.com/ferranbt/fastssz" "github.com/gogo/protobuf/proto" "github.com/golang/snappy" "github.com/pkg/errors" + fastssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/config/params" "github.com/prysmaticlabs/prysm/math" ) diff --git a/beacon-chain/p2p/sender.go b/beacon-chain/p2p/sender.go index 311c5a888b..fad4062a7b 100644 --- a/beacon-chain/p2p/sender.go +++ b/beacon-chain/p2p/sender.go @@ -3,12 +3,12 @@ package p2p import ( "context" - ssz "github.com/ferranbt/fastssz" "github.com/kr/pretty" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/monitoring/tracing" "github.com/sirupsen/logrus" "go.opencensus.io/trace" diff --git a/beacon-chain/p2p/testing/BUILD.bazel b/beacon-chain/p2p/testing/BUILD.bazel index 4610da0742..210bb80753 100644 --- a/beacon-chain/p2p/testing/BUILD.bazel +++ b/beacon-chain/p2p/testing/BUILD.bazel @@ -25,7 +25,6 @@ go_library( "@com_github_ethereum_go_ethereum//crypto:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enode:go_default_library", "@com_github_ethereum_go_ethereum//p2p/enr:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_libp2p_go_libp2p_blankhost//:go_default_library", "@com_github_libp2p_go_libp2p_core//:go_default_library", "@com_github_libp2p_go_libp2p_core//connmgr:go_default_library", @@ -39,6 +38,7 @@ go_library( "@com_github_libp2p_go_libp2p_pubsub//:go_default_library", "@com_github_libp2p_go_libp2p_swarm//testing:go_default_library", "@com_github_multiformats_go_multiaddr//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], diff --git a/beacon-chain/p2p/testing/p2p.go b/beacon-chain/p2p/testing/p2p.go index 4951665f1c..30f1e11adf 100644 --- a/beacon-chain/p2p/testing/p2p.go +++ b/beacon-chain/p2p/testing/p2p.go @@ -10,7 +10,6 @@ import ( "time" "github.com/ethereum/go-ethereum/p2p/enr" - ssz "github.com/ferranbt/fastssz" bhost "github.com/libp2p/go-libp2p-blankhost" core "github.com/libp2p/go-libp2p-core" "github.com/libp2p/go-libp2p-core/control" @@ -21,6 +20,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" swarmt "github.com/libp2p/go-libp2p-swarm/testing" "github.com/multiformats/go-multiaddr" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/scorers" diff --git a/beacon-chain/p2p/types/BUILD.bazel b/beacon-chain/p2p/types/BUILD.bazel index 97d53ccded..bbd5711660 100644 --- a/beacon-chain/p2p/types/BUILD.bazel +++ b/beacon-chain/p2p/types/BUILD.bazel @@ -23,8 +23,8 @@ go_library( "//encoding/bytesutil:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/metadata:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/beacon-chain/p2p/types/types.go b/beacon-chain/p2p/types/types.go index b3ebcf6fe6..aacaedf5c0 100644 --- a/beacon-chain/p2p/types/types.go +++ b/beacon-chain/p2p/types/types.go @@ -4,8 +4,8 @@ package types import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/config/params" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index 1dc4371b8d..afbcfcaf60 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -78,10 +78,10 @@ go_library( "//time/slots:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@io_bazel_rules_go//proto/wkt:empty_go_proto", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go index a741c0b7da..3a16b60c3c 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eth1data.go @@ -4,8 +4,8 @@ import ( "context" "math/big" - fastssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + fastssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/config/params" diff --git a/beacon-chain/slasher/BUILD.bazel b/beacon-chain/slasher/BUILD.bazel index 62a6e90ee3..23ed0d1a7e 100644 --- a/beacon-chain/slasher/BUILD.bazel +++ b/beacon-chain/slasher/BUILD.bazel @@ -41,10 +41,10 @@ go_library( "//encoding/bytesutil:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//time/slots:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@io_opencensus_go//trace:go_default_library", "@org_golang_google_grpc//codes:go_default_library", @@ -89,7 +89,7 @@ go_test( "//testing/require:go_default_library", "//testing/util:go_default_library", "//time/slots:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_sirupsen_logrus//hooks/test:go_default_library", ], diff --git a/beacon-chain/slasher/params.go b/beacon-chain/slasher/params.go index 3fbdb62b56..dad1f204da 100644 --- a/beacon-chain/slasher/params.go +++ b/beacon-chain/slasher/params.go @@ -1,7 +1,7 @@ package slasher import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" ) diff --git a/beacon-chain/slasher/params_test.go b/beacon-chain/slasher/params_test.go index a6ccaf5d2c..93090fa28b 100644 --- a/beacon-chain/slasher/params_test.go +++ b/beacon-chain/slasher/params_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" "github.com/prysmaticlabs/prysm/testing/assert" ) diff --git a/beacon-chain/state/state-native/BUILD.bazel b/beacon-chain/state/state-native/BUILD.bazel index 4325dca489..c6f6a881ab 100644 --- a/beacon-chain/state/state-native/BUILD.bazel +++ b/beacon-chain/state/state-native/BUILD.bazel @@ -72,8 +72,8 @@ go_library( "//proto/engine/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//runtime/version:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@io_opencensus_go//trace:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", diff --git a/beacon-chain/state/state-native/custom-types/BUILD.bazel b/beacon-chain/state/state-native/custom-types/BUILD.bazel index 3c19f0a126..74a9ff7108 100644 --- a/beacon-chain/state/state-native/custom-types/BUILD.bazel +++ b/beacon-chain/state/state-native/custom-types/BUILD.bazel @@ -13,7 +13,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//config/fieldparams:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/beacon-chain/state/state-native/custom-types/block_roots.go b/beacon-chain/state/state-native/custom-types/block_roots.go index 1a3c154741..9314aad403 100644 --- a/beacon-chain/state/state-native/custom-types/block_roots.go +++ b/beacon-chain/state/state-native/custom-types/block_roots.go @@ -3,7 +3,7 @@ package customtypes import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams" ) diff --git a/beacon-chain/state/state-native/custom-types/byte32.go b/beacon-chain/state/state-native/custom-types/byte32.go index 61d3d26924..9ba119f6d6 100644 --- a/beacon-chain/state/state-native/custom-types/byte32.go +++ b/beacon-chain/state/state-native/custom-types/byte32.go @@ -3,7 +3,7 @@ package customtypes import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) var _ fssz.HashRoot = (Byte32)([32]byte{}) diff --git a/beacon-chain/state/state-native/custom-types/historical_roots.go b/beacon-chain/state/state-native/custom-types/historical_roots.go index 5965bd70c5..92157dfc18 100644 --- a/beacon-chain/state/state-native/custom-types/historical_roots.go +++ b/beacon-chain/state/state-native/custom-types/historical_roots.go @@ -3,7 +3,7 @@ package customtypes import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) var _ fssz.HashRoot = (HistoricalRoots)([][32]byte{}) diff --git a/beacon-chain/state/state-native/custom-types/randao_mixes.go b/beacon-chain/state/state-native/custom-types/randao_mixes.go index e4d7435c34..eea7324aed 100644 --- a/beacon-chain/state/state-native/custom-types/randao_mixes.go +++ b/beacon-chain/state/state-native/custom-types/randao_mixes.go @@ -3,7 +3,7 @@ package customtypes import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams" ) diff --git a/beacon-chain/state/state-native/custom-types/state_roots.go b/beacon-chain/state/state-native/custom-types/state_roots.go index 4c544b8b7b..bf27805755 100644 --- a/beacon-chain/state/state-native/custom-types/state_roots.go +++ b/beacon-chain/state/state-native/custom-types/state_roots.go @@ -3,7 +3,7 @@ package customtypes import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams" ) diff --git a/beacon-chain/state/state-native/ssz.go b/beacon-chain/state/state-native/ssz.go index f7d9988239..e7fe76cc78 100644 --- a/beacon-chain/state/state-native/ssz.go +++ b/beacon-chain/state/state-native/ssz.go @@ -1,8 +1,8 @@ package state_native import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" ) var errAssertionFailed = errors.New("failed to convert interface to proto state") diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel index 6b435ccaa3..5089487d9d 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/sync/BUILD.bazel @@ -100,7 +100,6 @@ go_library( "//runtime/version:go_default_library", "//time:go_default_library", "//time/slots:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_hashicorp_golang_lru//:go_default_library", "@com_github_kevinms_leakybucket_go//:go_default_library", "@com_github_libp2p_go_libp2p_core//:go_default_library", @@ -114,6 +113,7 @@ go_library( "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_trailofbits_go_mutexasserts//:go_default_library", diff --git a/beacon-chain/sync/decode_pubsub.go b/beacon-chain/sync/decode_pubsub.go index 53929e78ea..7221e795d7 100644 --- a/beacon-chain/sync/decode_pubsub.go +++ b/beacon-chain/sync/decode_pubsub.go @@ -4,9 +4,9 @@ import ( "reflect" "strings" - ssz "github.com/ferranbt/fastssz" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "google.golang.org/protobuf/proto" diff --git a/beacon-chain/sync/rpc.go b/beacon-chain/sync/rpc.go index 4cd9c0b1d6..98c1440ff5 100644 --- a/beacon-chain/sync/rpc.go +++ b/beacon-chain/sync/rpc.go @@ -6,10 +6,10 @@ import ( "runtime/debug" "strings" - ssz "github.com/ferranbt/fastssz" libp2pcore "github.com/libp2p/go-libp2p-core" "github.com/libp2p/go-libp2p-core/network" "github.com/libp2p/go-libp2p-core/protocol" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptypes "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/config/params" diff --git a/consensus-types/blocks/BUILD.bazel b/consensus-types/blocks/BUILD.bazel index 30b2d526ca..cb6ab4eb72 100644 --- a/consensus-types/blocks/BUILD.bazel +++ b/consensus-types/blocks/BUILD.bazel @@ -17,8 +17,8 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//runtime/version:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], ) @@ -40,7 +40,7 @@ go_test( "//testing/assert:go_default_library", "//testing/require:go_default_library", "//testing/util:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", ], ) diff --git a/consensus-types/blocks/getters.go b/consensus-types/blocks/getters.go index 3c1d7ceb87..376fa3795d 100644 --- a/consensus-types/blocks/getters.go +++ b/consensus-types/blocks/getters.go @@ -1,8 +1,8 @@ package blocks import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" diff --git a/consensus-types/blocks/getters_test.go b/consensus-types/blocks/getters_test.go index 82f863b635..132201e11d 100644 --- a/consensus-types/blocks/getters_test.go +++ b/consensus-types/blocks/getters_test.go @@ -3,7 +3,7 @@ package blocks import ( "testing" - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/consensus-types/interfaces/BUILD.bazel b/consensus-types/interfaces/BUILD.bazel index 9768ad2962..cae8e656ca 100644 --- a/consensus-types/interfaces/BUILD.bazel +++ b/consensus-types/interfaces/BUILD.bazel @@ -13,8 +13,8 @@ go_library( "//proto/engine/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], ) diff --git a/consensus-types/interfaces/beacon_block.go b/consensus-types/interfaces/beacon_block.go index 71999e1384..7331a7fac8 100644 --- a/consensus-types/interfaces/beacon_block.go +++ b/consensus-types/interfaces/beacon_block.go @@ -1,7 +1,7 @@ package interfaces import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/consensus-types/mock/BUILD.bazel b/consensus-types/mock/BUILD.bazel index dcbdd2e110..84f89a3b2b 100644 --- a/consensus-types/mock/BUILD.bazel +++ b/consensus-types/mock/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "//proto/engine/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], ) diff --git a/consensus-types/mock/block.go b/consensus-types/mock/block.go index 248651cb32..ca97c24f1b 100644 --- a/consensus-types/mock/block.go +++ b/consensus-types/mock/block.go @@ -1,7 +1,7 @@ package mock import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" diff --git a/consensus-types/primitives/BUILD.bazel b/consensus-types/primitives/BUILD.bazel index bd9390566c..69872a4134 100644 --- a/consensus-types/primitives/BUILD.bazel +++ b/consensus-types/primitives/BUILD.bazel @@ -15,7 +15,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//math:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/consensus-types/primitives/committee_index.go b/consensus-types/primitives/committee_index.go index ff338337b8..a20adc21f1 100644 --- a/consensus-types/primitives/committee_index.go +++ b/consensus-types/primitives/committee_index.go @@ -3,7 +3,7 @@ package types import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) var _ fssz.HashRoot = (CommitteeIndex)(0) diff --git a/consensus-types/primitives/domain.go b/consensus-types/primitives/domain.go index ec4d98747f..bcb6a84bb7 100644 --- a/consensus-types/primitives/domain.go +++ b/consensus-types/primitives/domain.go @@ -3,7 +3,7 @@ package types import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) var _ fssz.HashRoot = (Domain)([]byte{}) diff --git a/consensus-types/primitives/epoch.go b/consensus-types/primitives/epoch.go index 1b2633f39d..7c8eff41cb 100644 --- a/consensus-types/primitives/epoch.go +++ b/consensus-types/primitives/epoch.go @@ -3,7 +3,7 @@ package types import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/math" ) diff --git a/consensus-types/primitives/slot.go b/consensus-types/primitives/slot.go index c027e9de7f..ebe44f5d78 100644 --- a/consensus-types/primitives/slot.go +++ b/consensus-types/primitives/slot.go @@ -3,7 +3,7 @@ package types import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/math" ) diff --git a/consensus-types/primitives/sszbytes.go b/consensus-types/primitives/sszbytes.go index c51a2c0ac1..d451af3313 100644 --- a/consensus-types/primitives/sszbytes.go +++ b/consensus-types/primitives/sszbytes.go @@ -1,7 +1,7 @@ package types import ( - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) // SSZBytes -- diff --git a/consensus-types/primitives/sszuint64.go b/consensus-types/primitives/sszuint64.go index 1ce66b9182..829c8d0f50 100644 --- a/consensus-types/primitives/sszuint64.go +++ b/consensus-types/primitives/sszuint64.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) var _ fssz.HashRoot = (Epoch)(0) diff --git a/consensus-types/primitives/validator.go b/consensus-types/primitives/validator.go index cd7a955681..d107ad41cd 100644 --- a/consensus-types/primitives/validator.go +++ b/consensus-types/primitives/validator.go @@ -3,7 +3,7 @@ package types import ( "fmt" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" ) var _ fssz.HashRoot = (ValidatorIndex)(0) diff --git a/consensus-types/wrapper/BUILD.bazel b/consensus-types/wrapper/BUILD.bazel index 0844897733..2880ef383b 100644 --- a/consensus-types/wrapper/BUILD.bazel +++ b/consensus-types/wrapper/BUILD.bazel @@ -21,8 +21,8 @@ go_library( "//proto/prysm/v1alpha1/metadata:go_default_library", "//proto/prysm/v1alpha1/validator-client:go_default_library", "//runtime/version:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], diff --git a/consensus-types/wrapper/beacon_block_altair.go b/consensus-types/wrapper/beacon_block_altair.go index ad246586a3..abb81ff070 100644 --- a/consensus-types/wrapper/beacon_block_altair.go +++ b/consensus-types/wrapper/beacon_block_altair.go @@ -1,8 +1,8 @@ package wrapper import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" diff --git a/consensus-types/wrapper/beacon_block_bellatrix.go b/consensus-types/wrapper/beacon_block_bellatrix.go index 8d316451ef..23f3def140 100644 --- a/consensus-types/wrapper/beacon_block_bellatrix.go +++ b/consensus-types/wrapper/beacon_block_bellatrix.go @@ -1,8 +1,8 @@ package wrapper import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" diff --git a/consensus-types/wrapper/beacon_block_phase0.go b/consensus-types/wrapper/beacon_block_phase0.go index cb6da2e5da..4fee029a5f 100644 --- a/consensus-types/wrapper/beacon_block_phase0.go +++ b/consensus-types/wrapper/beacon_block_phase0.go @@ -1,8 +1,8 @@ package wrapper import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" diff --git a/consensus-types/wrapper/blinded_beacon_block_bellatrix.go b/consensus-types/wrapper/blinded_beacon_block_bellatrix.go index 3b633a2013..698be7e890 100644 --- a/consensus-types/wrapper/blinded_beacon_block_bellatrix.go +++ b/consensus-types/wrapper/blinded_beacon_block_bellatrix.go @@ -1,8 +1,8 @@ package wrapper import ( - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/consensus-types/interfaces" types "github.com/prysmaticlabs/prysm/consensus-types/primitives" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" diff --git a/crypto/hash/BUILD.bazel b/crypto/hash/BUILD.bazel index 245c2b7850..52db561f59 100644 --- a/crypto/hash/BUILD.bazel +++ b/crypto/hash/BUILD.bazel @@ -7,9 +7,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//encoding/bytesutil:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_minio_highwayhash//:go_default_library", "@com_github_minio_sha256_simd//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_x_crypto//sha3:go_default_library", ], diff --git a/crypto/hash/hash.go b/crypto/hash/hash.go index 561bc3ae93..db194fd618 100644 --- a/crypto/hash/hash.go +++ b/crypto/hash/hash.go @@ -7,9 +7,9 @@ import ( "reflect" "sync" - fastssz "github.com/ferranbt/fastssz" "github.com/minio/highwayhash" "github.com/minio/sha256-simd" + fastssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/encoding/bytesutil" "golang.org/x/crypto/sha3" "google.golang.org/protobuf/proto" diff --git a/deps.bzl b/deps.bzl index bda7022f1a..ddbf695f85 100644 --- a/deps.bzl +++ b/deps.bzl @@ -951,9 +951,8 @@ def prysm_deps(): go_repository( name = "com_github_ferranbt_fastssz", importpath = "github.com/ferranbt/fastssz", - replace = "github.com/prysmaticlabs/fastssz", - sum = "h1:gzptjYavIGXHFnh0dt2HiiHYsc6TPDaxg9yl7wfpVlk=", - version = "v0.0.0-20220624091011-83d37f0650eb", + sum = "h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM=", + version = "v0.0.0-20210120143747-11b9eff30ea9", ) go_repository( @@ -3191,6 +3190,13 @@ def prysm_deps(): sum = "h1:If5rVCMTp6W2SiRAQFlbpJNgVlgMEd+U2GZckwK38ic=", version = "v0.10.0", ) + go_repository( + name = "com_github_prysmaticlabs_fastssz", + importpath = "github.com/prysmaticlabs/fastssz", + sum = "h1:fat9avCPKKYZKe9KJq/VlF43/Nrxmn+sg59Ibe/pGs8=", + version = "v0.0.0-20220624091035-af5440c5d1dc", + ) + go_repository( name = "com_github_prysmaticlabs_go_bitfield", importpath = "github.com/prysmaticlabs/go-bitfield", diff --git a/encoding/ssz/BUILD.bazel b/encoding/ssz/BUILD.bazel index bde9165353..46ae6e139f 100644 --- a/encoding/ssz/BUILD.bazel +++ b/encoding/ssz/BUILD.bazel @@ -42,8 +42,8 @@ go_test( "//proto/prysm/v1alpha1:go_default_library", "//testing/assert:go_default_library", "//testing/require:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", ], ) diff --git a/encoding/ssz/detect/BUILD.bazel b/encoding/ssz/detect/BUILD.bazel index 60d103b6a2..420996063c 100644 --- a/encoding/ssz/detect/BUILD.bazel +++ b/encoding/ssz/detect/BUILD.bazel @@ -23,8 +23,8 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//runtime/version:go_default_library", "//time/slots:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/encoding/ssz/detect/configfork.go b/encoding/ssz/detect/configfork.go index 41ec12a63b..cd5b716c32 100644 --- a/encoding/ssz/detect/configfork.go +++ b/encoding/ssz/detect/configfork.go @@ -7,8 +7,8 @@ import ( "github.com/prysmaticlabs/prysm/encoding/bytesutil" "github.com/prysmaticlabs/prysm/network/forks" - ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + ssz "github.com/prysmaticlabs/fastssz" "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" diff --git a/encoding/ssz/htrutils_fuzz_test.go b/encoding/ssz/htrutils_fuzz_test.go index b9e03e1eff..12028964fb 100644 --- a/encoding/ssz/htrutils_fuzz_test.go +++ b/encoding/ssz/htrutils_fuzz_test.go @@ -5,8 +5,8 @@ package ssz_test import ( "testing" - fssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/config/params" "github.com/prysmaticlabs/prysm/encoding/ssz" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/go.mod b/go.mod index f4aef66b36..3f85cf2168 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,6 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 github.com/ethereum/go-ethereum v1.10.17-0.20220323200026-535f25d65fa0 - github.com/ferranbt/fastssz v0.0.0-20210905181407-59cf6761a7d5 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.5.1 github.com/ghodss/yaml v1.0.0 @@ -62,6 +61,7 @@ require ( github.com/prometheus/client_golang v1.12.1 github.com/prometheus/client_model v0.2.0 github.com/prometheus/prom2json v1.3.0 + github.com/prysmaticlabs/fastssz v0.0.0-20220624091035-af5440c5d1dc github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20211014160335-757fae4f38c6 @@ -122,6 +122,7 @@ require ( github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48 // indirect github.com/edsrzf/mmap-go v1.0.0 // indirect github.com/elastic/gosigar v0.14.2 // indirect + github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 // indirect github.com/flynn/noise v1.0.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/go-playground/locales v0.14.0 // indirect @@ -278,5 +279,3 @@ replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.201 // See https://github.com/prysmaticlabs/grpc-gateway/issues/2 replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220428175429-ee99f663f83d - -replace github.com/ferranbt/fastssz => github.com/prysmaticlabs/fastssz v0.0.0-20220624091011-83d37f0650eb diff --git a/go.sum b/go.sum index 2be21b2882..de1ae66495 100644 --- a/go.sum +++ b/go.sum @@ -317,6 +317,8 @@ github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM= +github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -1190,12 +1192,11 @@ github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.10.0 h1:If5rVCMTp6W2SiRAQFlbpJNgVlgMEd+U2GZckwK38ic= github.com/prometheus/tsdb v0.10.0/go.mod h1:oi49uRhEe9dPUTlS3JRZOwJuVi6tmh10QSgwXEyGCt4= -github.com/prysmaticlabs/fastssz v0.0.0-20220624091011-83d37f0650eb h1:gzptjYavIGXHFnh0dt2HiiHYsc6TPDaxg9yl7wfpVlk= -github.com/prysmaticlabs/fastssz v0.0.0-20220624091011-83d37f0650eb/go.mod h1:L3D/zV+VI410Rpzi7uKes5QgxmBKF3Ua+3p+hG4lQbs= +github.com/prysmaticlabs/fastssz v0.0.0-20220624091035-af5440c5d1dc h1:fat9avCPKKYZKe9KJq/VlF43/Nrxmn+sg59Ibe/pGs8= +github.com/prysmaticlabs/fastssz v0.0.0-20220624091035-af5440c5d1dc/go.mod h1:MA5zShstUwCQaE9faGHgCGvEWUbG87p4SAXINhmCkvg= github.com/prysmaticlabs/go-bitfield v0.0.0-20210108222456-8e92c3709aa0/go.mod h1:hCwmef+4qXWjv0jLDbQdWnL0Ol7cS7/lCSS26WR+u6s= github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 h1:0tVE4tdWQK9ZpYygoV7+vS6QkDvQVySboMVEIxBJmXw= github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7/go.mod h1:wmuf/mdK4VMD+jA9ThwcUKjg3a2XWM9cVfFYjDyY4j4= -github.com/prysmaticlabs/gohashtree v0.0.0-20220517220438-192ee5ae6982/go.mod h1:4pWaT30XoEx1j8KNJf3TV+E3mQkaufn7mf+jRNb/Fuk= github.com/prysmaticlabs/gohashtree v0.0.1-alpha.0.20220303211031-f753e083138c h1:920mmUNkTZ9zIWXjArGv6iU45b85gjUvq/4L1ZHWVYQ= github.com/prysmaticlabs/gohashtree v0.0.1-alpha.0.20220303211031-f753e083138c/go.mod h1:4pWaT30XoEx1j8KNJf3TV+E3mQkaufn7mf+jRNb/Fuk= github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220428175429-ee99f663f83d h1:X89lsbPFK9rUDa8mxXazgAT34jlXdCHZrn8kdptFbBU= @@ -1403,7 +1404,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= @@ -1534,7 +1534,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1599,7 +1598,6 @@ golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1726,7 +1724,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= @@ -1823,7 +1820,6 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.11-0.20220523181440-ccb10502d1a5 h1:FsZrnczqPMLkWZqyqBPGYJTko7xFkWqyypB7a4Xldkw= golang.org/x/tools v0.1.11-0.20220523181440-ccb10502d1a5/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/proto/engine/v1/BUILD.bazel b/proto/engine/v1/BUILD.bazel index ddd033d4f4..fc5c7aeb22 100644 --- a/proto/engine/v1/BUILD.bazel +++ b/proto/engine/v1/BUILD.bazel @@ -77,7 +77,7 @@ go_library( "@org_golang_google_protobuf//encoding/protojson:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//runtime/protoimpl:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "//encoding/bytesutil:go_default_library", "//config/fieldparams:go_default_library", "//config/params:go_default_library", diff --git a/proto/engine/v1/generated.ssz.go b/proto/engine/v1/generated.ssz.go index 70808736ee..b6051f8973 100644 --- a/proto/engine/v1/generated.ssz.go +++ b/proto/engine/v1/generated.ssz.go @@ -3,7 +3,7 @@ package enginev1 import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" ) // MarshalSSZ ssz marshals the ExecutionPayload object diff --git a/proto/eth/v1/generated.ssz.go b/proto/eth/v1/generated.ssz.go index 5f7017d4ea..f7f9389c16 100644 --- a/proto/eth/v1/generated.ssz.go +++ b/proto/eth/v1/generated.ssz.go @@ -1,9 +1,9 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 31a8ac7bca6d52901e65c5d86cae5e2ff3e9cf0784c873cea95079d0789aa29a +// Hash: 25cabd4ee6b2013aa3ecc4e5560b0db4c755c5c84d208d13861d23731b1ca838 package v1 import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" github_com_prysmaticlabs_prysm_consensus_types_primitives "github.com/prysmaticlabs/prysm/consensus-types/primitives" ) diff --git a/proto/eth/v2/generated.ssz.go b/proto/eth/v2/generated.ssz.go index 404829627c..69137cd835 100644 --- a/proto/eth/v2/generated.ssz.go +++ b/proto/eth/v2/generated.ssz.go @@ -1,9 +1,9 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 316f4163e19e0c84f265f6f5a131b45e85580bfb076d328a3a52f4cedc81bbb0 +// Hash: 16637c49444f2c3a90bcc4587dfbc26b39f45c26129de7d43fea32a2bcf8441e package eth import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" github_com_prysmaticlabs_prysm_consensus_types_primitives "github.com/prysmaticlabs/prysm/consensus-types/primitives" v11 "github.com/prysmaticlabs/prysm/proto/engine/v1" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go index 64336a2074..eda9a258ec 100644 --- a/proto/prysm/v1alpha1/generated.ssz.go +++ b/proto/prysm/v1alpha1/generated.ssz.go @@ -1,9 +1,9 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 5811fa4b949285461e3f983496fad837efb35858baf524607fb9cc248a35f933 +// Hash: 8fccd7d168be3f17ebbd22a59aa2b5e3e7c79ef423f62adf168798663f7f382e package eth import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" github_com_prysmaticlabs_prysm_consensus_types_primitives "github.com/prysmaticlabs/prysm/consensus-types/primitives" v1 "github.com/prysmaticlabs/prysm/proto/engine/v1" ) diff --git a/proto/prysm/v1alpha1/metadata/BUILD.bazel b/proto/prysm/v1alpha1/metadata/BUILD.bazel index a60c6aa5ed..7c114161da 100644 --- a/proto/prysm/v1alpha1/metadata/BUILD.bazel +++ b/proto/prysm/v1alpha1/metadata/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//proto/prysm/v1alpha1:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", ], ) diff --git a/proto/prysm/v1alpha1/metadata/metadata_interfaces.go b/proto/prysm/v1alpha1/metadata/metadata_interfaces.go index df91ee75dc..4d507da38c 100644 --- a/proto/prysm/v1alpha1/metadata/metadata_interfaces.go +++ b/proto/prysm/v1alpha1/metadata/metadata_interfaces.go @@ -1,7 +1,7 @@ package metadata import ( - ssz "github.com/ferranbt/fastssz" + ssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/go-bitfield" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) diff --git a/proto/testing/BUILD.bazel b/proto/testing/BUILD.bazel index 26d515499c..ffce93b083 100644 --- a/proto/testing/BUILD.bazel +++ b/proto/testing/BUILD.bazel @@ -61,7 +61,7 @@ go_test( "//testing/util:go_default_library", "//testing/assert:go_default_library", "//testing/require:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_ghodss_yaml//:go_default_library", "@com_github_golang_snappy//:go_default_library", "@io_bazel_rules_go//go/tools/bazel:go_default_library", diff --git a/testing/spectest/shared/altair/ssz_static/BUILD.bazel b/testing/spectest/shared/altair/ssz_static/BUILD.bazel index ec8a8b1d8a..f254608634 100644 --- a/testing/spectest/shared/altair/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/altair/ssz_static/BUILD.bazel @@ -11,6 +11,6 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//testing/require:go_default_library", "//testing/spectest/shared/common/ssz_static:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/testing/spectest/shared/altair/ssz_static/ssz_static.go b/testing/spectest/shared/altair/ssz_static/ssz_static.go index 9f68aafe2d..ee19572fe1 100644 --- a/testing/spectest/shared/altair/ssz_static/ssz_static.go +++ b/testing/spectest/shared/altair/ssz_static/ssz_static.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/testing/require" diff --git a/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel b/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel index f3e4e68da7..c78ee49ad8 100644 --- a/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/bellatrix/ssz_static/BUILD.bazel @@ -12,6 +12,6 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//testing/require:go_default_library", "//testing/spectest/shared/common/ssz_static:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go b/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go index aaa920980b..a3ab643f93 100644 --- a/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go +++ b/testing/spectest/shared/bellatrix/ssz_static/ssz_static.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" v3 "github.com/prysmaticlabs/prysm/beacon-chain/state/v3" enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/testing/spectest/shared/common/ssz_static/BUILD.bazel b/testing/spectest/shared/common/ssz_static/BUILD.bazel index 036ee1b050..55e4349737 100644 --- a/testing/spectest/shared/common/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/common/ssz_static/BUILD.bazel @@ -13,8 +13,8 @@ go_library( "//testing/require:go_default_library", "//testing/spectest/utils:go_default_library", "//testing/util:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_golang_snappy//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) @@ -27,7 +27,7 @@ go_test( "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//testing/require:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/testing/spectest/shared/common/ssz_static/ssz_static.go b/testing/spectest/shared/common/ssz_static/ssz_static.go index 2ba1b3c61d..93cd1d6733 100644 --- a/testing/spectest/shared/common/ssz_static/ssz_static.go +++ b/testing/spectest/shared/common/ssz_static/ssz_static.go @@ -6,8 +6,8 @@ import ( "path" "testing" - fssz "github.com/ferranbt/fastssz" "github.com/golang/snappy" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/testing/require" "github.com/prysmaticlabs/prysm/testing/spectest/utils" "github.com/prysmaticlabs/prysm/testing/util" diff --git a/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go b/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go index ca77e3425c..96002f5ef5 100644 --- a/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go +++ b/testing/spectest/shared/common/ssz_static/ssz_static_example_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - fssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" + fssz "github.com/prysmaticlabs/fastssz" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/testing/require" diff --git a/testing/spectest/shared/phase0/ssz_static/BUILD.bazel b/testing/spectest/shared/phase0/ssz_static/BUILD.bazel index e0a2a0f388..33ab83d024 100644 --- a/testing/spectest/shared/phase0/ssz_static/BUILD.bazel +++ b/testing/spectest/shared/phase0/ssz_static/BUILD.bazel @@ -11,6 +11,6 @@ go_library( "//proto/prysm/v1alpha1:go_default_library", "//testing/require:go_default_library", "//testing/spectest/shared/common/ssz_static:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", ], ) diff --git a/testing/spectest/shared/phase0/ssz_static/ssz_static.go b/testing/spectest/shared/phase0/ssz_static/ssz_static.go index 5367b3a5ee..78f622019b 100644 --- a/testing/spectest/shared/phase0/ssz_static/ssz_static.go +++ b/testing/spectest/shared/phase0/ssz_static/ssz_static.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - fssz "github.com/ferranbt/fastssz" + fssz "github.com/prysmaticlabs/fastssz" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/testing/require" diff --git a/tools/pcli/BUILD.bazel b/tools/pcli/BUILD.bazel index ebefc628b7..b0ee30280e 100644 --- a/tools/pcli/BUILD.bazel +++ b/tools/pcli/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "//encoding/ssz/equality:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//runtime/version:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_kr_pretty//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", diff --git a/tools/pcli/main.go b/tools/pcli/main.go index 0f294938af..7593f98f17 100644 --- a/tools/pcli/main.go +++ b/tools/pcli/main.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - fssz "github.com/ferranbt/fastssz" "github.com/kr/pretty" + fssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" "github.com/prysmaticlabs/prysm/consensus-types/wrapper" diff --git a/tools/ssz.bzl b/tools/ssz.bzl index 1f8a85cdab..ebe0734197 100644 --- a/tools/ssz.bzl +++ b/tools/ssz.bzl @@ -73,7 +73,7 @@ ssz_gen_marshal = rule( "srcs": attr.label_list(allow_files = True), "go_proto": attr.label(providers = [GoLibrary]), "sszgen": attr.label( - default = Label("@com_github_ferranbt_fastssz//sszgen:sszgen"), + default = Label("@com_github_prysmaticlabs_fastssz//sszgen:sszgen"), executable = True, cfg = "host", ), @@ -83,4 +83,4 @@ ssz_gen_marshal = rule( outputs = {"out": "generated.ssz.go"}, ) -SSZ_DEPS = ["@com_github_ferranbt_fastssz//:go_default_library"] \ No newline at end of file +SSZ_DEPS = ["@com_github_prysmaticlabs_fastssz//:go_default_library"] \ No newline at end of file diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel index 7b8f506ec0..2fd449860b 100644 --- a/validator/node/BUILD.bazel +++ b/validator/node/BUILD.bazel @@ -69,9 +69,9 @@ go_library( "//validator/web:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", - "@com_github_ferranbt_fastssz//:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", "@com_github_pkg_errors//:go_default_library", + "@com_github_prysmaticlabs_fastssz//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", "@com_github_urfave_cli_v2//:go_default_library", "@in_gopkg_yaml_v2//:go_default_library", diff --git a/validator/node/node.go b/validator/node/node.go index d74589fe4d..b01a48e401 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -19,9 +19,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - fastssz "github.com/ferranbt/fastssz" gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/pkg/errors" + fastssz "github.com/prysmaticlabs/fastssz" "github.com/prysmaticlabs/prysm/api/gateway" "github.com/prysmaticlabs/prysm/api/gateway/apimiddleware" "github.com/prysmaticlabs/prysm/async/event"