github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename imported keymanager to local. (#10155)

Browse Source 
* imported -> local

* reverting to the state of the PR at eb1e3c3d1

* use changes from develop

* del

* rem patch

* patch

* rename to local

* gazelle

* add back build

* imported rename

* gaz

* local

* merge fix + remove proto changes

* comment revert

* build

* gofmt and one new reference

* gofmt pt2

* Update validator/accounts/wallet_edit.go

Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com>

* Update validator/rpc/accounts.go

* rename

* gaz

Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>
Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com>
Co-authored-by: james-prysm <90280386+james-prysm@users.noreply.github.com>
This commit is contained in:
Michael Neuder
2022-02-01 14:54:19 -05:00
committed by GitHub
parent 59be30e9f4
commit 8b2b109939
49 changed files with 214 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/interop/split-keys/BUILD.bazel
View File

@@ -11,7 +11,7 @@ go_library(
"//validator/accounts/wallet:go_default_library",
"//validator/keymanager:go_default_library",
"//validator/keymanager/derived:go_default_library",
"//validator/keymanager/imported:go_default_library",
"//validator/keymanager/local:go_default_library",
"@com_github_tyler_smith_go_bip39//:go_default_library",
"@com_github_wealdtech_go_eth2_util//:go_default_library",
],
@@ -31,6 +31,6 @@ go_test(
"//testing/require:go_default_library",
"//validator/accounts/wallet:go_default_library",
"//validator/keymanager:go_default_library",
"//validator/keymanager/imported:go_default_library",
"//validator/keymanager/local:go_default_library",
],
)

10
tools/interop/split-keys/main.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
"github.com/prysmaticlabs/prysm/validator/keymanager"
"github.com/prysmaticlabs/prysm/validator/keymanager/derived"
"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
"github.com/prysmaticlabs/prysm/validator/keymanager/local"
"github.com/tyler-smith/go-bip39"
util "github.com/wealdtech/go-eth2-util"
)
@@ -62,7 +62,7 @@ func main() {
}
keysPerWallet := len(privKeys) / *numberOfWalletsFlag
if err := spreadKeysAcrossImportedWallets(
if err := spreadKeysAcrossLocalWallets(
pubKeys,
privKeys,
*numberOfWalletsFlag,
@@ -113,7 +113,7 @@ func generateKeysFromMnemonicList(mnemonicListFile *bufio.Scanner, keysPerMnemon
return
}
func spreadKeysAcrossImportedWallets(
func spreadKeysAcrossLocalWallets(
pubKeys,
privKeys [][]byte,
numWallets,
@@ -125,10 +125,10 @@ func spreadKeysAcrossImportedWallets(
for i := 0; i < numWallets; i++ {
w := wallet.New(&wallet.Config{
WalletDir: path.Join(walletOutputDir, fmt.Sprintf("wallet_%d", i)),
KeymanagerKind: keymanager.Imported,
KeymanagerKind: keymanager.Local,
WalletPassword: walletPassword,
})
km, err := imported.NewKeymanager(ctx, &imported.SetupConfig{
km, err := local.NewKeymanager(ctx, &local.SetupConfig{
Wallet: w,
})
if err != nil {

8
tools/interop/split-keys/main_test.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/prysmaticlabs/prysm/testing/require"
"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
"github.com/prysmaticlabs/prysm/validator/keymanager"
"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
"github.com/prysmaticlabs/prysm/validator/keymanager/local"
)
const testMnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
@@ -64,7 +64,7 @@ func Test_spreadKeysAcrossImportedWallets(t *testing.T) {
// key per wallet stored on disk.
numWallets := 5
keysPerWallet := 1
err := spreadKeysAcrossImportedWallets(
err := spreadKeysAcrossLocalWallets(
testPubKeys,
testPrivKeys,
numWallets,
@@ -77,11 +77,11 @@ func Test_spreadKeysAcrossImportedWallets(t *testing.T) {
for i := 0; i < numWallets; i++ {
w, err := wallet.OpenWallet(ctx, &wallet.Config{
WalletDir: filepath.Join(tmpDir, fmt.Sprintf("wallet_%d", i)),
KeymanagerKind: keymanager.Imported,
KeymanagerKind: keymanager.Local,
WalletPassword: walletPassword,
})
require.NoError(t, err)
km, err := imported.NewKeymanager(ctx, &imported.SetupConfig{
km, err := local.NewKeymanager(ctx, &local.SetupConfig{
Wallet: w,
})
require.NoError(t, err)