From 7a60f7056ef7082709f0b60a1e7a80bc02d532f8 Mon Sep 17 00:00:00 2001 From: Semyon Novikov Date: Wed, 30 Oct 2024 15:56:58 +0300 Subject: [PATCH 1/2] fix: logs --- escrow/payment_channel_storage.go | 4 ++-- escrow/payment_handler.go | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/escrow/payment_channel_storage.go b/escrow/payment_channel_storage.go index 704f017f..76357ad0 100644 --- a/escrow/payment_channel_storage.go +++ b/escrow/payment_channel_storage.go @@ -119,8 +119,8 @@ func (reader *BlockchainChannelReader) GetChannelStateFromBlockchain(key *Paymen if recipientPaymentAddress != ch.Recipient { zap.L().Warn("Recipient Address from org metadata not Match on what was retrieved from Channel", - zap.Any("recipientPaymentAddress", recipientPaymentAddress), - zap.Any("ch.Recipient", ch.Recipient)) + zap.String("recipientPaymentAddress", recipientPaymentAddress.Hex()), + zap.String("ch.Recipient", ch.Recipient.Hex())) return nil, false, fmt.Errorf("recipient Address from org metadata does not Match on what was retrieved from Channel") } return &PaymentChannelData{ diff --git a/escrow/payment_handler.go b/escrow/payment_handler.go index 0ad64c04..d4dcf516 100644 --- a/escrow/payment_handler.go +++ b/escrow/payment_handler.go @@ -4,7 +4,6 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" "go.uber.org/zap" "google.golang.org/grpc/codes" @@ -105,8 +104,8 @@ func (h *paymentChannelPaymentHandler) Complete(payment handler.Payment) (err *h func PublishChannelStats(payment handler.Payment) (grpcErr *handler.GrpcError) { if !config.GetBool(config.MeteringEnabled) { - grpcErr = handler.NewGrpcErrorf(codes.Internal, "Cannot post latest offline channel state as metering is disabled !!") - zap.L().Error("Error in payment channel payment handler commit", zap.Error(grpcErr.Err())) + grpcErr = handler.NewGrpcErrorf(codes.Internal, "Can't post latest offline channel state as metering is disabled!") + zap.L().Warn("Can't post latest offline channel state as metering is disabled!", zap.Error(grpcErr.Err())) return grpcErr } paymentTransaction := payment.(*paymentTransaction) @@ -116,17 +115,16 @@ func PublishChannelStats(payment handler.Payment) (grpcErr *handler.GrpcError) { Nonce: paymentTransaction.Channel().Nonce, GroupID: blockchain.BytesToBase64(paymentTransaction.Channel().GroupID[:]), } - serviceURL := config.GetString(config.MeteringEndPoint) + "/contract-api/channel/" + channelStats.ChannelId.String() + "/balance" + meteringURL := config.GetString(config.MeteringEndPoint) + "/contract-api/channel/" + channelStats.ChannelId.String() + "/balance" channelStats.OrganizationID = config.GetString(config.OrganizationId) channelStats.ServiceID = config.GetString(config.ServiceId) zap.L().Debug("Payment channel payment handler is publishing channel statistics", zap.Any("ChannelStats", channelStats)) commonStats := &metrics.CommonStats{ GroupID: channelStats.GroupID, UserName: paymentTransaction.Channel().Sender.Hex()} - status := metrics.Publish(channelStats, serviceURL, commonStats) - + status := metrics.Publish(channelStats, meteringURL, commonStats) if !status { - log.Error("Payment channel payment handler unable to post latest off-chain Channel state on contract API Endpoint", zap.String("serciveURL", serviceURL)) + zap.L().Warn("Payment handler unable to post latest off-chain Channel state on contract API Endpoint for metering", zap.String("meteringURL", meteringURL)) return handler.NewGrpcErrorf(codes.Internal, "Unable to publish status error") } return nil From 73e917dae76cd0fe589ec19da986fdaa370275bb Mon Sep 17 00:00:00 2001 From: Semyon Novikov Date: Wed, 30 Oct 2024 19:25:15 +0300 Subject: [PATCH 2/2] update go.mod & fix tests (#601) * update go.mod * fix: tests --- authutils/auth_service.go | 2 +- authutils/auth_service_test.go | 2 +- blockchain/blockchain.go | 2 +- blockchain/ethereumClient.go | 2 +- blockchain/orginzationMetadata.go | 4 +- blockchain/orginzationMetadata_test.go | 2 +- blockchain/serviceMetadata.go | 4 +- blockchain/serviceMetadata_test.go | 2 +- codec/codec.go | 1 + .../configuration_service.go | 4 +- .../configuration_service_test.go | 4 +- .../contract_event_listener.go | 4 +- .../listen_organization_metadata_changing.go | 4 +- escrow/allowed_user_payment_handler.go | 4 +- escrow/allowed_user_payment_handler_test.go | 4 +- escrow/control_service.go | 4 +- escrow/control_service_test.go | 8 +- escrow/escrow_test.go | 6 +- escrow/free_call.go | 4 +- escrow/free_call_payment_handler.go | 6 +- escrow/free_call_payment_handler_test.go | 8 +- escrow/free_call_state_service.go | 4 +- escrow/free_call_state_service_test.go | 6 +- escrow/free_call_storage.go | 2 +- escrow/free_call_storage_test.go | 2 +- escrow/free_call_test.go | 6 +- escrow/income.go | 4 +- escrow/income_test.go | 6 +- escrow/lock.go | 2 +- escrow/payment_channel_api.go | 2 +- escrow/payment_channel_storage.go | 4 +- escrow/payment_channel_storage_test.go | 4 +- escrow/payment_handler.go | 8 +- escrow/payment_handler_test.go | 8 +- escrow/payment_storage.go | 2 +- escrow/prepaid_handler.go | 10 +-- escrow/prepaid_service.go | 2 +- escrow/prepaid_service_test.go | 2 +- escrow/prepaid_storage.go | 2 +- escrow/state_service.go | 4 +- escrow/state_service_test.go | 4 +- escrow/token_service.go | 6 +- escrow/token_service_test.go | 6 +- escrow/validation.go | 6 +- escrow/validation_test.go | 4 +- etcddb/etcddb_client.go | 8 +- etcddb/etcddb_client_test.go | 2 +- etcddb/etcddb_conf.go | 4 +- etcddb/etcddb_conf_test.go | 4 +- etcddb/etcddb_server.go | 2 +- etcddb/etcddb_test.go | 4 +- go.mod | 32 ++++---- go.sum | 80 ++++++++----------- handler/grpc.go | 6 +- handler/httphandler/http.go | 6 +- handler/interceptors.go | 10 +-- handler/interceptors_test.go | 2 +- .../intergrationtests/grpc_to_grpc_test.go | 6 +- ipfsutils/ipfsutils.go | 2 +- ipfsutils/ipfsutils_test.go | 2 +- license_server/license_service.go | 4 +- license_server/license_service_test.go | 4 +- license_server/license_storage.go | 2 +- logger/hook.go | 2 +- logger/hook_test.go | 2 +- logger/logger.go | 2 +- logger/logger_test.go | 2 +- metrics/clients.go | 2 +- metrics/clients_test.go | 9 ++- metrics/heartbeat.go | 2 +- metrics/notifications.go | 2 +- metrics/notifications_test.go | 2 +- metrics/register.go | 2 +- metrics/request_stats.go | 2 +- metrics/request_stats_test.go | 2 +- metrics/response_stats.go | 2 +- metrics/response_stats_test.go | 2 +- metrics/utils.go | 4 +- metrics/utils_test.go | 4 +- pricing/dynamic_method_pricing.go | 8 +- pricing/fixed_method_pricing.go | 4 +- pricing/fixed_method_pricing_test.go | 4 +- pricing/fixed_pricing.go | 2 +- pricing/fixed_pricing_test.go | 4 +- pricing/price_type.go | 2 +- pricing/pricing_strategy.go | 6 +- pricing/pricing_strategy_test.go | 2 +- ratelimit/rateLimit.go | 2 +- scripts/build | 2 +- scripts/build_all_platforms | 6 +- snetd/cmd/channel.go | 4 +- snetd/cmd/components.go | 22 ++--- snetd/cmd/components_test.go | 2 +- snetd/cmd/flags.go | 2 +- snetd/cmd/free_call_users.go | 8 +- snetd/cmd/init.go | 2 +- snetd/cmd/list_channels.go | 2 +- snetd/cmd/list_claims.go | 2 +- snetd/cmd/serve.go | 20 ++--- snetd/cmd/serve_test.go | 2 +- snetd/cmd/version_details.go | 2 +- snetd/main.go | 2 +- token/jwttoken.go | 4 +- token/jwttoken_test.go | 2 +- training/service.go | 8 +- training/service_test.go | 6 +- training/storage.go | 4 +- training/storage_test.go | 2 +- utils/common.go | 2 +- 109 files changed, 271 insertions(+), 279 deletions(-) diff --git a/authutils/auth_service.go b/authutils/auth_service.go index 9001b078..d770b1f6 100755 --- a/authutils/auth_service.go +++ b/authutils/auth_service.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" "go.uber.org/zap" ) diff --git a/authutils/auth_service_test.go b/authutils/auth_service_test.go index cf5a57d9..609dacb0 100644 --- a/authutils/auth_service_test.go +++ b/authutils/auth_service_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" ) diff --git a/blockchain/blockchain.go b/blockchain/blockchain.go index bfa5b7e9..5ce85480 100644 --- a/blockchain/blockchain.go +++ b/blockchain/blockchain.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" ) diff --git a/blockchain/ethereumClient.go b/blockchain/ethereumClient.go index d394c874..3c5114f7 100644 --- a/blockchain/ethereumClient.go +++ b/blockchain/ethereumClient.go @@ -4,7 +4,7 @@ import ( "context" "encoding/base64" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" diff --git a/blockchain/orginzationMetadata.go b/blockchain/orginzationMetadata.go index d868bdeb..54401ea4 100644 --- a/blockchain/orginzationMetadata.go +++ b/blockchain/orginzationMetadata.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/ipfsutils" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/ipfsutils" "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" diff --git a/blockchain/orginzationMetadata_test.go b/blockchain/orginzationMetadata_test.go index 18460499..8134e1a0 100644 --- a/blockchain/orginzationMetadata_test.go +++ b/blockchain/orginzationMetadata_test.go @@ -1,7 +1,7 @@ package blockchain import ( - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "math/big" "testing" diff --git a/blockchain/serviceMetadata.go b/blockchain/serviceMetadata.go index 84c5dd2d..f0ace63d 100644 --- a/blockchain/serviceMetadata.go +++ b/blockchain/serviceMetadata.go @@ -13,8 +13,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/pkg/errors" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/ipfsutils" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/ipfsutils" "go.uber.org/zap" "google.golang.org/protobuf/reflect/protoreflect" ) diff --git a/blockchain/serviceMetadata_test.go b/blockchain/serviceMetadata_test.go index 91cf9fab..8d2357ee 100644 --- a/blockchain/serviceMetadata_test.go +++ b/blockchain/serviceMetadata_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" ) diff --git a/codec/codec.go b/codec/codec.go index 55d6f435..768995cf 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -3,6 +3,7 @@ package codec import ( "fmt" "google.golang.org/grpc/encoding" + _ "google.golang.org/grpc/encoding/gzip" _ "google.golang.org/grpc/encoding/proto" // ensure default "proto" codec is registered first "google.golang.org/protobuf/proto" "google.golang.org/protobuf/protoadapt" diff --git a/configuration_service/configuration_service.go b/configuration_service/configuration_service.go index 3a7479e0..22c23ad4 100644 --- a/configuration_service/configuration_service.go +++ b/configuration_service/configuration_service.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" "math/big" diff --git a/configuration_service/configuration_service_test.go b/configuration_service/configuration_service_test.go index 2b04e6e7..f0db55e5 100644 --- a/configuration_service/configuration_service_test.go +++ b/configuration_service/configuration_service_test.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/authutils" + "github.com/singnet/snet-daemon/v5/authutils" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" ) diff --git a/contract_event_listener/contract_event_listener.go b/contract_event_listener/contract_event_listener.go index cd6323e9..15b4c06a 100644 --- a/contract_event_listener/contract_event_listener.go +++ b/contract_event_listener/contract_event_listener.go @@ -1,8 +1,8 @@ package contractlistener import ( - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/etcddb" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/etcddb" ) type EventSignature string diff --git a/contract_event_listener/listen_organization_metadata_changing.go b/contract_event_listener/listen_organization_metadata_changing.go index e574a2a0..86effc10 100644 --- a/contract_event_listener/listen_organization_metadata_changing.go +++ b/contract_event_listener/listen_organization_metadata_changing.go @@ -4,8 +4,8 @@ import ( "context" "slices" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/etcddb" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/etcddb" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/gorilla/websocket" diff --git a/escrow/allowed_user_payment_handler.go b/escrow/allowed_user_payment_handler.go index f8c26dff..afdc0c37 100644 --- a/escrow/allowed_user_payment_handler.go +++ b/escrow/allowed_user_payment_handler.go @@ -2,8 +2,8 @@ package escrow import ( "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/handler" "google.golang.org/grpc/codes" ) diff --git a/escrow/allowed_user_payment_handler_test.go b/escrow/allowed_user_payment_handler_test.go index a896fc44..2b70658b 100644 --- a/escrow/allowed_user_payment_handler_test.go +++ b/escrow/allowed_user_payment_handler_test.go @@ -5,8 +5,8 @@ import ( "crypto/ecdsa" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" "math/big" diff --git a/escrow/control_service.go b/escrow/control_service.go index 7225940f..a8e0c7c7 100644 --- a/escrow/control_service.go +++ b/escrow/control_service.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/blockchain" "go.uber.org/zap" "golang.org/x/net/context" diff --git a/escrow/control_service_test.go b/escrow/control_service_test.go index 3fb78872..b1468f7b 100644 --- a/escrow/control_service_test.go +++ b/escrow/control_service_test.go @@ -6,9 +6,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/suite" "math/big" "strings" @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" ) type ControlServiceTestSuite struct { diff --git a/escrow/escrow_test.go b/escrow/escrow_test.go index fabbd706..b346fd6d 100644 --- a/escrow/escrow_test.go +++ b/escrow/escrow_test.go @@ -4,8 +4,8 @@ import ( "crypto/ecdsa" "errors" "fmt" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "testing" @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" ) type paymentChannelServiceMock struct { diff --git a/escrow/free_call.go b/escrow/free_call.go index 7896bd24..50a022c9 100644 --- a/escrow/free_call.go +++ b/escrow/free_call.go @@ -3,8 +3,8 @@ package escrow import ( "fmt" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" ) diff --git a/escrow/free_call_payment_handler.go b/escrow/free_call_payment_handler.go index 7d8f32c8..97ad6713 100644 --- a/escrow/free_call_payment_handler.go +++ b/escrow/free_call_payment_handler.go @@ -1,9 +1,9 @@ package escrow import ( - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" ) const ( diff --git a/escrow/free_call_payment_handler_test.go b/escrow/free_call_payment_handler_test.go index 036fd517..3a489403 100644 --- a/escrow/free_call_payment_handler_test.go +++ b/escrow/free_call_payment_handler_test.go @@ -4,15 +4,15 @@ import ( "bytes" "crypto/ecdsa" "fmt" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "strconv" "testing" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "google.golang.org/grpc/metadata" diff --git a/escrow/free_call_state_service.go b/escrow/free_call_state_service.go index c471f732..7a56d720 100644 --- a/escrow/free_call_state_service.go +++ b/escrow/free_call_state_service.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" "golang.org/x/net/context" diff --git a/escrow/free_call_state_service_test.go b/escrow/free_call_state_service_test.go index 60ed19be..45112310 100644 --- a/escrow/free_call_state_service_test.go +++ b/escrow/free_call_state_service_test.go @@ -5,9 +5,9 @@ import ( "crypto/ecdsa" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "math/big" diff --git a/escrow/free_call_storage.go b/escrow/free_call_storage.go index 3afe9181..6ea51c00 100644 --- a/escrow/free_call_storage.go +++ b/escrow/free_call_storage.go @@ -1,7 +1,7 @@ package escrow import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "reflect" ) diff --git a/escrow/free_call_storage_test.go b/escrow/free_call_storage_test.go index 743f88c4..a54800c0 100644 --- a/escrow/free_call_storage_test.go +++ b/escrow/free_call_storage_test.go @@ -1,7 +1,7 @@ package escrow import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "testing" diff --git a/escrow/free_call_test.go b/escrow/free_call_test.go index e3705559..4ce28824 100644 --- a/escrow/free_call_test.go +++ b/escrow/free_call_test.go @@ -1,11 +1,11 @@ package escrow import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "testing" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/escrow/income.go b/escrow/income.go index 88c4b1ee..91720fd2 100644 --- a/escrow/income.go +++ b/escrow/income.go @@ -1,10 +1,10 @@ package escrow import ( - "github.com/singnet/snet-daemon/pricing" + "github.com/singnet/snet-daemon/v5/pricing" "math/big" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/handler" ) // IncomeData is used to pass information to the pricing validation system. diff --git a/escrow/income_test.go b/escrow/income_test.go index 6b319618..23b84a4d 100644 --- a/escrow/income_test.go +++ b/escrow/income_test.go @@ -2,9 +2,9 @@ package escrow import ( "fmt" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/handler" - "github.com/singnet/snet-daemon/pricing" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/handler" + "github.com/singnet/snet-daemon/v5/pricing" "math/big" "testing" diff --git a/escrow/lock.go b/escrow/lock.go index 5819d761..13e5693a 100644 --- a/escrow/lock.go +++ b/escrow/lock.go @@ -1,7 +1,7 @@ package escrow import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "go.uber.org/zap" ) diff --git a/escrow/payment_channel_api.go b/escrow/payment_channel_api.go index 86640a0d..eae27aad 100644 --- a/escrow/payment_channel_api.go +++ b/escrow/payment_channel_api.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" ) // Payment contains MultiPartyEscrow payment details diff --git a/escrow/payment_channel_storage.go b/escrow/payment_channel_storage.go index 76357ad0..472b72f0 100644 --- a/escrow/payment_channel_storage.go +++ b/escrow/payment_channel_storage.go @@ -8,11 +8,11 @@ import ( "reflect" "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "github.com/spf13/viper" "go.uber.org/zap" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" ) // PaymentChannelStorage is a storage for PaymentChannelData by diff --git a/escrow/payment_channel_storage_test.go b/escrow/payment_channel_storage_test.go index 4b8b26e4..05c6d68f 100644 --- a/escrow/payment_channel_storage_test.go +++ b/escrow/payment_channel_storage_test.go @@ -2,13 +2,13 @@ package escrow import ( "errors" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "testing" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/escrow/payment_handler.go b/escrow/payment_handler.go index d4dcf516..b3bccb19 100644 --- a/escrow/payment_handler.go +++ b/escrow/payment_handler.go @@ -7,10 +7,10 @@ import ( "go.uber.org/zap" "google.golang.org/grpc/codes" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" - "github.com/singnet/snet-daemon/metrics" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" + "github.com/singnet/snet-daemon/v5/metrics" ) const ( diff --git a/escrow/payment_handler_test.go b/escrow/payment_handler_test.go index 43b6bb76..b78b81ef 100644 --- a/escrow/payment_handler_test.go +++ b/escrow/payment_handler_test.go @@ -1,15 +1,15 @@ package escrow import ( - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "math/big" "reflect" "strconv" "testing" "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/handler" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "google.golang.org/grpc/codes" @@ -154,7 +154,7 @@ func Test_paymentChannelPaymentHandler_PublishChannelStats(t *testing.T) { wantErr *handler.GrpcError setupFunc func() }{ - {name: "", wantErr: handler.NewGrpcErrorf(codes.Internal, "Cannot post latest offline channel state as metering is disabled !!"), setupFunc: func() { + {name: "", wantErr: handler.NewGrpcErrorf(codes.Internal, "Can't post latest offline channel state as metering is disabled!"), setupFunc: func() { }}, {name: "", wantErr: nil, setupFunc: func() { diff --git a/escrow/payment_storage.go b/escrow/payment_storage.go index afea6c6c..4e5f84cc 100644 --- a/escrow/payment_storage.go +++ b/escrow/payment_storage.go @@ -1,7 +1,7 @@ package escrow import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "reflect" ) diff --git a/escrow/prepaid_handler.go b/escrow/prepaid_handler.go index d100e84d..8bfb348c 100644 --- a/escrow/prepaid_handler.go +++ b/escrow/prepaid_handler.go @@ -1,11 +1,11 @@ package escrow import ( - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" - "github.com/singnet/snet-daemon/pricing" - "github.com/singnet/snet-daemon/token" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" + "github.com/singnet/snet-daemon/v5/pricing" + "github.com/singnet/snet-daemon/v5/token" "go.uber.org/zap" ) diff --git a/escrow/prepaid_service.go b/escrow/prepaid_service.go index 45722e3e..048b6ba4 100644 --- a/escrow/prepaid_service.go +++ b/escrow/prepaid_service.go @@ -2,7 +2,7 @@ package escrow import ( "fmt" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "strings" ) diff --git a/escrow/prepaid_service_test.go b/escrow/prepaid_service_test.go index fd707873..99c307ae 100644 --- a/escrow/prepaid_service_test.go +++ b/escrow/prepaid_service_test.go @@ -1,7 +1,7 @@ package escrow import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "math/big" "testing" diff --git a/escrow/prepaid_storage.go b/escrow/prepaid_storage.go index 1fa530ba..7d346f3a 100644 --- a/escrow/prepaid_storage.go +++ b/escrow/prepaid_storage.go @@ -2,7 +2,7 @@ package escrow import ( "fmt" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "reflect" ) diff --git a/escrow/state_service.go b/escrow/state_service.go index 0170da2c..a7bba73b 100644 --- a/escrow/state_service.go +++ b/escrow/state_service.go @@ -8,8 +8,8 @@ import ( "fmt" "math/big" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/blockchain" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" diff --git a/escrow/state_service_test.go b/escrow/state_service_test.go index 648dee57..2addd0a9 100644 --- a/escrow/state_service_test.go +++ b/escrow/state_service_test.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" ) diff --git a/escrow/token_service.go b/escrow/token_service.go index 5cf7e630..eb7ed661 100644 --- a/escrow/token_service.go +++ b/escrow/token_service.go @@ -5,9 +5,9 @@ import ( "bytes" "fmt" "github.com/ethereum/go-ethereum/common/math" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/token" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/token" "golang.org/x/net/context" "math/big" ) diff --git a/escrow/token_service_test.go b/escrow/token_service_test.go index d0aa2047..3df75704 100644 --- a/escrow/token_service_test.go +++ b/escrow/token_service_test.go @@ -5,9 +5,9 @@ import ( "crypto/ecdsa" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/storage" - "github.com/singnet/snet-daemon/token" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/storage" + "github.com/singnet/snet-daemon/v5/token" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "math/big" diff --git a/escrow/validation.go b/escrow/validation.go index 827f4ef6..ddb11c3f 100644 --- a/escrow/validation.go +++ b/escrow/validation.go @@ -6,9 +6,9 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/escrow/validation_test.go b/escrow/validation_test.go index d07209ae..89ef6c4e 100644 --- a/escrow/validation_test.go +++ b/escrow/validation_test.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/etcddb/etcddb_client.go b/etcddb/etcddb_client.go index a2e46512..68655043 100644 --- a/etcddb/etcddb_client.go +++ b/etcddb/etcddb_client.go @@ -10,10 +10,10 @@ import ( "time" "github.com/golang-collections/collections/set" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/storage" - "github.com/singnet/snet-daemon/utils" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/storage" + "github.com/singnet/snet-daemon/v5/utils" "github.com/spf13/viper" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" diff --git a/etcddb/etcddb_client_test.go b/etcddb/etcddb_client_test.go index b5e0aee7..c9933c1d 100644 --- a/etcddb/etcddb_client_test.go +++ b/etcddb/etcddb_client_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/magiconair/properties/assert" - "github.com/singnet/snet-daemon/utils" + "github.com/singnet/snet-daemon/v5/utils" ) func Test_checkIfHttps(t *testing.T) { diff --git a/etcddb/etcddb_conf.go b/etcddb/etcddb_conf.go index ca33c890..e2d5f1d7 100644 --- a/etcddb/etcddb_conf.go +++ b/etcddb/etcddb_conf.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/viper" "go.uber.org/zap" ) diff --git a/etcddb/etcddb_conf_test.go b/etcddb/etcddb_conf_test.go index 72d26fb2..7324f87e 100644 --- a/etcddb/etcddb_conf_test.go +++ b/etcddb/etcddb_conf_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/viper" "github.com/stretchr/testify/assert" diff --git a/etcddb/etcddb_server.go b/etcddb/etcddb_server.go index 3ceabe22..d1635f93 100644 --- a/etcddb/etcddb_server.go +++ b/etcddb/etcddb_server.go @@ -3,7 +3,7 @@ package etcddb import ( "errors" "fmt" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/viper" "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" diff --git a/etcddb/etcddb_test.go b/etcddb/etcddb_test.go index 14f48e00..7f46f75b 100644 --- a/etcddb/etcddb_test.go +++ b/etcddb/etcddb_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/go.mod b/go.mod index 84905942..c2ad567c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/singnet/snet-daemon +module github.com/singnet/snet-daemon/v5 go 1.23 @@ -15,7 +15,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/improbable-eng/grpc-web v0.15.0 github.com/ipfs/go-cid v0.4.1 - github.com/ipfs/kubo v0.30.0 + github.com/ipfs/kubo v0.31.0 github.com/magiconair/properties v1.8.7 github.com/pkg/errors v0.9.1 github.com/rs/cors v1.11.1 @@ -31,10 +31,10 @@ require ( go.etcd.io/etcd/server/v3 v3.5.16 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.28.0 - golang.org/x/net v0.29.0 - golang.org/x/time v0.6.0 - google.golang.org/grpc v1.66.2 - google.golang.org/protobuf v1.34.2 + golang.org/x/net v0.30.0 + golang.org/x/time v0.7.0 + google.golang.org/grpc v1.67.1 + google.golang.org/protobuf v1.35.1 gopkg.in/natefinch/lumberjack.v2 v2.2.1 ) @@ -102,7 +102,7 @@ require ( github.com/huin/goupnp v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/bbloom v0.0.4 // indirect - github.com/ipfs/boxo v0.23.0 // indirect + github.com/ipfs/boxo v0.24.0 // indirect github.com/ipfs/go-bitfield v1.1.0 // indirect github.com/ipfs/go-block-format v0.2.0 // indirect github.com/ipfs/go-datastore v0.6.0 // indirect @@ -110,14 +110,14 @@ require ( github.com/ipfs/go-fs-lock v0.0.7 // indirect github.com/ipfs/go-ipfs-cmds v0.13.0 // indirect github.com/ipfs/go-ipfs-util v0.0.3 // indirect - github.com/ipfs/go-ipld-cbor v0.1.0 // indirect + github.com/ipfs/go-ipld-cbor v0.2.0 // indirect github.com/ipfs/go-ipld-format v0.6.0 // indirect github.com/ipfs/go-ipld-legacy v0.2.1 // indirect github.com/ipfs/go-log v1.0.5 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/ipfs/go-metrics-interface v0.0.1 // indirect github.com/ipfs/go-unixfsnode v1.9.1 // indirect - github.com/ipld/go-car/v2 v2.13.1 // indirect + github.com/ipld/go-car/v2 v2.14.2 // indirect github.com/ipld/go-codec-dagpb v1.6.0 // indirect github.com/ipld/go-ipld-prime v0.21.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect @@ -130,10 +130,10 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-cidranger v1.1.0 // indirect - github.com/libp2p/go-libp2p v0.36.3 // indirect + github.com/libp2p/go-libp2p v0.36.5 // indirect github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect github.com/libp2p/go-libp2p-kad-dht v0.26.1 // indirect - github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect + github.com/libp2p/go-libp2p-kbucket v0.6.4 // indirect github.com/libp2p/go-libp2p-record v0.2.0 // indirect github.com/libp2p/go-libp2p-routing-helpers v0.7.4 // indirect github.com/libp2p/go-msgio v0.3.0 // indirect @@ -153,7 +153,7 @@ require ( github.com/multiformats/go-base32 v0.1.0 // indirect github.com/multiformats/go-base36 v0.2.0 // indirect github.com/multiformats/go-multiaddr v0.13.0 // indirect - github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect + github.com/multiformats/go-multiaddr-dns v0.4.0 // indirect github.com/multiformats/go-multibase v0.2.0 // indirect github.com/multiformats/go-multicodec v0.9.0 // indirect github.com/multiformats/go-multihash v0.2.3 // indirect @@ -167,7 +167,7 @@ require ( github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/polydawn/refmt v0.89.0 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.4 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect @@ -220,11 +220,11 @@ require ( golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/tools v0.23.0 // indirect - golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect + golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.3.0 // indirect diff --git a/go.sum b/go.sum index f6ddceb8..9d7b7c7c 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,6 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/consensys/bavard v0.1.17 h1:53CdY/g35YSH9oRoa/b29tZinaiOEJYBmf9vydozPpE= -github.com/consensys/bavard v0.1.17/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/bavard v0.1.22 h1:Uw2CGvbXSZWhqK59X0VG/zOjpTFuOMcPLStrp1ihI0A= github.com/consensys/bavard v0.1.22/go.mod h1:k/zVjHHC4B+PQy1Pg7fgvG3ALicQw540Crag8qx+dZs= github.com/consensys/gnark-crypto v0.14.0 h1:DDBdl4HaBtdQsq/wfMwJvZNE80sHidrK3Nfrefatm0E= @@ -182,10 +180,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/c-kzg-4844 v1.0.3 h1:IEnbOHwjixW2cTvKRUlAAUOeleV7nNM/umJR+qy4WDs= github.com/ethereum/c-kzg-4844 v1.0.3/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.14.9 h1:J7iwXDrtUyE9FUjUYbd4c9tyzwMh6dTJsKzo9i6SrwA= -github.com/ethereum/go-ethereum v1.14.9/go.mod h1:QeW+MtTpRdBEm2pUFoonByee8zfHv7kGp0wK0odvU1I= -github.com/ethereum/go-ethereum v1.14.10 h1:kC24WjYeRjDy86LVo6MfF5Xs7nnUu+XG4AjaYIaZYko= -github.com/ethereum/go-ethereum v1.14.10/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/ethereum/go-ethereum v1.14.11 h1:8nFDCUUE67rPc6AKxFj7JKaOa2W/W1Rse3oS6LvvxEY= github.com/ethereum/go-ethereum v1.14.11/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A= @@ -423,8 +417,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI= github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0= -github.com/ipfs/boxo v0.23.0 h1:dY1PpcvPJ//VuUQ1TUd5TZvmaGuzxJ8dOP6mXaw+ke8= -github.com/ipfs/boxo v0.23.0/go.mod h1:ulu5I6avTmgGmvjuCaBRKwsaOOKjBfQw1EiOOQp8M6E= +github.com/ipfs/boxo v0.24.0 h1:D9gTU3QdxyjPMlJ6QfqhHTG3TIJPplKzjXLO2J30h9U= +github.com/ipfs/boxo v0.24.0/go.mod h1:iP7xUPpHq2QAmVAjwtQvsNBTxTwLpFuy6ZpiRFwmzDA= github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA= github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU= github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs= @@ -448,6 +442,8 @@ github.com/ipfs/go-ds-leveldb v0.5.0 h1:s++MEBbD3ZKc9/8/njrn4flZLnCuY9I79v94gBUN github.com/ipfs/go-ds-leveldb v0.5.0/go.mod h1:d3XG9RUDzQ6V4SHi8+Xgj9j1XuEk1z82lquxrVbml/Q= github.com/ipfs/go-ds-measure v0.2.0 h1:sG4goQe0KDTccHMyT45CY1XyUbxe5VwTKpg2LjApYyQ= github.com/ipfs/go-ds-measure v0.2.0/go.mod h1:SEUD/rE2PwRa4IQEC5FuNAmjJCyYObZr9UvVh8V3JxE= +github.com/ipfs/go-ds-pebble v0.4.0 h1:88lgFAs2ck8jCQ8lMYRBtksEg18r9BlvTxIMnNJkZaQ= +github.com/ipfs/go-ds-pebble v0.4.0/go.mod h1:ZyYU+weIni+4NG/Yjva+cPkU3ghlsU1HA2R/VLHJ9sM= github.com/ipfs/go-fs-lock v0.0.7 h1:6BR3dajORFrFTkb5EpCUFIAypsoxpGpDSVUdFwzgL9U= github.com/ipfs/go-fs-lock v0.0.7/go.mod h1:Js8ka+FNYmgQRLrRXzU3CB/+Csr1BwrRilEcvYrHhhc= github.com/ipfs/go-ipfs-blockstore v1.3.1 h1:cEI9ci7V0sRNivqaOr0elDsamxXFxJMMMy7PTTDQNsQ= @@ -470,8 +466,8 @@ github.com/ipfs/go-ipfs-redirects-file v0.1.1/go.mod h1:tAwRjCV0RjLTjH8DR/AU7VYv github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= github.com/ipfs/go-ipfs-util v0.0.3 h1:2RFdGez6bu2ZlZdI+rWfIdbQb1KudQp3VGwPtdNCmE0= github.com/ipfs/go-ipfs-util v0.0.3/go.mod h1:LHzG1a0Ig4G+iZ26UUOMjHd+lfM84LZCrn17xAKWBvs= -github.com/ipfs/go-ipld-cbor v0.1.0 h1:dx0nS0kILVivGhfWuB6dUpMa/LAwElHPw1yOGYopoYs= -github.com/ipfs/go-ipld-cbor v0.1.0/go.mod h1:U2aYlmVrJr2wsUBU67K4KgepApSZddGRDWBYR0H4sCk= +github.com/ipfs/go-ipld-cbor v0.2.0 h1:VHIW3HVIjcMd8m4ZLZbrYpwjzqlVUfjLM7oK4T5/YF0= +github.com/ipfs/go-ipld-cbor v0.2.0/go.mod h1:Cp8T7w1NKcu4AQJLqK0tWpd1nkgTxEVB5C6kVpLW6/0= github.com/ipfs/go-ipld-format v0.6.0 h1:VEJlA2kQ3LqFSIm5Vu6eIlSxD/Ze90xtc4Meten1F5U= github.com/ipfs/go-ipld-format v0.6.0/go.mod h1:g4QVMTn3marU3qXchwjpKPKgJv+zF+OlaKMyhJ4LHPg= github.com/ipfs/go-ipld-git v0.1.1 h1:TWGnZjS0htmEmlMFEkA3ogrNCqWjIxwr16x1OsdhG+Y= @@ -498,12 +494,12 @@ github.com/ipfs/go-unixfsnode v1.9.1 h1:2cdSIDQCt7emNhlyUqUFQnKo2XvecARoIcurIKFj github.com/ipfs/go-unixfsnode v1.9.1/go.mod h1:u8WxhmXzyrq3xfSYkhfx+uI+n91O+0L7KFjq3TS7d6g= github.com/ipfs/go-verifcid v0.0.3 h1:gmRKccqhWDocCRkC+a59g5QW7uJw5bpX9HWBevXa0zs= github.com/ipfs/go-verifcid v0.0.3/go.mod h1:gcCtGniVzelKrbk9ooUSX/pM3xlH73fZZJDzQJRvOUw= -github.com/ipfs/kubo v0.30.0 h1:JX4z5Y4BpY7d2GWxCk+ZchRMRLLHC+h39Dy+b0atj84= -github.com/ipfs/kubo v0.30.0/go.mod h1:7VltOZtM2eUhhwSyw7e+gBEtnjGNbOAZQHOHSCAt7nI= +github.com/ipfs/kubo v0.31.0 h1:as8MrXyYN0G6YfcipeTmiJaiUNvJLlAsgQ/KIwo8SEY= +github.com/ipfs/kubo v0.31.0/go.mod h1:7rsi1jvjqjFVxccKAtNf9c/lwk2GbR1p9PaKwQ/HoyA= github.com/ipld/go-car v0.6.2 h1:Hlnl3Awgnq8icK+ze3iRghk805lu8YNq3wlREDTF2qc= github.com/ipld/go-car v0.6.2/go.mod h1:oEGXdwp6bmxJCZ+rARSkDliTeYnVzv3++eXajZ+Bmr8= -github.com/ipld/go-car/v2 v2.13.1 h1:KnlrKvEPEzr5IZHKTXLAEub+tPrzeAFQVRlSQvuxBO4= -github.com/ipld/go-car/v2 v2.13.1/go.mod h1:QkdjjFNGit2GIkpQ953KBwowuoukoM75nP/JI1iDJdo= +github.com/ipld/go-car/v2 v2.14.2 h1:9ERr7KXpCC7If0rChZLhYDlyr6Bes6yRKPJnCO3hdHY= +github.com/ipld/go-car/v2 v2.14.2/go.mod h1:0iPB/825lTZLU2zPK5bVTk/R3V2612E1VI279OGSXWA= github.com/ipld/go-codec-dagpb v1.6.0 h1:9nYazfyu9B1p3NAgfVdpRco3Fs2nFC72DqVsMj6rOcc= github.com/ipld/go-codec-dagpb v1.6.0/go.mod h1:ANzFhfP2uMJxRBr8CE+WQWs5UsNa0pYtmKZ+agnUw9s= github.com/ipld/go-ipld-prime v0.21.0 h1:n4JmcpOlPDIxBcY037SVfpd1G+Sj1nKZah0m6QH9C2E= @@ -572,14 +568,14 @@ github.com/libp2p/go-doh-resolver v0.4.0 h1:gUBa1f1XsPwtpE1du0O+nnZCUqtG7oYi7Bb+ github.com/libp2p/go-doh-resolver v0.4.0/go.mod h1:v1/jwsFusgsWIGX/c6vCRrnJ60x7bhTiq/fs2qt0cAg= github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM= github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro= -github.com/libp2p/go-libp2p v0.36.3 h1:NHz30+G7D8Y8YmznrVZZla0ofVANrvBl2c+oARfMeDQ= -github.com/libp2p/go-libp2p v0.36.3/go.mod h1:4Y5vFyCUiJuluEPmpnKYf6WFx5ViKPUYs/ixe9ANFZ8= +github.com/libp2p/go-libp2p v0.36.5 h1:DoABsaHO0VXwH6pwCs2F6XKAXWYjFMO4HFBoVxTnF9g= +github.com/libp2p/go-libp2p v0.36.5/go.mod h1:CpszAtXxHYOcyvB7K8rSHgnNlh21eKjYbEfLoMerbEI= github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94= github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8= github.com/libp2p/go-libp2p-kad-dht v0.26.1 h1:AazV3LCImYVkDUGAHx5lIEgZ9iUI2QQKH5GMRQU8uEA= github.com/libp2p/go-libp2p-kad-dht v0.26.1/go.mod h1:mqRUGJ/+7ziQ3XknU2kKHfsbbgb9xL65DXjPOJwmZF8= -github.com/libp2p/go-libp2p-kbucket v0.6.3 h1:p507271wWzpy2f1XxPzCQG9NiN6R6lHL9GiSErbQQo0= -github.com/libp2p/go-libp2p-kbucket v0.6.3/go.mod h1:RCseT7AH6eJWxxk2ol03xtP9pEHetYSPXOaJnOiD8i0= +github.com/libp2p/go-libp2p-kbucket v0.6.4 h1:OjfiYxU42TKQSB8t8WYd8MKhYhMJeO2If+NiuKfb6iQ= +github.com/libp2p/go-libp2p-kbucket v0.6.4/go.mod h1:jp6w82sczYaBsAypt5ayACcRJi0lgsba7o4TzJKEfWA= github.com/libp2p/go-libp2p-pubsub v0.11.0 h1:+JvS8Kty0OiyUiN0i8H5JbaCgjnJTRnTHe4rU88dLFc= github.com/libp2p/go-libp2p-pubsub v0.11.0/go.mod h1:QEb+hEV9WL9wCiUAnpY29FZR6W3zK8qYlaml8R4q6gQ= github.com/libp2p/go-libp2p-pubsub-router v0.6.0 h1:D30iKdlqDt5ZmLEYhHELCMRj8b4sFAqrUcshIUvVP/s= @@ -628,7 +624,6 @@ github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs= github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ= github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc= @@ -663,7 +658,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= @@ -671,24 +665,21 @@ github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aG github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= -github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= github.com/multiformats/go-multiaddr v0.13.0 h1:BCBzs61E3AGHcYYTv8dqRH43ZfyrqM8RXVPT8t13tLQ= github.com/multiformats/go-multiaddr v0.13.0/go.mod h1:sBXrNzucqkFJhvKOiwwLyqamGa/P5EIXNPLovyhQCII= -github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A= -github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk= +github.com/multiformats/go-multiaddr-dns v0.4.0 h1:P76EJ3qzBXpUXZ3twdCDx/kvagMsNo0LMFXpyms/zgU= +github.com/multiformats/go-multiaddr-dns v0.4.0/go.mod h1:7hfthtB4E4pQwirrz+J0CcDUfbWzTqEzVyYKKIKpgkc= github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E= github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo= github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg= github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k= -github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U= github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM= github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf/QGkvOGQAyiE= github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA= -github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= @@ -802,8 +793,8 @@ github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1068,8 +1059,6 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1144,8 +1133,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1201,7 +1190,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1219,8 +1207,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1234,16 +1220,14 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= -golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1285,8 +1269,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= -golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY= +golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= @@ -1324,10 +1308,10 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= -google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade h1:WxZOF2yayUHpHSbUE6NMzumUzBxYc3YGwo0YHnbzsJY= -google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1345,8 +1329,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1357,8 +1341,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/handler/grpc.go b/handler/grpc.go index daaaaa34..57e65e1a 100644 --- a/handler/grpc.go +++ b/handler/grpc.go @@ -23,9 +23,9 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/dynamicpb" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/codec" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/codec" + "github.com/singnet/snet-daemon/v5/config" ) var grpcDesc = &grpc.StreamDesc{ServerStreams: true, ClientStreams: true} diff --git a/handler/httphandler/http.go b/handler/httphandler/http.go index 645fa389..00c2b849 100644 --- a/handler/httphandler/http.go +++ b/handler/httphandler/http.go @@ -1,14 +1,14 @@ package httphandler import ( - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/ratelimit" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/ratelimit" "golang.org/x/time/rate" "io" "log" "net/http" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" ) type httpHandler struct { diff --git a/handler/interceptors.go b/handler/interceptors.go index 6956ca09..7de47be7 100644 --- a/handler/interceptors.go +++ b/handler/interceptors.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/configuration_service" - "github.com/singnet/snet-daemon/metrics" - "github.com/singnet/snet-daemon/ratelimit" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/configuration_service" + "github.com/singnet/snet-daemon/v5/metrics" + "github.com/singnet/snet-daemon/v5/ratelimit" "go.uber.org/zap" "math/big" diff --git a/handler/interceptors_test.go b/handler/interceptors_test.go index 54ea93d5..d14f081c 100644 --- a/handler/interceptors_test.go +++ b/handler/interceptors_test.go @@ -3,7 +3,7 @@ package handler import ( "context" "errors" - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" "math/big" "testing" diff --git a/handler/intergrationtests/grpc_to_grpc_test.go b/handler/intergrationtests/grpc_to_grpc_test.go index 71f110a3..a75f3786 100644 --- a/handler/intergrationtests/grpc_to_grpc_test.go +++ b/handler/intergrationtests/grpc_to_grpc_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/ipfsutils/ipfsutils.go b/ipfsutils/ipfsutils.go index 87348316..aadb95d5 100644 --- a/ipfsutils/ipfsutils.go +++ b/ipfsutils/ipfsutils.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/ipfs/go-cid" "github.com/ipfs/kubo/client/rpc" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" "io" diff --git a/ipfsutils/ipfsutils_test.go b/ipfsutils/ipfsutils_test.go index abd1f406..483fd6b4 100644 --- a/ipfsutils/ipfsutils_test.go +++ b/ipfsutils/ipfsutils_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - _ "github.com/singnet/snet-daemon/config" + _ "github.com/singnet/snet-daemon/v5/config" ) type IpfsUtilsTestSuite struct { diff --git a/license_server/license_service.go b/license_server/license_service.go index 2e156032..b8dce2ae 100644 --- a/license_server/license_service.go +++ b/license_server/license_service.go @@ -2,8 +2,8 @@ package license_server import ( "fmt" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "strings" ) diff --git a/license_server/license_service_test.go b/license_server/license_service_test.go index e5b2bcd7..4027b401 100644 --- a/license_server/license_service_test.go +++ b/license_server/license_service_test.go @@ -1,8 +1,8 @@ package license_server import ( - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "math/big" diff --git a/license_server/license_storage.go b/license_server/license_storage.go index 3ece6801..3b7de59a 100644 --- a/license_server/license_storage.go +++ b/license_server/license_storage.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/gob" "fmt" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "math/big" "reflect" "strings" diff --git a/logger/hook.go b/logger/hook.go index c23f4914..02b66f3e 100644 --- a/logger/hook.go +++ b/logger/hook.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/viper" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/logger/hook_test.go b/logger/hook_test.go index e6e34b81..d5f8ac75 100644 --- a/logger/hook_test.go +++ b/logger/hook_test.go @@ -2,7 +2,7 @@ package logger import ( "errors" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/viper" "github.com/stretchr/testify/assert" "go.uber.org/zap/zapcore" diff --git a/logger/logger.go b/logger/logger.go index 9274a7e0..f1aa8015 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" "go.uber.org/zap/zapcore" "gopkg.in/natefinch/lumberjack.v2" diff --git a/logger/logger_test.go b/logger/logger_test.go index 78c44b04..4728d321 100644 --- a/logger/logger_test.go +++ b/logger/logger_test.go @@ -12,7 +12,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" ) const defaultLogConfigJSON = ` diff --git a/metrics/clients.go b/metrics/clients.go index 2f3de8c9..e7ce9f9f 100644 --- a/metrics/clients.go +++ b/metrics/clients.go @@ -14,7 +14,7 @@ import ( "net/http" "time" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/metrics/clients_test.go b/metrics/clients_test.go index f02d2715..ebe36a2e 100644 --- a/metrics/clients_test.go +++ b/metrics/clients_test.go @@ -69,7 +69,10 @@ func StartMockGrpcService() { grpcServer := grpc.NewServer() pb.RegisterHealthServer(grpcServer, &clientImplHeartBeat{}) ch <- 0 - grpcServer.Serve(lis) + err = grpcServer.Serve(lis) + if err != nil { + panic(err) + } }() _ = <-ch } @@ -80,10 +83,10 @@ func (suite *ClientTestSuite) Test_callgRPCServiceHeartbeat() { serviceURL := "localhost" + testPort heartbeat, err := callgRPCServiceHeartbeat(serviceURL) - assert.False(suite.T(), err != nil) + assert.Equal(suite.T(), nil, err) assert.NotEqual(suite.T(), `{}`, string(heartbeat), "Service Heartbeat must not be empty.") - assert.Equal(suite.T(), heartbeat.String(), pb.HealthCheckResponse_SERVING.String()) + assert.Equal(suite.T(), pb.HealthCheckResponse_SERVING.String(), heartbeat.String()) serviceURL = "localhost:26000" heartbeat, err = callgRPCServiceHeartbeat(serviceURL) diff --git a/metrics/heartbeat.go b/metrics/heartbeat.go index fbbbbaef..1aae0bee 100644 --- a/metrics/heartbeat.go +++ b/metrics/heartbeat.go @@ -12,7 +12,7 @@ import ( "errors" "fmt" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" "net/http" diff --git a/metrics/notifications.go b/metrics/notifications.go index 5b294eef..6e94d939 100644 --- a/metrics/notifications.go +++ b/metrics/notifications.go @@ -8,7 +8,7 @@ package metrics import ( "errors" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" ) diff --git a/metrics/notifications_test.go b/metrics/notifications_test.go index ec18dfe0..8ea15aa8 100644 --- a/metrics/notifications_test.go +++ b/metrics/notifications_test.go @@ -7,7 +7,7 @@ package metrics import ( "errors" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "testing" "time" diff --git a/metrics/register.go b/metrics/register.go index 1b998ffd..7d75aad2 100644 --- a/metrics/register.go +++ b/metrics/register.go @@ -9,7 +9,7 @@ import ( "crypto/sha256" "encoding/hex" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "go.uber.org/zap" ) diff --git a/metrics/request_stats.go b/metrics/request_stats.go index d9eff875..9093f286 100644 --- a/metrics/request_stats.go +++ b/metrics/request_stats.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "google.golang.org/grpc/metadata" "strconv" ) diff --git a/metrics/request_stats_test.go b/metrics/request_stats_test.go index f7dddaaf..2369a5cb 100644 --- a/metrics/request_stats_test.go +++ b/metrics/request_stats_test.go @@ -2,7 +2,7 @@ package metrics import ( "github.com/magiconair/properties/assert" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "google.golang.org/grpc/metadata" "testing" "time" diff --git a/metrics/response_stats.go b/metrics/response_stats.go index 72be4b09..fcc04313 100644 --- a/metrics/response_stats.go +++ b/metrics/response_stats.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/metrics/response_stats_test.go b/metrics/response_stats_test.go index f62974ea..9d4d8173 100644 --- a/metrics/response_stats_test.go +++ b/metrics/response_stats_test.go @@ -3,7 +3,7 @@ package metrics import ( "fmt" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "testing" "time" diff --git a/metrics/utils.go b/metrics/utils.go index 2ca2cff3..3490b1b7 100644 --- a/metrics/utils.go +++ b/metrics/utils.go @@ -11,8 +11,8 @@ import ( "net/http" "time" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/config" "github.com/OneOfOne/go-utils/memory" "github.com/ethereum/go-ethereum/common" diff --git a/metrics/utils_test.go b/metrics/utils_test.go index ce46f941..ec6ed280 100644 --- a/metrics/utils_test.go +++ b/metrics/utils_test.go @@ -2,8 +2,8 @@ package metrics import ( "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/authutils" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/authutils" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "go/types" "google.golang.org/grpc/metadata" diff --git a/pricing/dynamic_method_pricing.go b/pricing/dynamic_method_pricing.go index 8e7cff80..d5a3c0c2 100644 --- a/pricing/dynamic_method_pricing.go +++ b/pricing/dynamic_method_pricing.go @@ -7,10 +7,10 @@ import ( "math/big" "net/url" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/codec" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/codec" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" "go.uber.org/zap" "golang.org/x/net/context" diff --git a/pricing/fixed_method_pricing.go b/pricing/fixed_method_pricing.go index 4000c03f..a407c7ad 100644 --- a/pricing/fixed_method_pricing.go +++ b/pricing/fixed_method_pricing.go @@ -2,8 +2,8 @@ package pricing import ( "fmt" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/handler" "math/big" ) diff --git a/pricing/fixed_method_pricing_test.go b/pricing/fixed_method_pricing_test.go index aca7daac..29152f0b 100644 --- a/pricing/fixed_method_pricing_test.go +++ b/pricing/fixed_method_pricing_test.go @@ -1,13 +1,13 @@ package pricing import ( - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" "google.golang.org/grpc" "math/big" "testing" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/handler" "github.com/stretchr/testify/assert" ) diff --git a/pricing/fixed_pricing.go b/pricing/fixed_pricing.go index f83c5683..52b242d4 100644 --- a/pricing/fixed_pricing.go +++ b/pricing/fixed_pricing.go @@ -1,7 +1,7 @@ package pricing import ( - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/handler" "math/big" ) diff --git a/pricing/fixed_pricing_test.go b/pricing/fixed_pricing_test.go index 6671c2aa..eeb9fb92 100644 --- a/pricing/fixed_pricing_test.go +++ b/pricing/fixed_pricing_test.go @@ -1,12 +1,12 @@ package pricing import ( - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" "github.com/stretchr/testify/assert" "math/big" "testing" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/handler" ) var testJsonDataFixedPrice = "{ \"version\": 1, \"display_name\": \"Example1\", \"encoding\": \"grpc\", \"service_type\": \"grpc\", \"payment_expiration_threshold\": 40320, \"model_ipfs_hash\": \"Qmdiq8Hu6dYiwp712GtnbBxagyfYyvUY1HYqkH7iN76UCc\", \"mpe_address\": \"0x7E6366Fbe3bdfCE3C906667911FC5237Cc96BD08\", \"groups\": [ { \"endpoints\": [\"http://34.344.33.1:2379\",\"http://34.344.33.1:2389\"], \"group_id\": \"88ybRIg2wAx55mqVsA6sB4S7WxPQHNKqa4BPu/bhj+U=\",\"group_name\": \"default_group\", \"pricing\": [ { \"price_model\": \"fixed_price\", \"default\":true, \"price_in_cogs\": 2 }, { \"package_name\": \"example_service\", \"price_model\": \"fixed_price_per_method\", \"details\": [ { \"service_name\": \"Calculator\", \"method_pricing\": [ { \"method_name\": \"add\", \"price_in_cogs\": 2 }, { \"method_name\": \"sub\", \"price_in_cogs\": 1 }, { \"method_name\": \"div\", \"price_in_cogs\": 2 }, { \"method_name\": \"mul\", \"price_in_cogs\": 3 } ] }, { \"service_name\": \"Calculator2\", \"method_pricing\": [ { \"method_name\": \"add\", \"price_in_cogs\": 2 }, { \"method_name\": \"sub\", \"price_in_cogs\": 1 }, { \"method_name\": \"div\", \"price_in_cogs\": 3 }, { \"method_name\": \"mul\", \"price_in_cogs\": 2 } ] } ] }] }, { \"endpoints\": [\"http://97.344.33.1:2379\",\"http://67.344.33.1:2389\"], \"group_name\": \"99ybRIg2wAx55mqVsA6sB4S7WxPQHNKqa4BPu/bhj+U=\", \"group_id\": \"99ybRIg2wAx55mqVsA6sB4S7WxPQHNKqa4BPu/bhj+U=\", \"pricing\": [ { \"package_name\": \"example_service\", \"price_model\": \"fixed_price_per_method\", \"details\": [ { \"service_name\": \"Calculator\", \"method_pricing\": [ { \"method_name\": \"add\", \"price_in_cogs\": 2 }, { \"method_name\": \"sub\", \"price_in_cogs\": 1 }, { \"method_name\": \"div\", \"price_in_cogs\": 2 }, { \"method_name\": \"mul\", \"price_in_cogs\": 3 } ] }, { \"service_name\": \"Calculator2\", \"method_pricing\": [ { \"method_name\": \"add\", \"price_in_cogs\": 2 }, { \"method_name\": \"sub\", \"price_in_cogs\": 1 }, { \"method_name\": \"div\", \"price_in_cogs\": 3 }, { \"method_name\": \"mul\", \"price_in_cogs\": 2 } ] } ] }] } ] } " diff --git a/pricing/price_type.go b/pricing/price_type.go index 32174b9f..2a2c6772 100644 --- a/pricing/price_type.go +++ b/pricing/price_type.go @@ -1,7 +1,7 @@ package pricing import ( - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/handler" "math/big" ) diff --git a/pricing/pricing_strategy.go b/pricing/pricing_strategy.go index ec593b32..d90e61c5 100644 --- a/pricing/pricing_strategy.go +++ b/pricing/pricing_strategy.go @@ -5,9 +5,9 @@ import ( "math/big" "strings" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/handler" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/handler" "go.uber.org/zap" ) diff --git a/pricing/pricing_strategy_test.go b/pricing/pricing_strategy_test.go index a32fdc43..21050fdd 100644 --- a/pricing/pricing_strategy_test.go +++ b/pricing/pricing_strategy_test.go @@ -1,7 +1,7 @@ package pricing import ( - "github.com/singnet/snet-daemon/blockchain" + "github.com/singnet/snet-daemon/v5/blockchain" "github.com/stretchr/testify/assert" "math/big" "testing" diff --git a/ratelimit/rateLimit.go b/ratelimit/rateLimit.go index dac3cf0f..5d629121 100644 --- a/ratelimit/rateLimit.go +++ b/ratelimit/rateLimit.go @@ -1,7 +1,7 @@ package ratelimit import ( - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "golang.org/x/time/rate" "math" "strconv" diff --git a/scripts/build b/scripts/build index 6269370b..03dbb237 100755 --- a/scripts/build +++ b/scripts/build @@ -1,7 +1,7 @@ #!/bin/bash # for debug: -# set -ex +#set -ex PARENT_PATH="$(dirname "$(cd "$("dirname" "$0")"; pwd -P)")" diff --git a/scripts/build_all_platforms b/scripts/build_all_platforms index 9a47cc66..6e321379 100755 --- a/scripts/build_all_platforms +++ b/scripts/build_all_platforms @@ -1,8 +1,12 @@ #!/bin/bash +#set -ex +PARENT_PATH="$(dirname "$(cd "$("dirname" "$0")"; pwd -P)")" +pushd "$PARENT_PATH" + if [ $# -lt 1 ] then - echo "arguments expected are of the form for the build script , as an example: '/scripts/build-all v.5.1.1'" + echo "arguments expected are of the form for the build script , as an example: '/scripts/build-all v5.1.6'" exit 1 fi diff --git a/snetd/cmd/channel.go b/snetd/cmd/channel.go index e28e9e82..b80e54b1 100644 --- a/snetd/cmd/channel.go +++ b/snetd/cmd/channel.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - "github.com/singnet/snet-daemon/escrow" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/escrow" + "github.com/singnet/snet-daemon/v5/storage" "github.com/spf13/cobra" ) diff --git a/snetd/cmd/components.go b/snetd/cmd/components.go index 393d91bc..8af15800 100644 --- a/snetd/cmd/components.go +++ b/snetd/cmd/components.go @@ -9,17 +9,17 @@ import ( "os" "strings" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/configuration_service" - "github.com/singnet/snet-daemon/escrow" - "github.com/singnet/snet-daemon/etcddb" - "github.com/singnet/snet-daemon/handler" - "github.com/singnet/snet-daemon/metrics" - "github.com/singnet/snet-daemon/pricing" - "github.com/singnet/snet-daemon/storage" - "github.com/singnet/snet-daemon/token" - "github.com/singnet/snet-daemon/training" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/configuration_service" + "github.com/singnet/snet-daemon/v5/escrow" + "github.com/singnet/snet-daemon/v5/etcddb" + "github.com/singnet/snet-daemon/v5/handler" + "github.com/singnet/snet-daemon/v5/metrics" + "github.com/singnet/snet-daemon/v5/pricing" + "github.com/singnet/snet-daemon/v5/storage" + "github.com/singnet/snet-daemon/v5/token" + "github.com/singnet/snet-daemon/v5/training" "github.com/ethereum/go-ethereum/crypto" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" diff --git a/snetd/cmd/components_test.go b/snetd/cmd/components_test.go index fbf08c9a..3bfa2927 100644 --- a/snetd/cmd/components_test.go +++ b/snetd/cmd/components_test.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" "testing" ) diff --git a/snetd/cmd/flags.go b/snetd/cmd/flags.go index 5d7dd0de..0c1138c7 100644 --- a/snetd/cmd/flags.go +++ b/snetd/cmd/flags.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/snetd/cmd/free_call_users.go b/snetd/cmd/free_call_users.go index 093c01b6..d788ba26 100644 --- a/snetd/cmd/free_call_users.go +++ b/snetd/cmd/free_call_users.go @@ -2,10 +2,10 @@ package cmd import ( "fmt" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/escrow" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/escrow" + "github.com/singnet/snet-daemon/v5/storage" "github.com/spf13/cobra" ) diff --git a/snetd/cmd/init.go b/snetd/cmd/init.go index ef38eb3e..9541b9b2 100644 --- a/snetd/cmd/init.go +++ b/snetd/cmd/init.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/cobra" ) diff --git a/snetd/cmd/list_channels.go b/snetd/cmd/list_channels.go index 3effd793..8ecbc0c2 100644 --- a/snetd/cmd/list_channels.go +++ b/snetd/cmd/list_channels.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/singnet/snet-daemon/escrow" + "github.com/singnet/snet-daemon/v5/escrow" ) // ListChannelsCmd shows list of channels from shared storage diff --git a/snetd/cmd/list_claims.go b/snetd/cmd/list_claims.go index 3cad240d..9bfe740d 100644 --- a/snetd/cmd/list_claims.go +++ b/snetd/cmd/list_claims.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/singnet/snet-daemon/escrow" + "github.com/singnet/snet-daemon/v5/escrow" ) // ListClaimsCmd shows list of channels from shared storage diff --git a/snetd/cmd/serve.go b/snetd/cmd/serve.go index 31dc1720..36808ab0 100644 --- a/snetd/cmd/serve.go +++ b/snetd/cmd/serve.go @@ -11,16 +11,16 @@ import ( "sync" "syscall" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/configuration_service" - contractListener "github.com/singnet/snet-daemon/contract_event_listener" - "github.com/singnet/snet-daemon/escrow" - "github.com/singnet/snet-daemon/handler" - "github.com/singnet/snet-daemon/handler/httphandler" - "github.com/singnet/snet-daemon/logger" - "github.com/singnet/snet-daemon/metrics" - "github.com/singnet/snet-daemon/training" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/configuration_service" + contractListener "github.com/singnet/snet-daemon/v5/contract_event_listener" + "github.com/singnet/snet-daemon/v5/escrow" + "github.com/singnet/snet-daemon/v5/handler" + "github.com/singnet/snet-daemon/v5/handler/httphandler" + "github.com/singnet/snet-daemon/v5/logger" + "github.com/singnet/snet-daemon/v5/metrics" + "github.com/singnet/snet-daemon/v5/training" "github.com/gorilla/handlers" "github.com/improbable-eng/grpc-web/go/grpcweb" diff --git a/snetd/cmd/serve_test.go b/snetd/cmd/serve_test.go index 56891b59..537e2d3c 100644 --- a/snetd/cmd/serve_test.go +++ b/snetd/cmd/serve_test.go @@ -3,7 +3,7 @@ package cmd import ( "testing" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" ) diff --git a/snetd/cmd/version_details.go b/snetd/cmd/version_details.go index 3ab4b8f9..3826497b 100644 --- a/snetd/cmd/version_details.go +++ b/snetd/cmd/version_details.go @@ -2,7 +2,7 @@ package cmd import ( "fmt" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/spf13/cobra" "os" ) diff --git a/snetd/main.go b/snetd/main.go index 8183fcfb..39881300 100644 --- a/snetd/main.go +++ b/snetd/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/singnet/snet-daemon/snetd/cmd" + "github.com/singnet/snet-daemon/v5/snetd/cmd" "go.uber.org/zap" ) diff --git a/token/jwttoken.go b/token/jwttoken.go index 5a77d0af..3cb1a5bd 100644 --- a/token/jwttoken.go +++ b/token/jwttoken.go @@ -3,8 +3,8 @@ package token import ( "fmt" "github.com/golang-jwt/jwt/v5" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" "strings" "time" ) diff --git a/token/jwttoken_test.go b/token/jwttoken_test.go index a6c8f670..24962aa6 100644 --- a/token/jwttoken_test.go +++ b/token/jwttoken_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/singnet/snet-daemon/config" + "github.com/singnet/snet-daemon/v5/config" "github.com/stretchr/testify/assert" ) diff --git a/training/service.go b/training/service.go index 028dbbf9..29a83e07 100644 --- a/training/service.go +++ b/training/service.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/escrow" - "github.com/singnet/snet-daemon/utils" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/escrow" + "github.com/singnet/snet-daemon/v5/utils" "github.com/ethereum/go-ethereum/common/math" "go.uber.org/zap" diff --git a/training/service_test.go b/training/service_test.go index 520e5515..00738f63 100644 --- a/training/service_test.go +++ b/training/service_test.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/crypto" - "github.com/singnet/snet-daemon/blockchain" - "github.com/singnet/snet-daemon/config" - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/blockchain" + "github.com/singnet/snet-daemon/v5/config" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/training/storage.go b/training/storage.go index 18cad925..1a0104d9 100644 --- a/training/storage.go +++ b/training/storage.go @@ -2,8 +2,8 @@ package training import ( "fmt" - "github.com/singnet/snet-daemon/storage" - "github.com/singnet/snet-daemon/utils" + "github.com/singnet/snet-daemon/v5/storage" + "github.com/singnet/snet-daemon/v5/utils" "reflect" ) diff --git a/training/storage_test.go b/training/storage_test.go index 21b928bf..c46862e2 100644 --- a/training/storage_test.go +++ b/training/storage_test.go @@ -1,7 +1,7 @@ package training import ( - "github.com/singnet/snet-daemon/storage" + "github.com/singnet/snet-daemon/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "testing" diff --git a/utils/common.go b/utils/common.go index 3352464a..ee325751 100644 --- a/utils/common.go +++ b/utils/common.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" - "github.com/singnet/snet-daemon/authutils" + "github.com/singnet/snet-daemon/v5/authutils" "go.uber.org/zap" )