diff --git a/README.md b/README.md index 1a52a44d..d4a9d081 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,16 @@ Blox Eth Key Manager is a library wrapping all major functionality an eth 2.0 validator will need: - - [Multi storage implementations](https://github.com/bloxapp/eth2-key-manager/tree/master/stores) - - [Signer](https://github.com/bloxapp/eth2-key-manager/tree/master/validator_signer) - - [Slashing protection](https://github.com/bloxapp/eth2-key-manager/tree/master/slashing_protection) - - [HD wallet](https://github.com/bloxapp/eth2-key-manager/tree/master/wallet_hd) (EIP-2333,2334,2335 compliant) + - [Multi storage implementations](https://github.com/ssvlabs/eth2-key-manager/tree/master/stores) + - [Signer](https://github.com/ssvlabs/eth2-key-manager/tree/master/validator_signer) + - [Slashing protection](https://github.com/ssvlabs/eth2-key-manager/tree/master/slashing_protection) + - [HD wallet](https://github.com/ssvlabs/eth2-key-manager/tree/master/wallet_hd) (EIP-2333,2334,2335 compliant) - Tests ### Installation ```sh -go get github.com/bloxapp/eth2-key-manager +go get github.com/ssvlabs/eth2-key-manager ``` ### Security and Architecture diff --git a/cli/cmd/config/currentepoch.go b/cli/cmd/config/currentepoch.go index eff7975e..ba0ce152 100644 --- a/cli/cmd/config/currentepoch.go +++ b/cli/cmd/config/currentepoch.go @@ -3,8 +3,8 @@ package seed import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/config/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/config/handler" ) // currentEpochCmd represents the command to get the current epoch. diff --git a/cli/cmd/config/currentslot.go b/cli/cmd/config/currentslot.go index 33409d15..d52e1872 100644 --- a/cli/cmd/config/currentslot.go +++ b/cli/cmd/config/currentslot.go @@ -3,8 +3,8 @@ package seed import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/config/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/config/handler" ) // currentSlotCmd represents the command to get the current slot. diff --git a/cli/cmd/config/handler/handler.go b/cli/cmd/config/handler/handler.go index 17dbe95a..9eb881bb 100644 --- a/cli/cmd/config/handler/handler.go +++ b/cli/cmd/config/handler/handler.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/core" ) // Config contains handler functions of the CLI commands related to key-vault config. diff --git a/cli/cmd/config/root.go b/cli/cmd/config/root.go index c21f2c3c..34ca4548 100644 --- a/cli/cmd/config/root.go +++ b/cli/cmd/config/root.go @@ -3,7 +3,7 @@ package seed import ( "github.com/spf13/cobra" - keyvaultcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" + keyvaultcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" ) // Command represents the key-vault seed related command. diff --git a/cli/cmd/flags.go b/cli/cmd/flags.go index 2686ea01..c50a3bef 100644 --- a/cli/cmd/flags.go +++ b/cli/cmd/flags.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/core" ) // ResponseType represents the network. diff --git a/cli/cmd/mnemonic/generate.go b/cli/cmd/mnemonic/generate.go index 6a68f15e..fea3e8b8 100644 --- a/cli/cmd/mnemonic/generate.go +++ b/cli/cmd/mnemonic/generate.go @@ -3,8 +3,8 @@ package mnemonic import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/mnemonic/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/mnemonic/handler" ) // generateCmd represents the generate mnemonic command. diff --git a/cli/cmd/mnemonic/generate_test.go b/cli/cmd/mnemonic/generate_test.go index 5fc7aed3..8288ed19 100644 --- a/cli/cmd/mnemonic/generate_test.go +++ b/cli/cmd/mnemonic/generate_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestMnemonicGenerate(t *testing.T) { diff --git a/cli/cmd/mnemonic/handler/handler.go b/cli/cmd/mnemonic/handler/handler.go index c9256460..e6326b67 100644 --- a/cli/cmd/mnemonic/handler/handler.go +++ b/cli/cmd/mnemonic/handler/handler.go @@ -1,7 +1,7 @@ package handler import ( - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) // Mnemonic contains handler functions of the CLI commands related to key-vault mnemonic. diff --git a/cli/cmd/mnemonic/handler/handler_generate.go b/cli/cmd/mnemonic/handler/handler_generate.go index 16de98e2..82824094 100644 --- a/cli/cmd/mnemonic/handler/handler_generate.go +++ b/cli/cmd/mnemonic/handler/handler_generate.go @@ -1,7 +1,7 @@ package handler import ( - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/cmd/mnemonic/root.go b/cli/cmd/mnemonic/root.go index b17d4ca9..0ba988ab 100644 --- a/cli/cmd/mnemonic/root.go +++ b/cli/cmd/mnemonic/root.go @@ -3,7 +3,7 @@ package mnemonic import ( "github.com/spf13/cobra" - keyvaultcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" + keyvaultcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" ) // Command represents the key-vault mnemonic related command. diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 7eae5bd8..2a27a921 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) // ResultPrinter is the printer used to print command results and errors. diff --git a/cli/cmd/seed/flag/generate.go b/cli/cmd/seed/flag/generate.go index 4abe1b01..86fd1e36 100644 --- a/cli/cmd/seed/flag/generate.go +++ b/cli/cmd/seed/flag/generate.go @@ -3,7 +3,7 @@ package flag import ( "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" ) // Flag names. diff --git a/cli/cmd/seed/generate.go b/cli/cmd/seed/generate.go index 2d69179e..47b49470 100644 --- a/cli/cmd/seed/generate.go +++ b/cli/cmd/seed/generate.go @@ -3,9 +3,9 @@ package seed import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/seed/flag" - "github.com/bloxapp/eth2-key-manager/cli/cmd/seed/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/seed/flag" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/seed/handler" ) // generateCmd represents the generate seed command. diff --git a/cli/cmd/seed/generate_test.go b/cli/cmd/seed/generate_test.go index 53b0e25d..aa19bc25 100644 --- a/cli/cmd/seed/generate_test.go +++ b/cli/cmd/seed/generate_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestSeedGenerate(t *testing.T) { diff --git a/cli/cmd/seed/handler/handler.go b/cli/cmd/seed/handler/handler.go index 06b4e8e7..596a7dc4 100644 --- a/cli/cmd/seed/handler/handler.go +++ b/cli/cmd/seed/handler/handler.go @@ -1,7 +1,7 @@ package handler import ( - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) // Seed contains handler functions of the CLI commands related to key-vault seed. diff --git a/cli/cmd/seed/handler/handler_generate.go b/cli/cmd/seed/handler/handler_generate.go index 1153b990..5187c78e 100644 --- a/cli/cmd/seed/handler/handler_generate.go +++ b/cli/cmd/seed/handler/handler_generate.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/cmd/seed/flag" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/seed/flag" + "github.com/ssvlabs/eth2-key-manager/core" ) // Generate generates a new key-vault seed and prints it. diff --git a/cli/cmd/seed/root.go b/cli/cmd/seed/root.go index 11a6f660..477be522 100644 --- a/cli/cmd/seed/root.go +++ b/cli/cmd/seed/root.go @@ -3,7 +3,7 @@ package seed import ( "github.com/spf13/cobra" - keyvaultcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" + keyvaultcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" ) // Command represents the key-vault seed related command. diff --git a/cli/cmd/wallet/cmd/account/create.go b/cli/cmd/wallet/cmd/account/create.go index 5477c5fe..ff0fdd88 100644 --- a/cli/cmd/wallet/cmd/account/create.go +++ b/cli/cmd/wallet/cmd/account/create.go @@ -3,9 +3,9 @@ package account import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" ) // createCmd represents the create account command. diff --git a/cli/cmd/wallet/cmd/account/create_test.go b/cli/cmd/wallet/cmd/account/create_test.go index b906f71a..6671a58e 100644 --- a/cli/cmd/wallet/cmd/account/create_test.go +++ b/cli/cmd/wallet/cmd/account/create_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestAccountCreate(t *testing.T) { diff --git a/cli/cmd/wallet/cmd/account/credentials.go b/cli/cmd/wallet/cmd/account/credentials.go index 61c3ea8f..7c5cb04d 100644 --- a/cli/cmd/wallet/cmd/account/credentials.go +++ b/cli/cmd/wallet/cmd/account/credentials.go @@ -3,9 +3,9 @@ package account import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" ) // credentialsCmd represents the credentials account command. diff --git a/cli/cmd/wallet/cmd/account/credentials_test.go b/cli/cmd/wallet/cmd/account/credentials_test.go index ef847ffa..e293a9c4 100644 --- a/cli/cmd/wallet/cmd/account/credentials_test.go +++ b/cli/cmd/wallet/cmd/account/credentials_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestAccountCredentials(t *testing.T) { diff --git a/cli/cmd/wallet/cmd/account/deposit-data.go b/cli/cmd/wallet/cmd/account/deposit-data.go index bcfacf8d..dc7aac43 100644 --- a/cli/cmd/wallet/cmd/account/deposit-data.go +++ b/cli/cmd/wallet/cmd/account/deposit-data.go @@ -3,9 +3,9 @@ package account import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" ) // depositDataCmd represents the deposit-data account command. diff --git a/cli/cmd/wallet/cmd/account/deposit-data_test.go b/cli/cmd/wallet/cmd/account/deposit-data_test.go index 83322b01..39fc0c4f 100644 --- a/cli/cmd/wallet/cmd/account/deposit-data_test.go +++ b/cli/cmd/wallet/cmd/account/deposit-data_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestAccountDepositData(t *testing.T) { diff --git a/cli/cmd/wallet/cmd/account/flag/create.go b/cli/cmd/wallet/cmd/account/flag/create.go index b09887b8..37b60893 100644 --- a/cli/cmd/wallet/cmd/account/flag/create.go +++ b/cli/cmd/wallet/cmd/account/flag/create.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" ) // Flag names. diff --git a/cli/cmd/wallet/cmd/account/flag/credentials.go b/cli/cmd/wallet/cmd/account/flag/credentials.go index 060c02ea..93db4961 100644 --- a/cli/cmd/wallet/cmd/account/flag/credentials.go +++ b/cli/cmd/wallet/cmd/account/flag/credentials.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" - "github.com/bloxapp/eth2-key-manager/core" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/core" ) // Flag names. diff --git a/cli/cmd/wallet/cmd/account/flag/deposit-data.go b/cli/cmd/wallet/cmd/account/flag/deposit-data.go index 5c0ea5ff..f0bfb520 100644 --- a/cli/cmd/wallet/cmd/account/flag/deposit-data.go +++ b/cli/cmd/wallet/cmd/account/flag/deposit-data.go @@ -3,7 +3,7 @@ package flag import ( "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" ) // Flag names. diff --git a/cli/cmd/wallet/cmd/account/flag/list.go b/cli/cmd/wallet/cmd/account/flag/list.go index d491c549..2982516d 100644 --- a/cli/cmd/wallet/cmd/account/flag/list.go +++ b/cli/cmd/wallet/cmd/account/flag/list.go @@ -3,7 +3,7 @@ package flag import ( "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" ) // Flag names. diff --git a/cli/cmd/wallet/cmd/account/flag/voluntary_exit.go b/cli/cmd/wallet/cmd/account/flag/voluntary_exit.go index fcc089f0..d21e3276 100644 --- a/cli/cmd/wallet/cmd/account/flag/voluntary_exit.go +++ b/cli/cmd/wallet/cmd/account/flag/voluntary_exit.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/util/cliflag" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/cli/util/cliflag" + "github.com/ssvlabs/eth2-key-manager/core" ) // Flag names. diff --git a/cli/cmd/wallet/cmd/account/handler/handler.go b/cli/cmd/wallet/cmd/account/handler/handler.go index dd9c8531..89aed06d 100644 --- a/cli/cmd/wallet/cmd/account/handler/handler.go +++ b/cli/cmd/wallet/cmd/account/handler/handler.go @@ -1,7 +1,7 @@ package handler import ( - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) // Account contains handler functions of the CLI commands related to wallet account. diff --git a/cli/cmd/wallet/cmd/account/handler/handler_create.go b/cli/cmd/wallet/cmd/account/handler/handler_create.go index 2bd09602..7d34971a 100644 --- a/cli/cmd/wallet/cmd/account/handler/handler_create.go +++ b/cli/cmd/wallet/cmd/account/handler/handler_create.go @@ -8,11 +8,11 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // CreateAccountFlagValues keeps all collected values for seed and seedless modes diff --git a/cli/cmd/wallet/cmd/account/handler/handler_credentials.go b/cli/cmd/wallet/cmd/account/handler/handler_credentials.go index 9ed87170..7ec45558 100644 --- a/cli/cmd/wallet/cmd/account/handler/handler_credentials.go +++ b/cli/cmd/wallet/cmd/account/handler/handler_credentials.go @@ -11,12 +11,12 @@ import ( types "github.com/wealdtech/go-eth2-types/v2" util "github.com/wealdtech/go-eth2-util" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/signer" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/signer" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // CredentialsFlagValues keeps all collected values for seed diff --git a/cli/cmd/wallet/cmd/account/handler/handler_deposit-data.go b/cli/cmd/wallet/cmd/account/handler/handler_deposit-data.go index 6ef3e9b4..b3229abc 100644 --- a/cli/cmd/wallet/cmd/account/handler/handler_deposit-data.go +++ b/cli/cmd/wallet/cmd/account/handler/handler_deposit-data.go @@ -3,15 +3,15 @@ package handler import ( "encoding/hex" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" "github.com/pkg/errors" "github.com/spf13/cobra" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // DepositData generates account deposit-data and prints it. diff --git a/cli/cmd/wallet/cmd/account/handler/handler_list.go b/cli/cmd/wallet/cmd/account/handler/handler_list.go index 56667109..d3d97721 100644 --- a/cli/cmd/wallet/cmd/account/handler/handler_list.go +++ b/cli/cmd/wallet/cmd/account/handler/handler_list.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // List lists wallet accounts and prints the accounts. diff --git a/cli/cmd/wallet/cmd/account/handler/handler_voluntary_exit.go b/cli/cmd/wallet/cmd/account/handler/handler_voluntary_exit.go index 0ecc5dba..3713cfc6 100644 --- a/cli/cmd/wallet/cmd/account/handler/handler_voluntary_exit.go +++ b/cli/cmd/wallet/cmd/account/handler/handler_voluntary_exit.go @@ -10,12 +10,12 @@ import ( "github.com/spf13/cobra" types "github.com/wealdtech/go-eth2-types/v2" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/signer" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/signer" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // VoluntaryExitFlagValues keeps all collected values for seed diff --git a/cli/cmd/wallet/cmd/account/list.go b/cli/cmd/wallet/cmd/account/list.go index 97e6bbf8..3182f5dc 100644 --- a/cli/cmd/wallet/cmd/account/list.go +++ b/cli/cmd/wallet/cmd/account/list.go @@ -3,9 +3,9 @@ package account import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" ) // listCmd represents the list wallet accounts command. diff --git a/cli/cmd/wallet/cmd/account/list_test.go b/cli/cmd/wallet/cmd/account/list_test.go index 15b1ee75..235cf1c8 100644 --- a/cli/cmd/wallet/cmd/account/list_test.go +++ b/cli/cmd/wallet/cmd/account/list_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestAccountList(t *testing.T) { diff --git a/cli/cmd/wallet/cmd/account/root.go b/cli/cmd/wallet/cmd/account/root.go index 768e738a..644cca52 100644 --- a/cli/cmd/wallet/cmd/account/root.go +++ b/cli/cmd/wallet/cmd/account/root.go @@ -3,7 +3,7 @@ package account import ( "github.com/spf13/cobra" - walletcmd "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet" + walletcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet" ) // Command represents the portfolio account related command. diff --git a/cli/cmd/wallet/cmd/account/voluntary_exit.go b/cli/cmd/wallet/cmd/account/voluntary_exit.go index b46af88d..107dc02a 100644 --- a/cli/cmd/wallet/cmd/account/voluntary_exit.go +++ b/cli/cmd/wallet/cmd/account/voluntary_exit.go @@ -3,9 +3,9 @@ package account import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/flag" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account/handler" ) // voluntaryExitCmd represents the voluntary exit account command. diff --git a/cli/cmd/wallet/cmd/account/voluntary_exit_test.go b/cli/cmd/wallet/cmd/account/voluntary_exit_test.go index a9f6df8d..9f4079aa 100644 --- a/cli/cmd/wallet/cmd/account/voluntary_exit_test.go +++ b/cli/cmd/wallet/cmd/account/voluntary_exit_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestAccountVoluntaryExit(t *testing.T) { diff --git a/cli/cmd/wallet/cmd/publickey/generate.go b/cli/cmd/wallet/cmd/publickey/generate.go index f2ee8c3d..f42a1ef8 100644 --- a/cli/cmd/wallet/cmd/publickey/generate.go +++ b/cli/cmd/wallet/cmd/publickey/generate.go @@ -3,8 +3,8 @@ package publickey import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/publickey/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/publickey/handler" ) // generateCmd represents the generate public key command. diff --git a/cli/cmd/wallet/cmd/publickey/generate_test.go b/cli/cmd/wallet/cmd/publickey/generate_test.go index cbd0b333..4db22230 100644 --- a/cli/cmd/wallet/cmd/publickey/generate_test.go +++ b/cli/cmd/wallet/cmd/publickey/generate_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestPublicKeyGenerate(t *testing.T) { diff --git a/cli/cmd/wallet/cmd/publickey/handler/handler.go b/cli/cmd/wallet/cmd/publickey/handler/handler.go index de216cbd..b58be708 100644 --- a/cli/cmd/wallet/cmd/publickey/handler/handler.go +++ b/cli/cmd/wallet/cmd/publickey/handler/handler.go @@ -1,8 +1,8 @@ package handler import ( - "github.com/bloxapp/eth2-key-manager/cli/util/printer" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/core" ) // PublicKey contains handler functions of the CLI commands related to wallet public keys. diff --git a/cli/cmd/wallet/cmd/publickey/handler/handler_generate.go b/cli/cmd/wallet/cmd/publickey/handler/handler_generate.go index 1dae6ba2..4739ad78 100644 --- a/cli/cmd/wallet/cmd/publickey/handler/handler_generate.go +++ b/cli/cmd/wallet/cmd/publickey/handler/handler_generate.go @@ -3,14 +3,14 @@ package handler import ( "encoding/hex" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/core" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/core" "github.com/pkg/errors" "github.com/spf13/cobra" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // Generate generates a new wallet account at specific index and prints the account. diff --git a/cli/cmd/wallet/cmd/publickey/root.go b/cli/cmd/wallet/cmd/publickey/root.go index d44f6b90..aaa313b6 100644 --- a/cli/cmd/wallet/cmd/publickey/root.go +++ b/cli/cmd/wallet/cmd/publickey/root.go @@ -3,7 +3,7 @@ package publickey import ( "github.com/spf13/cobra" - walletcmd "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet" + walletcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet" ) // Command represents the wallet publickey related command. diff --git a/cli/cmd/wallet/create.go b/cli/cmd/wallet/create.go index b9965468..8f140806 100644 --- a/cli/cmd/wallet/create.go +++ b/cli/cmd/wallet/create.go @@ -3,8 +3,8 @@ package wallet import ( "github.com/spf13/cobra" - rootcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/handler" + rootcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/handler" ) // createCmd represents the create wallet command. diff --git a/cli/cmd/wallet/create_test.go b/cli/cmd/wallet/create_test.go index 3a84adf4..46dfb7ce 100644 --- a/cli/cmd/wallet/create_test.go +++ b/cli/cmd/wallet/create_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/cmd" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestAccountCreate(t *testing.T) { diff --git a/cli/cmd/wallet/handler/handler.go b/cli/cmd/wallet/handler/handler.go index acca4e87..455c6b42 100644 --- a/cli/cmd/wallet/handler/handler.go +++ b/cli/cmd/wallet/handler/handler.go @@ -1,8 +1,8 @@ package handler import ( - "github.com/bloxapp/eth2-key-manager/cli/util/printer" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/core" ) // Wallet contains handler functions of the CLI commands related to wallet. diff --git a/cli/cmd/wallet/handler/handler_create.go b/cli/cmd/wallet/handler/handler_create.go index 65363163..8d37689d 100644 --- a/cli/cmd/wallet/handler/handler_create.go +++ b/cli/cmd/wallet/handler/handler_create.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) // Create creates a new wallet and prints the storage diff --git a/cli/cmd/wallet/root.go b/cli/cmd/wallet/root.go index f2870f88..361f8146 100644 --- a/cli/cmd/wallet/root.go +++ b/cli/cmd/wallet/root.go @@ -3,7 +3,7 @@ package wallet import ( "github.com/spf13/cobra" - keyvaultcmd "github.com/bloxapp/eth2-key-manager/cli/cmd" + keyvaultcmd "github.com/ssvlabs/eth2-key-manager/cli/cmd" ) // Command represents the wallet related command. diff --git a/cli/main.go b/cli/main.go index 65cdfbc5..fa36b688 100644 --- a/cli/main.go +++ b/cli/main.go @@ -1,13 +1,13 @@ package main import ( - "github.com/bloxapp/eth2-key-manager/cli/cmd" - _ "github.com/bloxapp/eth2-key-manager/cli/cmd/config" - _ "github.com/bloxapp/eth2-key-manager/cli/cmd/mnemonic" - _ "github.com/bloxapp/eth2-key-manager/cli/cmd/seed" - _ "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet" - _ "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/account" - _ "github.com/bloxapp/eth2-key-manager/cli/cmd/wallet/cmd/publickey" + "github.com/ssvlabs/eth2-key-manager/cli/cmd" + _ "github.com/ssvlabs/eth2-key-manager/cli/cmd/config" + _ "github.com/ssvlabs/eth2-key-manager/cli/cmd/mnemonic" + _ "github.com/ssvlabs/eth2-key-manager/cli/cmd/seed" + _ "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet" + _ "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/account" + _ "github.com/ssvlabs/eth2-key-manager/cli/cmd/wallet/cmd/publickey" ) func main() { diff --git a/cli/util/printer/standard_test.go b/cli/util/printer/standard_test.go index 8b811c38..b071880f 100644 --- a/cli/util/printer/standard_test.go +++ b/cli/util/printer/standard_test.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/cli/util/printer" + "github.com/ssvlabs/eth2-key-manager/cli/util/printer" ) func TestText(t *testing.T) { diff --git a/core/storage.go b/core/storage.go index 89b559ee..87e46aeb 100644 --- a/core/storage.go +++ b/core/storage.go @@ -3,7 +3,7 @@ package core import ( "github.com/google/uuid" - "github.com/bloxapp/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/encryptor" ) // Storage represents storage behavior diff --git a/encryptor/keystorev4/encryptor_test.go b/encryptor/keystorev4/encryptor_test.go index 27782908..092c9974 100644 --- a/encryptor/keystorev4/encryptor_test.go +++ b/encryptor/keystorev4/encryptor_test.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - encryptor2 "github.com/bloxapp/eth2-key-manager/encryptor" + encryptor2 "github.com/ssvlabs/eth2-key-manager/encryptor" ) func TestEncrypt(t *testing.T) { diff --git a/eth1_deposit/eth1_deposit.go b/eth1_deposit/eth1_deposit.go index 319ae7cd..584c7033 100644 --- a/eth1_deposit/eth1_deposit.go +++ b/eth1_deposit/eth1_deposit.go @@ -6,7 +6,7 @@ import ( types "github.com/wealdtech/go-eth2-types/v2" util "github.com/wealdtech/go-eth2-util" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) const ( diff --git a/eth1_deposit/eth1_deposit_test.go b/eth1_deposit/eth1_deposit_test.go index 0e413cb3..56759c4a 100644 --- a/eth1_deposit/eth1_deposit_test.go +++ b/eth1_deposit/eth1_deposit_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" types "github.com/wealdtech/go-eth2-types/v2" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) func _ignoreErr(a []byte, err error) []byte { diff --git a/examples/basic_use/main.go b/examples/basic_use/main.go index 77fb89e0..48d73862 100644 --- a/examples/basic_use/main.go +++ b/examples/basic_use/main.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "fmt" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) func main() { diff --git a/go.mod b/go.mod index 430ab0d6..b5320dad 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/bloxapp/eth2-key-manager +module github.com/ssvlabs/eth2-key-manager go 1.18 @@ -9,7 +9,6 @@ require ( github.com/google/uuid v1.3.0 github.com/herumi/bls-eth-go-binary v1.28.1 github.com/pkg/errors v0.9.1 - github.com/rs/zerolog v1.29.1 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.5.0 github.com/stretchr/testify v1.8.4 @@ -21,42 +20,26 @@ require ( ) require ( - github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/fatih/color v1.13.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/goccy/go-yaml v1.9.5 // indirect - github.com/golang/protobuf v1.5.3 // indirect github.com/holiman/uint256 v1.2.2 // indirect - github.com/huandu/go-clone v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/klauspost/cpuid/v2 v2.2.1 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.16 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/sha256-simd v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.16.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 // indirect - github.com/r3labs/sse/v2 v2.10.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/wealdtech/go-bytesutil v1.1.1 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect - golang.org/x/net v0.10.0 // indirect golang.org/x/sys v0.9.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/protobuf v1.30.0 // indirect - gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index a31d32e4..c257b25c 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,7 @@ github.com/attestantio/go-eth2-client v0.19.8 h1:7hn5X1MohW+wpfnwOpysPpjSktZwTB0A2ClohOCgZLI= github.com/attestantio/go-eth2-client v0.19.8/go.mod h1:mZve1kV9Ctj0I1HH9gdg+MnI8lZ+Cb2EktEtOYrBlsM= -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/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E= github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -20,11 +15,6 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -37,15 +27,7 @@ github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= @@ -53,10 +35,7 @@ github.com/herumi/bls-eth-go-binary v1.28.1 h1:fcIZ48y5EE9973k05XjE8+P3YiQgjZz4J github.com/herumi/bls-eth-go-binary v1.28.1/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk= github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= -github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= -github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= github.com/huandu/go-clone v1.6.0 h1:HMo5uvg4wgfiy5FoGOqlFLQED/VGRm2D9Pi8g1FXPGc= -github.com/huandu/go-clone v1.6.0/go.mod h1:ReGivhG6op3GYr+UY3lS6mxjKp7MIGTknuU5TbTVaXE= github.com/huandu/go-clone/generic v1.6.0 h1:Wgmt/fUZ28r16F2Y3APotFD59sHk1p78K0XLdbUYN5U= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -67,6 +46,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -76,15 +56,12 @@ github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= @@ -97,24 +74,12 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 h1:0tVE4tdWQK9ZpYygoV7+vS6QkDvQVySboMVEIxBJmXw= github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7/go.mod h1:wmuf/mdK4VMD+jA9ThwcUKjg3a2XWM9cVfFYjDyY4j4= -github.com/r3labs/sse/v2 v2.10.0 h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0= -github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktEmkNJ7I= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= -github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -140,12 +105,6 @@ github.com/wealdtech/go-eth2-types/v2 v2.8.0 h1:Cts9J78ryXVp8jwotdSSVU75S+QWJrgV github.com/wealdtech/go-eth2-types/v2 v2.8.0/go.mod h1:tJazo9o28kdQs3V/U4VafQ4neG+/sL3OBozQ8J3CWmo= github.com/wealdtech/go-eth2-util v1.6.3 h1:2INPeOR35x5LdFFpSzyw954WzTD+DFyHe3yKlJnG5As= github.com/wealdtech/go-eth2-util v1.6.3/go.mod h1:0hFMj/qtio288oZFHmAbCnPQ9OB3c4WFzs5NVPKTY4k= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -153,11 +112,7 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -168,7 +123,6 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= @@ -182,16 +136,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -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-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y= -gopkg.in/cenkalti/backoff.v1 v1.1.0/go.mod h1:J6Vskwqd+OMVJl8C33mmtxTBs2gyzfv7UDAkHu8BrjI= 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= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/key_vault.go b/key_vault.go index 55e00721..842850bd 100644 --- a/key_vault.go +++ b/key_vault.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/wallets/hd" - "github.com/bloxapp/eth2-key-manager/wallets/nd" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/wallets/hd" + "github.com/ssvlabs/eth2-key-manager/wallets/nd" // Force import a transitive dependency to fix an ambiguous import error. // See https://github.com/btcsuite/btcd/issues/1839 diff --git a/key_vault_e2e_test.go b/key_vault_e2e_test.go index d4329391..9be2c145 100644 --- a/key_vault_e2e_test.go +++ b/key_vault_e2e_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/encryptor/keystorev4" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/encryptor/keystorev4" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) func _byteArray(input string) []byte { diff --git a/key_vault_options.go b/key_vault_options.go index e21f9b97..57f47a15 100644 --- a/key_vault_options.go +++ b/key_vault_options.go @@ -1,8 +1,8 @@ package eth2keymanager import ( - "github.com/bloxapp/eth2-key-manager/core" - encryptor2 "github.com/bloxapp/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/core" + encryptor2 "github.com/ssvlabs/eth2-key-manager/encryptor" ) // KeyVaultOptions contains options to create a new key vault object diff --git a/scripts/lint.sh b/scripts/lint.sh index 76c0f757..369d3ff4 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -20,11 +20,11 @@ for PACKAGE in $PACKAGES; do golint -set_exit_status $FILES || RC=1 echo "==> goimports $PACKAGE" - BADLY_FORMATTED=$(goimports -l -local "github.com/bloxapp/eth2-key-manager" $PACKAGE || true) + BADLY_FORMATTED=$(goimports -l -local "github.com/ssvlabs/eth2-key-manager" $PACKAGE || true) if [[ -n $BADLY_FORMATTED ]]; then RC=1 echo "Error: These files are badly formatted: $BADLY_FORMATTED" - goimports -d -local "github.com/bloxapp/eth2-key-manager" $PACKAGE + goimports -d -local "github.com/ssvlabs/eth2-key-manager" $PACKAGE fi done diff --git a/signer/far_future_protection.go b/signer/far_future_protection.go index 328f524a..8b21743f 100644 --- a/signer/far_future_protection.go +++ b/signer/far_future_protection.go @@ -5,7 +5,7 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) // FarFutureMaxValidEpoch is the max epoch of far future signing diff --git a/signer/sign_aggregate_and_proof_test.go b/signer/sign_aggregate_and_proof_test.go index 7a2d5144..1278240f 100644 --- a/signer/sign_aggregate_and_proof_test.go +++ b/signer/sign_aggregate_and_proof_test.go @@ -6,10 +6,10 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/stretchr/testify/require" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - prot "github.com/bloxapp/eth2-key-manager/slashing_protection" - "github.com/bloxapp/eth2-key-manager/wallets" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + prot "github.com/ssvlabs/eth2-key-manager/slashing_protection" + "github.com/ssvlabs/eth2-key-manager/wallets" ) func TestReferenceAttestationAggregation(t *testing.T) { diff --git a/signer/sign_attestation_test.go b/signer/sign_attestation_test.go index df6657ca..e5859d36 100644 --- a/signer/sign_attestation_test.go +++ b/signer/sign_attestation_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" util "github.com/wealdtech/go-eth2-util" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - prot "github.com/bloxapp/eth2-key-manager/slashing_protection" - "github.com/bloxapp/eth2-key-manager/wallets" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + prot "github.com/ssvlabs/eth2-key-manager/slashing_protection" + "github.com/ssvlabs/eth2-key-manager/wallets" ) func _byteArray(input string) []byte { diff --git a/signer/sign_beacon_block_test.go b/signer/sign_beacon_block_test.go index 91813777..9b2d144d 100644 --- a/signer/sign_beacon_block_test.go +++ b/signer/sign_beacon_block_test.go @@ -16,10 +16,10 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/stretchr/testify/require" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - prot "github.com/bloxapp/eth2-key-manager/slashing_protection" - "github.com/bloxapp/eth2-key-manager/wallets" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + prot "github.com/ssvlabs/eth2-key-manager/slashing_protection" + "github.com/ssvlabs/eth2-key-manager/wallets" ) func testBlock(t *testing.T) *phase0.BeaconBlock { diff --git a/signer/sign_blinded_beacon_block_test.go b/signer/sign_blinded_beacon_block_test.go index 2b22423b..12b64130 100644 --- a/signer/sign_blinded_beacon_block_test.go +++ b/signer/sign_blinded_beacon_block_test.go @@ -16,10 +16,10 @@ import ( "github.com/attestantio/go-eth2-client/spec/deneb" "github.com/stretchr/testify/require" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - prot "github.com/bloxapp/eth2-key-manager/slashing_protection" - "github.com/bloxapp/eth2-key-manager/wallets" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + prot "github.com/ssvlabs/eth2-key-manager/slashing_protection" + "github.com/ssvlabs/eth2-key-manager/wallets" ) // tested against a ... diff --git a/signer/sign_block.go b/signer/sign_block.go index 616a9369..0f35c91b 100644 --- a/signer/sign_block.go +++ b/signer/sign_block.go @@ -7,7 +7,7 @@ import ( ssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) // SignBlock signs the given beacon block diff --git a/signer/sign_slot_and_epoch_test.go b/signer/sign_slot_and_epoch_test.go index aefd5113..78bd8cf8 100644 --- a/signer/sign_slot_and_epoch_test.go +++ b/signer/sign_slot_and_epoch_test.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - prot "github.com/bloxapp/eth2-key-manager/slashing_protection" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" - "github.com/bloxapp/eth2-key-manager/wallets" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + prot "github.com/ssvlabs/eth2-key-manager/slashing_protection" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" + "github.com/ssvlabs/eth2-key-manager/wallets" ) func inmemStorage() *inmemory.InMemStore { diff --git a/signer/validator_signer.go b/signer/validator_signer.go index b5e0d7c5..29468089 100644 --- a/signer/validator_signer.go +++ b/signer/validator_signer.go @@ -11,7 +11,7 @@ import ( ssz "github.com/ferranbt/fastssz" "github.com/google/uuid" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) // ValidatorSigner represents the behavior of the validator signer diff --git a/slashing_protection/README.md b/slashing_protection/README.md index 1077cc5b..27ae4e0d 100644 --- a/slashing_protection/README.md +++ b/slashing_protection/README.md @@ -10,7 +10,7 @@ Slashing can occur for validators proposing a block or signing attestations whic #### Attestation - Double Vote Description: Do not sign 2 attestations for the same block height. [eth 2 spec](https://github.com/ethereum/eth2.0-specs/blob/dev/specs/phase0/validator.md#attester-slashing). -![](https://github.com/bloxapp/eth2-key-manager/blob/master/slashing_protection/images/Screen%20Shot%202020-06-01%20at%208.51.17.png?raw=true) +![](https://github.com/ssvlabs/eth2-key-manager/blob/master/slashing_protection/images/Screen%20Shot%202020-06-01%20at%208.51.17.png?raw=true) ```python def is_slashable_attestation_data(data_1: AttestationData, data_2: AttestationData) -> bool: @@ -28,12 +28,12 @@ Description: Do not surround an already existing attestation/s, a.k.a do not for Surrounded: -![](https://github.com/bloxapp/eth2-key-manager/blob/master/slashing_protection/images/Screen%20Shot%202020-06-01%20at%208.51.21.png?raw=true) +![](https://github.com/ssvlabs/eth2-key-manager/blob/master/slashing_protection/images/Screen%20Shot%202020-06-01%20at%208.51.21.png?raw=true) Surrounding: -![](https://github.com/bloxapp/eth2-key-manager/blob/master/slashing_protection/images/Screen%20Shot%202020-06-01%20at%208.51.27.png?raw=true) +![](https://github.com/ssvlabs/eth2-key-manager/blob/master/slashing_protection/images/Screen%20Shot%202020-06-01%20at%208.51.27.png?raw=true) ```python diff --git a/slashing_protection/attestation_protection_test.go b/slashing_protection/attestation_protection_test.go index 88c2741f..fba725b4 100644 --- a/slashing_protection/attestation_protection_test.go +++ b/slashing_protection/attestation_protection_test.go @@ -7,7 +7,7 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) func setupAttestation(t *testing.T, withAttestationData bool) (core.SlashingProtector, []core.ValidatorAccount) { diff --git a/slashing_protection/no_protection.go b/slashing_protection/no_protection.go index 0c54b2e7..e0a82bae 100644 --- a/slashing_protection/no_protection.go +++ b/slashing_protection/no_protection.go @@ -3,7 +3,7 @@ package slashingprotection import ( "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) // NoProtection implements slashing protector interface with dummy implementation diff --git a/slashing_protection/normal_protection.go b/slashing_protection/normal_protection.go index 17b97504..d382baca 100644 --- a/slashing_protection/normal_protection.go +++ b/slashing_protection/normal_protection.go @@ -4,7 +4,7 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) // NormalProtection implements normal protection logic diff --git a/slashing_protection/proposal_protection_test.go b/slashing_protection/proposal_protection_test.go index cec90e07..da756ef5 100644 --- a/slashing_protection/proposal_protection_test.go +++ b/slashing_protection/proposal_protection_test.go @@ -7,9 +7,9 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/stretchr/testify/require" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/inmemory" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/inmemory" ) func _byteArray(input string) []byte { diff --git a/stores/README.md b/stores/README.md index f3c31d2c..1ec5b5f0 100644 --- a/stores/README.md +++ b/stores/README.md @@ -11,7 +11,7 @@ Currently there are the following implementations: #### Develop you own store You could develop you own store, for example saving it to an S3, local file system and so on. -To implement a store, simple override the methods below from [here](https://github.com/bloxapp/eth2-key-manager/blob/master/core/storage.go) +To implement a store, simple override the methods below from [here](https://github.com/ssvlabs/eth2-key-manager/blob/master/core/storage.go) ```go // Implements methods to store and retrieve data // Any encryption is done on the implementation level but is not obligatory diff --git a/stores/dummy/storage.go b/stores/dummy/storage.go index 27333e72..fe88c7c1 100644 --- a/stores/dummy/storage.go +++ b/stores/dummy/storage.go @@ -3,8 +3,8 @@ package dummy import ( "github.com/google/uuid" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/encryptor" ) // Storage is the storage mock diff --git a/stores/inmemory/marshalable.go b/stores/inmemory/marshalable.go index 4ec12677..75d2ce36 100644 --- a/stores/inmemory/marshalable.go +++ b/stores/inmemory/marshalable.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" - hd2 "github.com/bloxapp/eth2-key-manager/wallets/hd" - "github.com/bloxapp/eth2-key-manager/wallets/nd" + "github.com/ssvlabs/eth2-key-manager/core" + hd2 "github.com/ssvlabs/eth2-key-manager/wallets/hd" + "github.com/ssvlabs/eth2-key-manager/wallets/nd" ) // MarshalJSON is the custom JSON marshaler diff --git a/stores/inmemory/marshalable_test.go b/stores/inmemory/marshalable_test.go index d20a093c..f02d78c4 100644 --- a/stores/inmemory/marshalable_test.go +++ b/stores/inmemory/marshalable_test.go @@ -9,10 +9,10 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/wallets" - "github.com/bloxapp/eth2-key-manager/wallets/hd" - "github.com/bloxapp/eth2-key-manager/wallets/nd" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/wallets" + "github.com/ssvlabs/eth2-key-manager/wallets/hd" + "github.com/ssvlabs/eth2-key-manager/wallets/nd" ) func _byteArray32(input string) [32]byte { diff --git a/stores/inmemory/slashing_test.go b/stores/inmemory/slashing_test.go index ec3f9bea..8fe9da8a 100644 --- a/stores/inmemory/slashing_test.go +++ b/stores/inmemory/slashing_test.go @@ -9,7 +9,7 @@ import ( "github.com/herumi/bls-eth-go-binary/bls" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) func _bigInt(input string) *big.Int { diff --git a/stores/inmemory/store.go b/stores/inmemory/store.go index bd08177b..f7892380 100644 --- a/stores/inmemory/store.go +++ b/stores/inmemory/store.go @@ -7,9 +7,9 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" - encryptor2 "github.com/bloxapp/eth2-key-manager/encryptor" - "github.com/bloxapp/eth2-key-manager/wallets" + "github.com/ssvlabs/eth2-key-manager/core" + encryptor2 "github.com/ssvlabs/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/wallets" ) // InMemStore implements core.Storage using in-memory store. diff --git a/stores/inmemory/store_test.go b/stores/inmemory/store_test.go index a78653a0..7f79085e 100644 --- a/stores/inmemory/store_test.go +++ b/stores/inmemory/store_test.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - eth2keymanager "github.com/bloxapp/eth2-key-manager" - "github.com/bloxapp/eth2-key-manager/core" - encryptor2 "github.com/bloxapp/eth2-key-manager/encryptor" - "github.com/bloxapp/eth2-key-manager/encryptor/keystorev4" - "github.com/bloxapp/eth2-key-manager/wallets/hd" + eth2keymanager "github.com/ssvlabs/eth2-key-manager" + "github.com/ssvlabs/eth2-key-manager/core" + encryptor2 "github.com/ssvlabs/eth2-key-manager/encryptor" + "github.com/ssvlabs/eth2-key-manager/encryptor/keystorev4" + "github.com/ssvlabs/eth2-key-manager/wallets/hd" ) func _byteArray(input string) []byte { diff --git a/wallets/account.go b/wallets/account.go index 37d6ba42..06bcc71a 100644 --- a/wallets/account.go +++ b/wallets/account.go @@ -9,8 +9,8 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" - eth1deposit "github.com/bloxapp/eth2-key-manager/eth1_deposit" + "github.com/ssvlabs/eth2-key-manager/core" + eth1deposit "github.com/ssvlabs/eth2-key-manager/eth1_deposit" ) // HDAccount represents HD account diff --git a/wallets/account_test.go b/wallets/account_test.go index edcbd244..85927dab 100644 --- a/wallets/account_test.go +++ b/wallets/account_test.go @@ -9,8 +9,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/dummy" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/dummy" ) func _byteArray(input string) []byte { diff --git a/wallets/hd/wallet.go b/wallets/hd/wallet.go index 358f33f3..5347c41e 100644 --- a/wallets/hd/wallet.go +++ b/wallets/hd/wallet.go @@ -9,8 +9,8 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/wallets" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/wallets" ) // Default values according to https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2334.md diff --git a/wallets/hd/wallet_test.go b/wallets/hd/wallet_test.go index f78c77eb..0c5fb5c2 100644 --- a/wallets/hd/wallet_test.go +++ b/wallets/hd/wallet_test.go @@ -9,8 +9,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/dummy" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/dummy" ) func storage() core.Storage { diff --git a/wallets/nd/wallet.go b/wallets/nd/wallet.go index d8ff5070..b06a236a 100644 --- a/wallets/nd/wallet.go +++ b/wallets/nd/wallet.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/bloxapp/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/core" ) // Predefined errors diff --git a/wallets/nd/wallet_test.go b/wallets/nd/wallet_test.go index b08d1dc1..a8b481d3 100644 --- a/wallets/nd/wallet_test.go +++ b/wallets/nd/wallet_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/bloxapp/eth2-key-manager/core" - "github.com/bloxapp/eth2-key-manager/stores/dummy" + "github.com/ssvlabs/eth2-key-manager/core" + "github.com/ssvlabs/eth2-key-manager/stores/dummy" ) func storage() core.Storage {