From 0803f0f0ff33434d935fc1c296f99f1a1f88198b Mon Sep 17 00:00:00 2001 From: Jim McDonald Date: Thu, 16 Apr 2020 22:56:13 +0100 Subject: [PATCH] Update wallet keymanager for v0.11 (#5453) * Update wallet keystore for spec 0.11 * Add herumi * Use local herumi * Merge branch 'master' into wallet-update * Updates after feedback * Merge branch 'wallet-update' of github.com:mcdee/prysm into wallet-update * Merge branch 'master' into wallet-update * Update WORKSPACE --- WORKSPACE | 55 ++++++++++++++-------- third_party/herumi/bls_eth_go_binary.BUILD | 1 + validator/keymanager/BUILD.bazel | 4 +- validator/keymanager/wallet.go | 4 +- 4 files changed, 40 insertions(+), 24 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 72a88ed0ce5c..a610503de351 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1508,74 +1508,89 @@ go_repository( go_repository( name = "com_github_wealdtech_go_eth2_wallet", - commit = "6970d62e60d86fdae3c3e510e800e8a60d755a7d", importpath = "github.com/wealdtech/go-eth2-wallet", + sum = "h1:Hna/w4EKBJIs86VprIq7ez063A6kwk31d/O3Gs+MpYc=", + version = "v1.9.3", ) go_repository( - name = "com_github_wealdtech_go_eth2_wallet_hd", - commit = "ce0a252a01c621687e9786a64899cfbfe802ba73", - importpath = "github.com/wealdtech/go-eth2-wallet-hd", + name = "com_github_wealdtech_go_eth2_wallet_hd_v2", + importpath = "github.com/wealdtech/go-eth2-wallet-hd/v2", + sum = "h1:kiCvdexK3zRC2GwZHSHq+hS+irVNtMs5pNADyumeeRM=", + version = "v2.0.1", ) go_repository( - name = "com_github_wealdtech_go_eth2_wallet_nd", - commit = "12c8c41cdbd16797ff292e27f58e126bb89e9706", - importpath = "github.com/wealdtech/go-eth2-wallet-nd", + name = "com_github_wealdtech_go_eth2_wallet_nd_v2", + importpath = "github.com/wealdtech/go-eth2-wallet-nd/v2", + sum = "h1:4lB6GY5oHQn5xwn/Sxm1e9SeVCaxa7q/0hqXUQYUNwU=", + version = "v2.0.1", ) go_repository( name = "com_github_wealdtech_go_eth2_wallet_store_filesystem", - commit = "1eea6a48d75380047d2ebe7c8c4bd8985bcfdeca", importpath = "github.com/wealdtech/go-eth2-wallet-store-filesystem", + sum = "h1:Lc6wVTjIYeD+2hLAIzq1SugTWR527vEX4tEr5v3zxJc=", + version = "v1.7.2", ) go_repository( name = "com_github_wealdtech_go_eth2_wallet_store_s3", - commit = "1c821b5161f7bb0b3efa2030eff687eea5e70e53", importpath = "github.com/wealdtech/go-eth2-wallet-store-s3", + sum = "h1:xzyQDxbe5nr7xG0ByevTV2S8qkeOZvvjp+leBJcpxXQ=", + version = "v1.6.2", ) go_repository( name = "com_github_wealdtech_go_eth2_wallet_encryptor_keystorev4", - commit = "0c11c07b9544eb662210fadded94f40f309d8c8f", importpath = "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4", + sum = "h1:IcpS4VpXhYz+TVupB5n6C6IQzaKwG+Rc8nvgCa/da4c=", + version = "v1.0.0", ) go_repository( - name = "com_github_wealdtech_go_eth2_wallet_types", - commit = "af67d8101be61e7c4dd8126d2b3eba20cff5dab2", - importpath = "github.com/wealdtech/go-eth2-wallet-types", + name = "com_github_wealdtech_go_eth2_wallet_types_v2", + importpath = "github.com/wealdtech/go-eth2-wallet-types/v2", + sum = "h1:Ct3RrNJTapBiG2GxVl53Kfgy96f0GEUV7bediTu91u8=", + version = "v2.0.1", ) go_repository( - name = "com_github_wealdtech_go_eth2_types", - commit = "f9c31ddf180537dd5712d5998a3d56c45864d71f", - importpath = "github.com/wealdtech/go-eth2-types", + name = "com_github_wealdtech_go_eth2_types_v2", + importpath = "github.com/wealdtech/go-eth2-types/v2", + sum = "h1:qfmgaCBkH2N11LHCXsRWYz7OOxc+1QXrKHlS9yDnFsw=", + version = "v2.3.0", + build_directives = [ + "gazelle:resolve go github.com/herumi/bls-eth-go-binary/bls @herumi_bls_eth_go_binary//:go_default_library", + ], ) go_repository( name = "com_github_wealdtech_go_eth2_util", - commit = "326ebb1755651131bb8f4506ea9a23be6d9ad1dd", importpath = "github.com/wealdtech/go-eth2-util", + sum = "h1:MyM16V7Qhd9q2ZaRa0WteBg2bWb8UplIKjZr8aeBZP0=", + version = "v1.1.4", ) go_repository( name = "com_github_wealdtech_go_ecodec", - commit = "7473d835445a3490e61a5fcf48fe4e9755a37957", importpath = "github.com/wealdtech/go-ecodec", + sum = "h1:yggrTSckcPJRaxxOxQF7FPm21kgE8WA6+f5jdq5Kr8o=", + version = "v1.1.0", ) go_repository( name = "com_github_wealdtech_go_bytesutil", - commit = "e564d0ade555b9f97494f0f669196ddcc6bc531d", importpath = "github.com/wealdtech/go-bytesutil", + sum = "h1:ocEg3Ke2GkZ4vQw5lp46rmO+pfqCCTgq35gqOy8JKVc=", + version = "v1.1.1", ) go_repository( name = "com_github_wealdtech_go_indexer", - commit = "334862c32b1e3a5c6738a2618f5c0a8ebeb8cd51", importpath = "github.com/wealdtech/go-indexer", + sum = "h1:/S4rfWQbSOnnYmwnvuTVatDibZ8o1s9bmTCHO16XINg=", + version = "v1.0.0", ) go_repository( diff --git a/third_party/herumi/bls_eth_go_binary.BUILD b/third_party/herumi/bls_eth_go_binary.BUILD index 6e2625123bdb..62ad0b2c89d6 100644 --- a/third_party/herumi/bls_eth_go_binary.BUILD +++ b/third_party/herumi/bls_eth_go_binary.BUILD @@ -146,5 +146,6 @@ go_library( visibility = [ # Additional access will require security approval. "@prysm//shared/bls:__pkg__", + "@com_github_wealdtech_go_eth2_types_v2//:__pkg__", ], ) diff --git a/validator/keymanager/BUILD.bazel b/validator/keymanager/BUILD.bazel index 65cdb2b70d18..384ded3119c3 100644 --- a/validator/keymanager/BUILD.bazel +++ b/validator/keymanager/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "@com_github_wealdtech_eth2_signer_api//pb/v1:go_default_library", "@com_github_wealdtech_go_eth2_wallet//:go_default_library", "@com_github_wealdtech_go_eth2_wallet_store_filesystem//:go_default_library", - "@com_github_wealdtech_go_eth2_wallet_types//:go_default_library", + "@com_github_wealdtech_go_eth2_wallet_types_v2//:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//credentials:go_default_library", "@org_golang_x_crypto//ssh/terminal:go_default_library", @@ -48,7 +48,7 @@ go_test( "//shared/bytesutil:go_default_library", "//shared/testutil:go_default_library", "@com_github_wealdtech_go_eth2_wallet_encryptor_keystorev4//:go_default_library", - "@com_github_wealdtech_go_eth2_wallet_nd//:go_default_library", + "@com_github_wealdtech_go_eth2_wallet_nd_v2//:go_default_library", "@com_github_wealdtech_go_eth2_wallet_store_filesystem//:go_default_library", ], ) diff --git a/validator/keymanager/wallet.go b/validator/keymanager/wallet.go index 471cfdcc2e44..25dfd40cad05 100644 --- a/validator/keymanager/wallet.go +++ b/validator/keymanager/wallet.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/bytesutil" e2wallet "github.com/wealdtech/go-eth2-wallet" filesystem "github.com/wealdtech/go-eth2-wallet-store-filesystem" - e2wtypes "github.com/wealdtech/go-eth2-wallet-types" + e2wtypes "github.com/wealdtech/go-eth2-wallet-types/v2" ) type walletOpts struct { @@ -128,7 +128,7 @@ func (km *Wallet) Sign(pubKey [48]byte, root [32]byte) (*bls.Signature, error) { return nil, ErrNoSuchKey } // TODO(#4817) Update with new library to remove domain here. - sig, err := account.Sign(root[:], 0) + sig, err := account.Sign(root[:]) if err != nil { return nil, err }