diff --git a/WORKSPACE b/WORKSPACE index c16a94c193..8e6ece0d49 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -754,14 +754,6 @@ go_repository( importpath = "github.com/matttproud/golang_protobuf_extensions", ) -http_archive( - name = "com_github_boltdb_bolt", # v1.3.1 - build_file = "//third_party:boltdb/bolt.BUILD", - sha256 = "95dc5842dab55f7519b7002bbec648321277b5d6f0ad59aab509ee59313b6386", - strip_prefix = "bolt-2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8", - urls = ["https://github.com/boltdb/bolt/archive/2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.tar.gz"], -) - go_repository( name = "com_github_pborman_uuid", commit = "8b1b92947f46224e3b97bb1a3a5b0382be00d31e", # v1.2.0 @@ -906,6 +898,13 @@ go_repository( importpath = "k8s.io/client-go", ) +go_repository( + name = "io_etcd_go_bbolt", + importpath = "go.etcd.io/bbolt", + sum = "h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=", + version = "v1.3.4", +) + go_repository( name = "io_k8s_apimachinery", build_file_proto_mode = "disable_global", @@ -1329,13 +1328,6 @@ go_repository( version = "v0.0.4", ) -go_repository( - name = "com_github_mdlayher_prombolt", - importpath = "github.com/mdlayher/prombolt", - sum = "h1:N257g6TTx0LxYoskSDFxvkSJ3NOZpy9IF1xQ7Gu+K8I=", - version = "v0.0.0-20161005185022-dfcf01d20ee9", -) - go_repository( name = "com_github_minio_highwayhash", importpath = "github.com/minio/highwayhash", @@ -1634,3 +1626,14 @@ go_repository( sum = "h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=", version = "v1.20.0", ) + +go_repository( + name = "com_github_prysmaticlabs_prombbolt", + importpath = "github.com/prysmaticlabs/prombbolt", + sum = "h1:bVD46NhbqEE6bsIqj42TCS3ELUdumti3WfAw9DXNtkg=", + version = "v0.0.0-20200324184628-09789ef63796", +) + +load("@com_github_prysmaticlabs_prombbolt//:repositories.bzl", "prombbolt_dependencies") + +prombbolt_dependencies() diff --git a/beacon-chain/db/kv/BUILD.bazel b/beacon-chain/db/kv/BUILD.bazel index 6fd8f70f1c..7210f0dc3d 100644 --- a/beacon-chain/db/kv/BUILD.bazel +++ b/beacon-chain/db/kv/BUILD.bazel @@ -36,17 +36,17 @@ go_library( "//shared/params:go_default_library", "//shared/sliceutil:go_default_library", "//shared/traceutil:go_default_library", - "@com_github_boltdb_bolt//:go_default_library", "@com_github_dgraph_io_ristretto//:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_golang_snappy//:go_default_library", - "@com_github_mdlayher_prombolt//:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", "@com_github_prysmaticlabs_go_ssz//:go_default_library", + "@com_github_prysmaticlabs_prombbolt//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", + "@io_etcd_go_bbolt//:go_default_library", "@io_opencensus_go//trace:go_default_library", ], ) diff --git a/beacon-chain/db/kv/archive.go b/beacon-chain/db/kv/archive.go index d2aaa2ee61..3bd4f3cf9b 100644 --- a/beacon-chain/db/kv/archive.go +++ b/beacon-chain/db/kv/archive.go @@ -4,9 +4,9 @@ import ( "context" "encoding/binary" - "github.com/boltdb/bolt" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/archived_point.go b/beacon-chain/db/kv/archived_point.go index 3c27b0e596..ecbff80fde 100644 --- a/beacon-chain/db/kv/archived_point.go +++ b/beacon-chain/db/kv/archived_point.go @@ -3,11 +3,11 @@ package kv import ( "context" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/state" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/bytesutil" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/attestations.go b/beacon-chain/db/kv/attestations.go index 9642e79773..da22c428b7 100644 --- a/beacon-chain/db/kv/attestations.go +++ b/beacon-chain/db/kv/attestations.go @@ -4,7 +4,6 @@ import ( "context" "fmt" - "github.com/boltdb/bolt" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" @@ -12,6 +11,7 @@ import ( dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" "github.com/prysmaticlabs/prysm/shared/sliceutil" "github.com/prysmaticlabs/prysm/shared/traceutil" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/backup.go b/beacon-chain/db/kv/backup.go index 27d30b8990..ac3b71db1e 100644 --- a/beacon-chain/db/kv/backup.go +++ b/beacon-chain/db/kv/backup.go @@ -6,9 +6,9 @@ import ( "os" "path" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/blocks.go b/beacon-chain/db/kv/blocks.go index 3313259a68..5f11fb1751 100644 --- a/beacon-chain/db/kv/blocks.go +++ b/beacon-chain/db/kv/blocks.go @@ -6,7 +6,6 @@ import ( "fmt" "strconv" - "github.com/boltdb/bolt" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" @@ -17,6 +16,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/sliceutil" log "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/checkpoint.go b/beacon-chain/db/kv/checkpoint.go index d1d769b177..82da461d02 100644 --- a/beacon-chain/db/kv/checkpoint.go +++ b/beacon-chain/db/kv/checkpoint.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/boltdb/bolt" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" "github.com/prysmaticlabs/prysm/shared/traceutil" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/deposit_contract.go b/beacon-chain/db/kv/deposit_contract.go index 055e5fdcb8..a05bacd89d 100644 --- a/beacon-chain/db/kv/deposit_contract.go +++ b/beacon-chain/db/kv/deposit_contract.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/boltdb/bolt" "github.com/ethereum/go-ethereum/common" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/finalized_block_roots.go b/beacon-chain/db/kv/finalized_block_roots.go index 22c8ebd04b..a7fc0bb6bc 100644 --- a/beacon-chain/db/kv/finalized_block_roots.go +++ b/beacon-chain/db/kv/finalized_block_roots.go @@ -5,12 +5,12 @@ import ( "context" "fmt" - "github.com/boltdb/bolt" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/traceutil" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/kv.go b/beacon-chain/db/kv/kv.go index 0ba0a9644b..76b0ebd3e9 100644 --- a/beacon-chain/db/kv/kv.go +++ b/beacon-chain/db/kv/kv.go @@ -5,12 +5,12 @@ import ( "path" "time" - "github.com/boltdb/bolt" "github.com/dgraph-io/ristretto" - "github.com/mdlayher/prombolt" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" + "github.com/prysmaticlabs/prombbolt" "github.com/prysmaticlabs/prysm/beacon-chain/db/iface" + bolt "go.etcd.io/bbolt" ) var _ = iface.Database(&Store{}) diff --git a/beacon-chain/db/kv/operations.go b/beacon-chain/db/kv/operations.go index a1c505b091..bd003627ad 100644 --- a/beacon-chain/db/kv/operations.go +++ b/beacon-chain/db/kv/operations.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/boltdb/bolt" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/powchain.go b/beacon-chain/db/kv/powchain.go index 4a76fd5cce..f37ffd154e 100644 --- a/beacon-chain/db/kv/powchain.go +++ b/beacon-chain/db/kv/powchain.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/prysmaticlabs/prysm/proto/beacon/db" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/slashings.go b/beacon-chain/db/kv/slashings.go index 953b2fc1c0..6baa160f20 100644 --- a/beacon-chain/db/kv/slashings.go +++ b/beacon-chain/db/kv/slashings.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/boltdb/bolt" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/state.go b/beacon-chain/db/kv/state.go index a61aa71c2c..70cc52ea06 100644 --- a/beacon-chain/db/kv/state.go +++ b/beacon-chain/db/kv/state.go @@ -4,13 +4,13 @@ import ( "bytes" "context" - "github.com/boltdb/bolt" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/beacon-chain/state" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/featureconfig" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/state_summary.go b/beacon-chain/db/kv/state_summary.go index 3f45c37c73..a4b6317832 100644 --- a/beacon-chain/db/kv/state_summary.go +++ b/beacon-chain/db/kv/state_summary.go @@ -3,8 +3,8 @@ package kv import ( "context" - "github.com/boltdb/bolt" pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/beacon-chain/db/kv/utils.go b/beacon-chain/db/kv/utils.go index 269f440bb3..a244bad6ff 100644 --- a/beacon-chain/db/kv/utils.go +++ b/beacon-chain/db/kv/utils.go @@ -3,7 +3,7 @@ package kv import ( "bytes" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" ) // lookupValuesForIndices takes in a list of indices and looks up diff --git a/beacon-chain/db/kv/validators.go b/beacon-chain/db/kv/validators.go index d8b30de881..8cee10dfa9 100644 --- a/beacon-chain/db/kv/validators.go +++ b/beacon-chain/db/kv/validators.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "fmt" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/shared/params" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/BUILD.bazel b/slasher/db/kv/BUILD.bazel index 991d7737df..5fcc09ae97 100644 --- a/slasher/db/kv/BUILD.bazel +++ b/slasher/db/kv/BUILD.bazel @@ -23,13 +23,13 @@ go_library( "//slasher/cache:go_default_library", "//slasher/db/types:go_default_library", "//slasher/detection/attestations/types:go_default_library", - "@com_github_boltdb_bolt//:go_default_library", "@com_github_gogo_protobuf//proto: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_ethereumapis//eth/v1alpha1:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", + "@io_etcd_go_bbolt//:go_default_library", "@io_opencensus_go//trace:go_default_library", ], ) diff --git a/slasher/db/kv/attester_slashings.go b/slasher/db/kv/attester_slashings.go index 318b4b2e77..372e43a3bd 100644 --- a/slasher/db/kv/attester_slashings.go +++ b/slasher/db/kv/attester_slashings.go @@ -4,13 +4,13 @@ import ( "bytes" "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/slasher/db/types" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/block_header.go b/slasher/db/kv/block_header.go index 9c491cdc1d..3c3555689d 100644 --- a/slasher/db/kv/block_header.go +++ b/slasher/db/kv/block_header.go @@ -4,13 +4,13 @@ import ( "bytes" "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/params" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/chain_data.go b/slasher/db/kv/chain_data.go index 47c03b40f3..013a3ca0fb 100644 --- a/slasher/db/kv/chain_data.go +++ b/slasher/db/kv/chain_data.go @@ -3,10 +3,10 @@ package kv import ( "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/indexed_attestations.go b/slasher/db/kv/indexed_attestations.go index 88d966acc5..e8869574c5 100644 --- a/slasher/db/kv/indexed_attestations.go +++ b/slasher/db/kv/indexed_attestations.go @@ -4,11 +4,11 @@ import ( "bytes" "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/kv.go b/slasher/db/kv/kv.go index 9dbce5af9e..9aabb30dcc 100644 --- a/slasher/db/kv/kv.go +++ b/slasher/db/kv/kv.go @@ -5,9 +5,9 @@ import ( "path" "time" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/slasher/cache" + bolt "go.etcd.io/bbolt" ) var databaseFileName = "slasher.db" diff --git a/slasher/db/kv/proposer_slashings.go b/slasher/db/kv/proposer_slashings.go index efc86af63d..e589e4f36a 100644 --- a/slasher/db/kv/proposer_slashings.go +++ b/slasher/db/kv/proposer_slashings.go @@ -4,12 +4,12 @@ import ( "bytes" "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" "github.com/prysmaticlabs/prysm/slasher/db/types" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/spanner.go b/slasher/db/kv/spanner.go index bbca405460..bcc70242cb 100644 --- a/slasher/db/kv/spanner.go +++ b/slasher/db/kv/spanner.go @@ -3,7 +3,6 @@ package kv import ( "context" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -11,6 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/slasher/detection/attestations/types" log "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/slasher/db/kv/validator_id_pubkey.go b/slasher/db/kv/validator_id_pubkey.go index a041bb9929..9d7b8d03c6 100644 --- a/slasher/db/kv/validator_id_pubkey.go +++ b/slasher/db/kv/validator_id_pubkey.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/shared/bytesutil" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/third_party/boltdb/bolt.BUILD b/third_party/boltdb/bolt.BUILD deleted file mode 100644 index 3cd1c1ded4..0000000000 --- a/third_party/boltdb/bolt.BUILD +++ /dev/null @@ -1,61 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -# Bolt DB is an archived project which is no longer maintained. As of go 1.14, -# the go compiler adds checkptr to all builds when using -race or -msan. Since -# bolt DB violates this check, we must disable checkptr for this library. -# -# See: https://golang.org/doc/go1.14 -# See: https://github.com/etcd-io/bbolt/issues/187 - -go_library( - name = "go_default_library", - srcs = [ - "bolt_386.go", - "bolt_amd64.go", - "bolt_arm.go", - "bolt_arm64.go", - "bolt_linux.go", - "bolt_openbsd.go", - "bolt_ppc64.go", - "bolt_ppc64le.go", - "bolt_s390x.go", - "bolt_unix.go", - "bolt_unix_solaris.go", - "bolt_windows.go", - "boltsync_unix.go", - "bucket.go", - "cursor.go", - "db.go", - "doc.go", - "errors.go", - "freelist.go", - "node.go", - "page.go", - "tx.go", - ], - gc_goopts = ["-d=checkptr=0"], # Required due to unsafe pointer usage. - importpath = "github.com/boltdb/bolt", - visibility = ["//visibility:public"], - deps = select({ - "@io_bazel_rules_go//go/platform:solaris": [ - "@org_golang_x_sys//unix:go_default_library", - ], - "//conditions:default": [], - }), -) - -go_test( - name = "go_default_test", - srcs = [ - "bucket_test.go", - "cursor_test.go", - "db_test.go", - "freelist_test.go", - "node_test.go", - "page_test.go", - "quick_test.go", - "simulation_test.go", - "tx_test.go", - ], - embed = [":go_default_library"], -) diff --git a/tools/cluster-pk-manager/server/BUILD.bazel b/tools/cluster-pk-manager/server/BUILD.bazel index 9953bd0697..741565eeaa 100644 --- a/tools/cluster-pk-manager/server/BUILD.bazel +++ b/tools/cluster-pk-manager/server/BUILD.bazel @@ -24,7 +24,6 @@ go_library( "//shared/keystore:go_default_library", "//shared/params:go_default_library", "//shared/prometheus:go_default_library", - "@com_github_boltdb_bolt//:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", @@ -38,6 +37,7 @@ go_library( "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", + "@io_etcd_go_bbolt//:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_client_go//kubernetes:go_default_library", @@ -91,7 +91,6 @@ go_image( "//shared/keystore:go_default_library", "//shared/params:go_default_library", "//shared/prometheus:go_default_library", - "@com_github_boltdb_bolt//:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", @@ -105,6 +104,7 @@ go_image( "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", "@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", + "@io_etcd_go_bbolt//:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_client_go//kubernetes:go_default_library", diff --git a/tools/cluster-pk-manager/server/db.go b/tools/cluster-pk-manager/server/db.go index 02338ef6b1..f69652efd2 100644 --- a/tools/cluster-pk-manager/server/db.go +++ b/tools/cluster-pk-manager/server/db.go @@ -7,7 +7,6 @@ import ( "path" "time" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -15,6 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/keystore" + bolt "go.etcd.io/bbolt" ) var ( diff --git a/validator/db/BUILD.bazel b/validator/db/BUILD.bazel index 98efb1bcb8..c224068810 100644 --- a/validator/db/BUILD.bazel +++ b/validator/db/BUILD.bazel @@ -15,11 +15,11 @@ go_library( "//proto/slashing:go_default_library", "//shared/params:go_default_library", "//validator/db/iface:go_default_library", - "@com_github_boltdb_bolt//:go_default_library", "@com_github_gogo_protobuf//proto: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", + "@io_etcd_go_bbolt//:go_default_library", "@io_opencensus_go//trace:go_default_library", ], ) diff --git a/validator/db/attestation_history.go b/validator/db/attestation_history.go index 6f41743f2f..572b531058 100644 --- a/validator/db/attestation_history.go +++ b/validator/db/attestation_history.go @@ -3,10 +3,10 @@ package db import ( "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" ) diff --git a/validator/db/db.go b/validator/db/db.go index dc637eb33c..e8318c84ed 100644 --- a/validator/db/db.go +++ b/validator/db/db.go @@ -6,13 +6,13 @@ import ( "path/filepath" "time" - "github.com/boltdb/bolt" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/validator/db/iface" "github.com/sirupsen/logrus" + bolt "go.etcd.io/bbolt" ) var log = logrus.WithField("prefix", "db") diff --git a/validator/db/proposal_history.go b/validator/db/proposal_history.go index f951fa8916..4d127dc030 100644 --- a/validator/db/proposal_history.go +++ b/validator/db/proposal_history.go @@ -3,10 +3,10 @@ package db import ( "context" - "github.com/boltdb/bolt" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" slashpb "github.com/prysmaticlabs/prysm/proto/slashing" + bolt "go.etcd.io/bbolt" "go.opencensus.io/trace" )