Skip to content

Commit

Permalink
Merge pull request #109 from ssvlabs/chore/replace-bloxapp-to-ssvlabs
Browse files Browse the repository at this point in the history
Replaced all bloxapp instances to ssvlabs
  • Loading branch information
Roy-blox authored Oct 31, 2024
2 parents e6bc06b + 8b9f7c9 commit 2034a83
Show file tree
Hide file tree
Showing 93 changed files with 214 additions and 286 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 2019 Blox.io
Copyright (C) 2019 ssvlabs.io

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

<program> Copyright (C) 2019 Blox.io
<program> Copyright (C) 2019 ssvlabs.io
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# Blox Eth Key Manager
# Eth Key Manager

<!-- [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fbloxapp%2Feth2-key-manager.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fbloxapp%2Feth2-key-manager?ref=badge_shield) -->

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)
Eth Key Manager is a library wrapping all major functionality an eth 2.0 validator will need:
- [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
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/config/currentepoch.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/config/currentslot.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/config/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/config/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/mnemonic/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/mnemonic/generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/mnemonic/handler/handler.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/mnemonic/handler/handler_generate.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/mnemonic/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/seed/flag/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/seed/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/seed/generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/seed/handler/handler.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/seed/handler/handler_generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/seed/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/wallet/cmd/account/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/wallet/cmd/account/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/wallet/cmd/account/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/wallet/cmd/account/credentials_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/wallet/cmd/account/deposit-data.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/wallet/cmd/account/deposit-data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/wallet/cmd/account/flag/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/wallet/cmd/account/flag/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/wallet/cmd/account/flag/deposit-data.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/wallet/cmd/account/flag/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/wallet/cmd/account/flag/voluntary_exit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/wallet/cmd/account/handler/handler.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
10 changes: 5 additions & 5 deletions cli/cmd/wallet/cmd/account/handler/handler_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions cli/cmd/wallet/cmd/account/handler/handler_credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 2034a83

Please sign in to comment.