From abd82aea820df6a4c38b79d5f3ba4974dfcfec59 Mon Sep 17 00:00:00 2001 From: Jakub Bujny Date: Thu, 21 Dec 2023 11:49:20 +0100 Subject: [PATCH 1/2] Update go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2817d2e6..e2339162 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/strangelove-ventures/horcrux +module github.com/strangelove-ventures/horcrux/v3 go 1.21 From ae0a5b203470a5f228ce8b40b34439f5d5c1fad2 Mon Sep 17 00:00:00 2001 From: jakubbujny Date: Thu, 21 Dec 2023 13:14:04 +0100 Subject: [PATCH 2/2] change package path --- Makefile | 6 +++--- client/address_test.go | 2 +- cmd/horcrux/cmd/address.go | 2 +- cmd/horcrux/cmd/config.go | 2 +- cmd/horcrux/cmd/leader_election.go | 8 ++++---- cmd/horcrux/cmd/migrate.go | 2 +- cmd/horcrux/cmd/migrate_test.go | 2 +- cmd/horcrux/cmd/root.go | 2 +- cmd/horcrux/cmd/shards.go | 2 +- cmd/horcrux/cmd/single_signer.go | 2 +- cmd/horcrux/cmd/start.go | 2 +- cmd/horcrux/cmd/state.go | 2 +- cmd/horcrux/cmd/state_test.go | 2 +- cmd/horcrux/cmd/threshold.go | 2 +- cmd/horcrux/main.go | 2 +- proto/strangelove/horcrux/cosigner.proto | 4 ++-- proto/strangelove/horcrux/remote_signer.proto | 2 +- signer/cond/cond_test.go | 2 +- signer/config.go | 2 +- signer/config_test.go | 2 +- signer/cosigner.go | 2 +- signer/cosigner_grpc_server.go | 2 +- signer/cosigner_health.go | 2 +- signer/hrs.go | 2 +- signer/multiresolver/multi_test.go | 6 +++--- signer/raft_store.go | 2 +- signer/remote_cosigner.go | 2 +- signer/remote_signer_grpc_server.go | 2 +- signer/services_test.go | 2 +- signer/sign_state.go | 2 +- signer/threshold_validator.go | 2 +- test/horcrux_test.go | 2 +- test/validator.go | 2 +- test/validator_single.go | 2 +- test/validator_threshold.go | 2 +- 35 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index ae352fb6..2340aae8 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ COMMIT := $(shell git log -1 --format='%H') all: install -LD_FLAGS = -X github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd.Version=$(VERSION) \ - -X github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd.Commit=$(COMMIT) +LD_FLAGS = -X github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd.Version=$(VERSION) \ + -X github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd.Commit=$(COMMIT) LD_FLAGS += $(LDFLAGS) LD_FLAGS := $(strip $(LD_FLAGS)) @@ -56,4 +56,4 @@ proto-lint: @$(protoImage) buf lint --error-format=json -.PHONY: all lint test race msan tools clean build \ No newline at end of file +.PHONY: all lint test race msan tools clean build diff --git a/client/address_test.go b/client/address_test.go index 18b2e20f..3296bba1 100644 --- a/client/address_test.go +++ b/client/address_test.go @@ -3,7 +3,7 @@ package client_test import ( "testing" - "github.com/strangelove-ventures/horcrux/client" + "github.com/strangelove-ventures/horcrux/v3/client" "github.com/stretchr/testify/require" ) diff --git a/cmd/horcrux/cmd/address.go b/cmd/horcrux/cmd/address.go index d0baf136..644d577a 100644 --- a/cmd/horcrux/cmd/address.go +++ b/cmd/horcrux/cmd/address.go @@ -10,7 +10,7 @@ import ( cometprivval "github.com/cometbft/cometbft/privval" "github.com/cosmos/cosmos-sdk/types/bech32" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" ) type AddressCmdOutput struct { diff --git a/cmd/horcrux/cmd/config.go b/cmd/horcrux/cmd/config.go index 047c04c5..a39b7315 100644 --- a/cmd/horcrux/cmd/config.go +++ b/cmd/horcrux/cmd/config.go @@ -5,7 +5,7 @@ import ( "os" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" ) const ( diff --git a/cmd/horcrux/cmd/leader_election.go b/cmd/horcrux/cmd/leader_election.go index c14b409e..9fb4dfd6 100644 --- a/cmd/horcrux/cmd/leader_election.go +++ b/cmd/horcrux/cmd/leader_election.go @@ -7,10 +7,10 @@ import ( grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/client" - "github.com/strangelove-ventures/horcrux/signer" - "github.com/strangelove-ventures/horcrux/signer/multiresolver" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/client" + "github.com/strangelove-ventures/horcrux/v3/signer" + "github.com/strangelove-ventures/horcrux/v3/signer/multiresolver" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/cmd/horcrux/cmd/migrate.go b/cmd/horcrux/cmd/migrate.go index af083e3a..51bfdc87 100644 --- a/cmd/horcrux/cmd/migrate.go +++ b/cmd/horcrux/cmd/migrate.go @@ -13,7 +13,7 @@ import ( cometcryptoencoding "github.com/cometbft/cometbft/crypto/encoding" cometprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" amino "github.com/tendermint/go-amino" "gopkg.in/yaml.v2" ) diff --git a/cmd/horcrux/cmd/migrate_test.go b/cmd/horcrux/cmd/migrate_test.go index 5aee2134..b356723d 100644 --- a/cmd/horcrux/cmd/migrate_test.go +++ b/cmd/horcrux/cmd/migrate_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd/testdata" + "github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd/testdata" "github.com/stretchr/testify/require" ) diff --git a/cmd/horcrux/cmd/root.go b/cmd/horcrux/cmd/root.go index ff506a7e..dd8e4ebc 100644 --- a/cmd/horcrux/cmd/root.go +++ b/cmd/horcrux/cmd/root.go @@ -8,7 +8,7 @@ import ( homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" "gopkg.in/yaml.v2" ) diff --git a/cmd/horcrux/cmd/shards.go b/cmd/horcrux/cmd/shards.go index 5dbcb95b..5af886d8 100644 --- a/cmd/horcrux/cmd/shards.go +++ b/cmd/horcrux/cmd/shards.go @@ -21,7 +21,7 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" ) func createCosignerDirectoryIfNecessary(out string, id int) (string, error) { diff --git a/cmd/horcrux/cmd/single_signer.go b/cmd/horcrux/cmd/single_signer.go index 18b4ba1e..0cd1edd9 100644 --- a/cmd/horcrux/cmd/single_signer.go +++ b/cmd/horcrux/cmd/single_signer.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" ) const ( diff --git a/cmd/horcrux/cmd/start.go b/cmd/horcrux/cmd/start.go index ef4fde1d..3633cce0 100644 --- a/cmd/horcrux/cmd/start.go +++ b/cmd/horcrux/cmd/start.go @@ -7,7 +7,7 @@ import ( cometlog "github.com/cometbft/cometbft/libs/log" "github.com/cometbft/cometbft/libs/service" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" ) func startCmd() *cobra.Command { diff --git a/cmd/horcrux/cmd/state.go b/cmd/horcrux/cmd/state.go index 146f7e49..63ee6a5e 100644 --- a/cmd/horcrux/cmd/state.go +++ b/cmd/horcrux/cmd/state.go @@ -11,7 +11,7 @@ import ( "time" "github.com/spf13/cobra" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" cometjson "github.com/cometbft/cometbft/libs/json" cometlog "github.com/cometbft/cometbft/libs/log" diff --git a/cmd/horcrux/cmd/state_test.go b/cmd/horcrux/cmd/state_test.go index baa74e89..e805e202 100644 --- a/cmd/horcrux/cmd/state_test.go +++ b/cmd/horcrux/cmd/state_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" "github.com/stretchr/testify/require" ) diff --git a/cmd/horcrux/cmd/threshold.go b/cmd/horcrux/cmd/threshold.go index c1e035be..e0a57863 100644 --- a/cmd/horcrux/cmd/threshold.go +++ b/cmd/horcrux/cmd/threshold.go @@ -9,7 +9,7 @@ import ( cometlog "github.com/cometbft/cometbft/libs/log" cometservice "github.com/cometbft/cometbft/libs/service" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" ) const maxWaitForSameBlockAttempts = 3 diff --git a/cmd/horcrux/main.go b/cmd/horcrux/main.go index a7ba661f..fe2b2a2f 100644 --- a/cmd/horcrux/main.go +++ b/cmd/horcrux/main.go @@ -15,7 +15,7 @@ limitations under the License. */ package main -import "github.com/strangelove-ventures/horcrux/cmd/horcrux/cmd" +import "github.com/strangelove-ventures/horcrux/v3/cmd/horcrux/cmd" func main() { cmd.Execute() diff --git a/proto/strangelove/horcrux/cosigner.proto b/proto/strangelove/horcrux/cosigner.proto index 52475b85..42d886ef 100644 --- a/proto/strangelove/horcrux/cosigner.proto +++ b/proto/strangelove/horcrux/cosigner.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package strangelove.horcrux; -option go_package = "github.com/strangelove-ventures/horcrux/signer/proto"; +option go_package = "github.com/strangelove-ventures/horcrux/v3/signer/proto"; service Cosigner { rpc SignBlock (SignBlockRequest) returns (SignBlockResponse) {} @@ -88,4 +88,4 @@ message GetLeaderResponse { } message PingRequest {} -message PingResponse {} \ No newline at end of file +message PingResponse {} diff --git a/proto/strangelove/horcrux/remote_signer.proto b/proto/strangelove/horcrux/remote_signer.proto index 5753b281..2e1a6c2d 100644 --- a/proto/strangelove/horcrux/remote_signer.proto +++ b/proto/strangelove/horcrux/remote_signer.proto @@ -3,7 +3,7 @@ package strangelove.horcrux; import "strangelove/horcrux/cosigner.proto"; -option go_package = "github.com/strangelove-ventures/horcrux/signer/proto"; +option go_package = "github.com/strangelove-ventures/horcrux/v3/signer/proto"; service RemoteSigner { rpc PubKey (PubKeyRequest) returns (PubKeyResponse) {} diff --git a/signer/cond/cond_test.go b/signer/cond/cond_test.go index 21b35077..fd64ede4 100644 --- a/signer/cond/cond_test.go +++ b/signer/cond/cond_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/strangelove-ventures/horcrux/signer/cond" + "github.com/strangelove-ventures/horcrux/v3/signer/cond" "github.com/stretchr/testify/require" ) diff --git a/signer/config.go b/signer/config.go index 7db96ff1..4765cc04 100644 --- a/signer/config.go +++ b/signer/config.go @@ -16,7 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/types/bech32" - "github.com/strangelove-ventures/horcrux/client" + "github.com/strangelove-ventures/horcrux/v3/client" "gopkg.in/yaml.v2" ) diff --git a/signer/config_test.go b/signer/config_test.go index f2d0529d..46397db3 100644 --- a/signer/config_test.go +++ b/signer/config_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" "github.com/stretchr/testify/require" ) diff --git a/signer/cosigner.go b/signer/cosigner.go index bf89a568..d11f6ee9 100644 --- a/signer/cosigner.go +++ b/signer/cosigner.go @@ -6,7 +6,7 @@ import ( cometcrypto "github.com/cometbft/cometbft/crypto" "github.com/google/uuid" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" ) // Cosigner interface is a set of methods for an m-of-n threshold signature. diff --git a/signer/cosigner_grpc_server.go b/signer/cosigner_grpc_server.go index 89805290..be62cbed 100644 --- a/signer/cosigner_grpc_server.go +++ b/signer/cosigner_grpc_server.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/raft" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" ) var _ proto.CosignerServer = &CosignerGRPCServer{} diff --git a/signer/cosigner_health.go b/signer/cosigner_health.go index 93d947ba..94697ce1 100644 --- a/signer/cosigner_health.go +++ b/signer/cosigner_health.go @@ -7,7 +7,7 @@ import ( "time" cometlog "github.com/cometbft/cometbft/libs/log" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" ) const ( diff --git a/signer/hrs.go b/signer/hrs.go index acd24a8d..19155f66 100644 --- a/signer/hrs.go +++ b/signer/hrs.go @@ -1,7 +1,7 @@ package signer import ( - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" ) // HRSKey represents the key for the HRS metadata map. diff --git a/signer/multiresolver/multi_test.go b/signer/multiresolver/multi_test.go index 9baa80ca..236c07df 100644 --- a/signer/multiresolver/multi_test.go +++ b/signer/multiresolver/multi_test.go @@ -10,9 +10,9 @@ import ( "time" grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry" - "github.com/strangelove-ventures/horcrux/signer" - "github.com/strangelove-ventures/horcrux/signer/multiresolver" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer" + "github.com/strangelove-ventures/horcrux/v3/signer/multiresolver" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/signer/raft_store.go b/signer/raft_store.go index 66d39948..4cff36b3 100644 --- a/signer/raft_store.go +++ b/signer/raft_store.go @@ -26,7 +26,7 @@ import ( "github.com/cometbft/cometbft/libs/service" "github.com/hashicorp/raft" boltdb "github.com/hashicorp/raft-boltdb/v2" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/reflection" diff --git a/signer/remote_cosigner.go b/signer/remote_cosigner.go index f86642bd..fe5b87f3 100644 --- a/signer/remote_cosigner.go +++ b/signer/remote_cosigner.go @@ -8,7 +8,7 @@ import ( cometcrypto "github.com/cometbft/cometbft/crypto" "github.com/google/uuid" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/signer/remote_signer_grpc_server.go b/signer/remote_signer_grpc_server.go index 816b1820..c66ec76d 100644 --- a/signer/remote_signer_grpc_server.go +++ b/signer/remote_signer_grpc_server.go @@ -8,7 +8,7 @@ import ( cometlog "github.com/cometbft/cometbft/libs/log" cometservice "github.com/cometbft/cometbft/libs/service" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/signer/services_test.go b/signer/services_test.go index 66d1e732..48f35dae 100644 --- a/signer/services_test.go +++ b/signer/services_test.go @@ -14,7 +14,7 @@ import ( cometlog "github.com/cometbft/cometbft/libs/log" cometservice "github.com/cometbft/cometbft/libs/service" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" fork "github.com/kraken-hpc/go-fork" "github.com/stretchr/testify/require" diff --git a/signer/sign_state.go b/signer/sign_state.go index b8bcf1ba..0ab8d731 100644 --- a/signer/sign_state.go +++ b/signer/sign_state.go @@ -15,7 +15,7 @@ import ( cometproto "github.com/cometbft/cometbft/proto/tendermint/types" comet "github.com/cometbft/cometbft/types" "github.com/gogo/protobuf/proto" - "github.com/strangelove-ventures/horcrux/signer/cond" + "github.com/strangelove-ventures/horcrux/v3/signer/cond" ) const ( diff --git a/signer/threshold_validator.go b/signer/threshold_validator.go index 891fb3c8..2a9d8609 100644 --- a/signer/threshold_validator.go +++ b/signer/threshold_validator.go @@ -13,7 +13,7 @@ import ( "github.com/cometbft/cometbft/libs/log" cometrpcjsontypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" "github.com/google/uuid" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/test/horcrux_test.go b/test/horcrux_test.go index 4f15bf4a..5a62bf35 100644 --- a/test/horcrux_test.go +++ b/test/horcrux_test.go @@ -8,7 +8,7 @@ import ( "github.com/cometbft/cometbft/crypto" dockertypes "github.com/docker/docker/api/types" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" interchaintest "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/test/validator.go b/test/validator.go index 93fbefbb..487eecf0 100644 --- a/test/validator.go +++ b/test/validator.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/bech32" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/docker/docker/client" - "github.com/strangelove-ventures/horcrux/signer/proto" + "github.com/strangelove-ventures/horcrux/v3/signer/proto" interchaintest "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/test/validator_single.go b/test/validator_single.go index c7919ab8..13396712 100644 --- a/test/validator_single.go +++ b/test/validator_single.go @@ -10,7 +10,7 @@ import ( cometjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/privval" "github.com/docker/docker/client" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" interchaintest "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/test/validator_threshold.go b/test/validator_threshold.go index 1d646cf0..bff4928d 100644 --- a/test/validator_threshold.go +++ b/test/validator_threshold.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/client" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" - "github.com/strangelove-ventures/horcrux/signer" + "github.com/strangelove-ventures/horcrux/v3/signer" interchaintest "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc"