From cb65fad5da04ef5f6ec3b63955178c187348cc25 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Wed, 18 Dec 2024 14:50:55 +0700 Subject: [PATCH 1/2] save --- cmd/hack/hack.go | 2 +- core/state/recon_state.go | 2 +- erigon-lib/downloader/mdbx_piece_completion.go | 2 +- erigon-lib/go.mod | 1 + erigon-lib/go.sum | 3 +++ erigon-lib/kv/bitmapdb/bitmapdb.go | 4 ++-- erigon-lib/kv/bitmapdb/bitmapdb_test.go | 2 +- erigon-lib/kv/bitmapdb/stream.go | 2 +- erigon-lib/state/aggregator.go | 2 +- erigon-lib/state/inverted_index_stream.go | 2 +- go.mod | 1 + go.sum | 3 +++ turbo/jsonrpc/erigon_receipts.go | 2 +- turbo/jsonrpc/eth_receipts.go | 2 +- turbo/jsonrpc/otterscan_search_backward.go | 2 +- turbo/jsonrpc/otterscan_search_backward_test.go | 2 +- turbo/jsonrpc/otterscan_search_forward.go | 2 +- turbo/jsonrpc/otterscan_search_forward_test.go | 2 +- turbo/jsonrpc/otterscan_search_test.go | 2 +- turbo/jsonrpc/overlay_api.go | 4 ++-- turbo/stages/bodydownload/body_data_struct.go | 2 +- 21 files changed, 27 insertions(+), 19 deletions(-) diff --git a/cmd/hack/hack.go b/cmd/hack/hack.go index 13a900a549a..237cad6d7cc 100644 --- a/cmd/hack/hack.go +++ b/cmd/hack/hack.go @@ -32,7 +32,7 @@ import ( "slices" "strings" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/holiman/uint256" "github.com/erigontech/erigon-lib/log/v3" diff --git a/core/state/recon_state.go b/core/state/recon_state.go index 1e7bbea1db9..89bfeb8f3eb 100644 --- a/core/state/recon_state.go +++ b/core/state/recon_state.go @@ -25,7 +25,7 @@ import ( "encoding/binary" "sync" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/google/btree" btree2 "github.com/tidwall/btree" diff --git a/erigon-lib/downloader/mdbx_piece_completion.go b/erigon-lib/downloader/mdbx_piece_completion.go index fe03cb207e8..97ee06f5963 100644 --- a/erigon-lib/downloader/mdbx_piece_completion.go +++ b/erigon-lib/downloader/mdbx_piece_completion.go @@ -21,7 +21,7 @@ import ( "encoding/binary" "sync" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/anacrolix/torrent/metainfo" "github.com/anacrolix/torrent/storage" "github.com/anacrolix/torrent/types/infohash" diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index d337d90d9f7..be2897d173c 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -17,6 +17,7 @@ require ( require ( github.com/RoaringBitmap/roaring v1.9.4 + github.com/RoaringBitmap/roaring/v2 v2.4.2 github.com/anacrolix/dht/v2 v2.21.1 github.com/anacrolix/go-libutp v1.3.1 github.com/anacrolix/log v0.15.2 diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 150d86f95c5..26ad7c8e9c1 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -14,6 +14,8 @@ github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrX github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ= github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= +github.com/RoaringBitmap/roaring/v2 v2.4.2 h1:ew/INI7HLRyYK+dCbF6FcUwoe2Q0q5HCV7WafY9ljBk= +github.com/RoaringBitmap/roaring/v2 v2.4.2/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 h1:byYvvbfSo3+9efR4IeReh77gVs4PnNDR3AMOE9NJ7a0= @@ -693,6 +695,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/erigon-lib/kv/bitmapdb/bitmapdb.go b/erigon-lib/kv/bitmapdb/bitmapdb.go index 674f936da59..15dd2ef7ede 100644 --- a/erigon-lib/kv/bitmapdb/bitmapdb.go +++ b/erigon-lib/kv/bitmapdb/bitmapdb.go @@ -23,8 +23,8 @@ import ( "sort" "sync" - "github.com/RoaringBitmap/roaring" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/c2h5oh/datasize" "github.com/erigontech/erigon-lib/common" diff --git a/erigon-lib/kv/bitmapdb/bitmapdb_test.go b/erigon-lib/kv/bitmapdb/bitmapdb_test.go index cb66ad05d18..9f5b3c88881 100644 --- a/erigon-lib/kv/bitmapdb/bitmapdb_test.go +++ b/erigon-lib/kv/bitmapdb/bitmapdb_test.go @@ -19,7 +19,7 @@ package bitmapdb_test import ( "testing" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/erigontech/erigon-lib/kv/bitmapdb" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/bitmapdb/stream.go b/erigon-lib/kv/bitmapdb/stream.go index 890f1552671..24f32f3f337 100644 --- a/erigon-lib/kv/bitmapdb/stream.go +++ b/erigon-lib/kv/bitmapdb/stream.go @@ -17,7 +17,7 @@ package bitmapdb import ( - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" ) type BitmapStream struct { diff --git a/erigon-lib/state/aggregator.go b/erigon-lib/state/aggregator.go index 21237df88ab..8ca7d0d78bf 100644 --- a/erigon-lib/state/aggregator.go +++ b/erigon-lib/state/aggregator.go @@ -31,7 +31,7 @@ import ( "sync/atomic" "time" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/c2h5oh/datasize" "github.com/tidwall/btree" rand2 "golang.org/x/exp/rand" diff --git a/erigon-lib/state/inverted_index_stream.go b/erigon-lib/state/inverted_index_stream.go index 5f7b5808f16..3af7ba07464 100644 --- a/erigon-lib/state/inverted_index_stream.go +++ b/erigon-lib/state/inverted_index_stream.go @@ -21,7 +21,7 @@ import ( "container/heap" "encoding/binary" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/erigontech/erigon-lib/kv" "github.com/erigontech/erigon-lib/kv/bitmapdb" diff --git a/go.mod b/go.mod index 07949c43314..07ce276c3bb 100644 --- a/go.mod +++ b/go.mod @@ -22,6 +22,7 @@ require ( github.com/Giulio2002/bls v0.0.0-20241116091023-2ddcc8954ec0 github.com/Masterminds/sprig/v3 v3.2.3 github.com/RoaringBitmap/roaring v1.9.4 + github.com/RoaringBitmap/roaring/v2 v2.4.2 github.com/alecthomas/kong v0.8.1 github.com/anacrolix/sync v0.5.1 github.com/anacrolix/torrent v1.52.6-0.20231201115409-7ea994b6bbd8 diff --git a/go.sum b/go.sum index e58d9b5bbe3..c7883eb4b20 100644 --- a/go.sum +++ b/go.sum @@ -72,6 +72,8 @@ github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrX github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ= github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= +github.com/RoaringBitmap/roaring/v2 v2.4.2 h1:ew/INI7HLRyYK+dCbF6FcUwoe2Q0q5HCV7WafY9ljBk= +github.com/RoaringBitmap/roaring/v2 v2.4.2/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= @@ -1384,6 +1386,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= diff --git a/turbo/jsonrpc/erigon_receipts.go b/turbo/jsonrpc/erigon_receipts.go index 8d98d53049f..91deb7506f1 100644 --- a/turbo/jsonrpc/erigon_receipts.go +++ b/turbo/jsonrpc/erigon_receipts.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon-lib/kv/order" diff --git a/turbo/jsonrpc/eth_receipts.go b/turbo/jsonrpc/eth_receipts.go index 04a5fceeb7a..4a2592bbb34 100644 --- a/turbo/jsonrpc/eth_receipts.go +++ b/turbo/jsonrpc/eth_receipts.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/RoaringBitmap/roaring" + "github.com/RoaringBitmap/roaring/v2" "github.com/erigontech/erigon-lib/chain" "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon-lib/kv" diff --git a/turbo/jsonrpc/otterscan_search_backward.go b/turbo/jsonrpc/otterscan_search_backward.go index 1d2e1542192..f3f65e428df 100644 --- a/turbo/jsonrpc/otterscan_search_backward.go +++ b/turbo/jsonrpc/otterscan_search_backward.go @@ -19,7 +19,7 @@ package jsonrpc import ( "bytes" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon-lib/kv" ) diff --git a/turbo/jsonrpc/otterscan_search_backward_test.go b/turbo/jsonrpc/otterscan_search_backward_test.go index d623070d6e3..c8cbdea5291 100644 --- a/turbo/jsonrpc/otterscan_search_backward_test.go +++ b/turbo/jsonrpc/otterscan_search_backward_test.go @@ -22,7 +22,7 @@ import ( "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" libcommon "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/stretchr/testify/require" diff --git a/turbo/jsonrpc/otterscan_search_forward.go b/turbo/jsonrpc/otterscan_search_forward.go index 169a5d0f2d5..195070b0752 100644 --- a/turbo/jsonrpc/otterscan_search_forward.go +++ b/turbo/jsonrpc/otterscan_search_forward.go @@ -19,7 +19,7 @@ package jsonrpc import ( "bytes" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon-lib/kv" ) diff --git a/turbo/jsonrpc/otterscan_search_forward_test.go b/turbo/jsonrpc/otterscan_search_forward_test.go index 9a0dd14b5e7..346a829327d 100644 --- a/turbo/jsonrpc/otterscan_search_forward_test.go +++ b/turbo/jsonrpc/otterscan_search_forward_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" libcommon "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon-lib/common/hexutil" "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" diff --git a/turbo/jsonrpc/otterscan_search_test.go b/turbo/jsonrpc/otterscan_search_test.go index 9f7e4f4efd6..50814c82801 100644 --- a/turbo/jsonrpc/otterscan_search_test.go +++ b/turbo/jsonrpc/otterscan_search_test.go @@ -19,7 +19,7 @@ package jsonrpc import ( "testing" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" ) func createBitmap(t *testing.T, blocks []uint64) []byte { diff --git a/turbo/jsonrpc/overlay_api.go b/turbo/jsonrpc/overlay_api.go index 0072579da9b..d39401d406c 100644 --- a/turbo/jsonrpc/overlay_api.go +++ b/turbo/jsonrpc/overlay_api.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/RoaringBitmap/roaring" - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/erigontech/erigon-lib/chain" "github.com/erigontech/erigon-lib/common" diff --git a/turbo/stages/bodydownload/body_data_struct.go b/turbo/stages/bodydownload/body_data_struct.go index 9d233ed1700..b357a7eb9de 100644 --- a/turbo/stages/bodydownload/body_data_struct.go +++ b/turbo/stages/bodydownload/body_data_struct.go @@ -17,7 +17,7 @@ package bodydownload import ( - "github.com/RoaringBitmap/roaring/roaring64" + "github.com/RoaringBitmap/roaring/v2/roaring64" "github.com/google/btree" libcommon "github.com/erigontech/erigon-lib/common" From a24ba431b7dc561b04272649b8b288cc60d080d0 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Thu, 19 Dec 2024 09:00:17 +0700 Subject: [PATCH 2/2] save --- erigon-lib/go.mod | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index be2897d173c..63c7e8fdb3b 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -16,7 +16,6 @@ require ( ) require ( - github.com/RoaringBitmap/roaring v1.9.4 github.com/RoaringBitmap/roaring/v2 v2.4.2 github.com/anacrolix/dht/v2 v2.21.1 github.com/anacrolix/go-libutp v1.3.1 @@ -61,6 +60,7 @@ require ( ) require ( + github.com/RoaringBitmap/roaring v1.9.4 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/ianlancetaylor/cgosymbolizer v0.0.0-20240503222823-736c933a666d // indirect diff --git a/go.mod b/go.mod index 07ce276c3bb..cc2d29e043f 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/99designs/gqlgen v0.17.56 github.com/Giulio2002/bls v0.0.0-20241116091023-2ddcc8954ec0 github.com/Masterminds/sprig/v3 v3.2.3 - github.com/RoaringBitmap/roaring v1.9.4 github.com/RoaringBitmap/roaring/v2 v2.4.2 github.com/alecthomas/kong v0.8.1 github.com/anacrolix/sync v0.5.1 @@ -110,6 +109,7 @@ require ( ) require ( + github.com/RoaringBitmap/roaring v1.9.4 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b // indirect github.com/crate-crypto/go-ipa v0.0.0-20221111143132-9aa5d42120bc // indirect