diff --git a/cli/export_keys_from_mnemonic.go b/cli/export_keys_from_mnemonic.go index 36811f00b9..c93c90fadb 100644 --- a/cli/export_keys_from_mnemonic.go +++ b/cli/export_keys_from_mnemonic.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/bloxapp/eth2-key-manager/core" "github.com/spf13/cobra" + "github.com/ssvlabs/eth2-key-manager/core" util "github.com/wealdtech/go-eth2-util" "go.uber.org/zap" diff --git a/e2e/go.mod b/e2e/go.mod index 7fa0d4eab5..5ee5514d8d 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -45,7 +45,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.10.0 // indirect - github.com/bloxapp/eth2-key-manager v1.4.0 // indirect + github.com/ssvlabs/eth2-key-manager v1.4.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/consensys/bavard v0.1.13 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 697e74ab2d..15f931c804 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -16,8 +16,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88= github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bloxapp/eth2-key-manager v1.4.0 h1:fwAW886z2mSUb/u4Kq/ln+wvSkIxLqEgxvE+x8gZiz8= -github.com/bloxapp/eth2-key-manager v1.4.0/go.mod h1:m2DsvNCyLAAcgkN2JuroXUGpM61OeKSclmWuaRNW4Ss= +github.com/ssvlabs/eth2-key-manager v1.4.0 h1:fwAW886z2mSUb/u4Kq/ln+wvSkIxLqEgxvE+x8gZiz8= +github.com/ssvlabs/eth2-key-manager v1.4.0/go.mod h1:m2DsvNCyLAAcgkN2JuroXUGpM61OeKSclmWuaRNW4Ss= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= diff --git a/ekm/eth_key_manager_signer.go b/ekm/eth_key_manager_signer.go index 16b09d4cf8..f977abca4a 100644 --- a/ekm/eth_key_manager_signer.go +++ b/ekm/eth_key_manager_signer.go @@ -14,14 +14,14 @@ import ( "github.com/attestantio/go-eth2-client/spec/capella" "github.com/attestantio/go-eth2-client/spec/deneb" "github.com/attestantio/go-eth2-client/spec/phase0" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/signer" - slashingprotection "github.com/bloxapp/eth2-key-manager/slashing_protection" - "github.com/bloxapp/eth2-key-manager/wallets" ssz "github.com/ferranbt/fastssz" "github.com/herumi/bls-eth-go-binary/bls" "github.com/pkg/errors" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/signer" + slashingprotection "github.com/ssvlabs/eth2-key-manager/slashing_protection" + "github.com/ssvlabs/eth2-key-manager/wallets" "go.uber.org/zap" spectypes "github.com/ssvlabs/ssv-spec/types" diff --git a/ekm/signer_key_manager_test.go b/ekm/signer_key_manager_test.go index 890d86cb8e..b6323ae4bd 100644 --- a/ekm/signer_key_manager_test.go +++ b/ekm/signer_key_manager_test.go @@ -11,12 +11,12 @@ import ( "github.com/attestantio/go-eth2-client/spec/capella" "github.com/attestantio/go-eth2-client/spec/deneb" "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/wallets/hd" "github.com/herumi/bls-eth-go-binary/bls" "github.com/holiman/uint256" "github.com/pkg/errors" "github.com/prysmaticlabs/go-bitfield" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/wallets/hd" genesisspecqbft "github.com/ssvlabs/ssv-spec-pre-cc/qbft" genesisspectypes "github.com/ssvlabs/ssv-spec-pre-cc/types" spectypes "github.com/ssvlabs/ssv-spec/types" diff --git a/ekm/signer_storage.go b/ekm/signer_storage.go index 70a3d98106..0c39fa31be 100644 --- a/ekm/signer_storage.go +++ b/ekm/signer_storage.go @@ -11,13 +11,13 @@ import ( "sync" "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/encryptor" - "github.com/bloxapp/eth2-key-manager/wallets" - "github.com/bloxapp/eth2-key-manager/wallets/hd" ssz "github.com/ferranbt/fastssz" "github.com/google/uuid" "github.com/pkg/errors" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/wallets" + "github.com/ssvlabs/eth2-key-manager/wallets/hd" "go.uber.org/zap" "github.com/ssvlabs/ssv/logging" diff --git a/ekm/signer_storage_test.go b/ekm/signer_storage_test.go index 8946a3cee8..fbf3021cb8 100644 --- a/ekm/signer_storage_test.go +++ b/ekm/signer_storage_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/encryptor" - "github.com/bloxapp/eth2-key-manager/encryptor/keystorev4" - "github.com/bloxapp/eth2-key-manager/wallets/hd" "github.com/google/uuid" "github.com/herumi/bls-eth-go-binary/bls" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/encryptor/keystorev4" + "github.com/ssvlabs/eth2-key-manager/wallets/hd" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/eth/eventhandler/event_handler_test.go b/eth/eventhandler/event_handler_test.go index d4b0d2a447..5b1731fef5 100644 --- a/eth/eventhandler/event_handler_test.go +++ b/eth/eventhandler/event_handler_test.go @@ -12,7 +12,6 @@ import ( eth2apiv1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec/phase0" - ekmcore "github.com/bloxapp/eth2-key-manager/core" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" ethcommon "github.com/ethereum/go-ethereum/common" @@ -21,6 +20,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient/simulated" "github.com/herumi/bls-eth-go-binary/bls" "github.com/pkg/errors" + ekmcore "github.com/ssvlabs/eth2-key-manager/core" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "go.uber.org/zap" diff --git a/go.mod b/go.mod index 10c7efeba6..e6d529457c 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.22 require ( github.com/aquasecurity/table v1.8.0 github.com/attestantio/go-eth2-client v0.21.7 - github.com/bloxapp/eth2-key-manager v1.4.1 github.com/btcsuite/btcd/btcec/v2 v2.3.4 github.com/cespare/xxhash/v2 v2.3.0 github.com/dgraph-io/badger/v4 v4.2.0 @@ -36,6 +35,7 @@ require ( github.com/rs/zerolog v1.32.0 github.com/sourcegraph/conc v0.3.0 github.com/spf13/cobra v1.7.0 + github.com/ssvlabs/eth2-key-manager v1.4.1 github.com/ssvlabs/ssv-spec v0.3.11-0.20240820113812-496d839e9614 github.com/ssvlabs/ssv-spec-pre-cc v0.0.0-20240725052506-c48532da6a63 github.com/status-im/keycard-go v0.2.0 @@ -244,3 +244,5 @@ require ( replace github.com/google/flatbuffers => github.com/google/flatbuffers v1.11.0 replace github.com/dgraph-io/ristretto => github.com/dgraph-io/ristretto v0.1.1-0.20211108053508-297c39e6640f + +replace github.com/ssvlabs/eth2-key-manager => github.com/Roy-blox/eth2-key-manager v0.0.0-20241029094850-92c7958e04f6 \ No newline at end of file diff --git a/go.sum b/go.sum index 3bb69be969..58ee5e9ebf 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/Roy-blox/eth2-key-manager v0.0.0-20241029094850-92c7958e04f6 h1:Cg0YYxt/ZZk/d3PWYQuk8c8MVK9VQM4MerMwbRfRieI= +github.com/Roy-blox/eth2-key-manager v0.0.0-20241029094850-92c7958e04f6/go.mod h1:RqsGIMCsOeUJQmC2nytr82z5vqn5gN3i3VAoY0OydV8= github.com/Shopify/sarama v1.26.1/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= @@ -52,8 +54,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88= github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bloxapp/eth2-key-manager v1.4.1 h1:0VZxjG5YednaoQh82NQ1uvYlfdVYeTwYvH4qVOebJ3I= -github.com/bloxapp/eth2-key-manager v1.4.1/go.mod h1:m2DsvNCyLAAcgkN2JuroXUGpM61OeKSclmWuaRNW4Ss= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=