LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

rpc: update rpc servers to default to waddrmgr.KeyScopeBIP0044

Browse source
This commit is contained in:
Olaoluwa Osuntokun 2018-02-13 21:36:11 -08:00
parent 3ca68d8259
commit 115d7d17f2
2 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
rpc/legacyrpc/methods.go
View file

@ -412,7 +412,7 @@ func dumpWallet(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
func getAddressesByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) { func getAddressesByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.GetAddressesByAccountCmd) cmd := icmd.(*btcjson.GetAddressesByAccountCmd)
account, err := w.AccountNumber(cmd.Account) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, cmd.Account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -448,7 +448,7 @@ func getBalance(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
} }
} else { } else {
var account uint32 var account uint32
account, err = w.AccountNumber(accountName) account, err = w.AccountNumber(waddrmgr.KeyScopeBIP0044, accountName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -551,7 +551,7 @@ func getAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
return nil, &ErrAddressNotInWallet return nil, &ErrAddressNotInWallet
} }
acctName, err := w.AccountName(account) acctName, err := w.AccountName(waddrmgr.KeyScopeBIP0044, account)
if err != nil { if err != nil {
return nil, &ErrAccountNameNotFound return nil, &ErrAccountNameNotFound
} }
@ -567,11 +567,11 @@ func getAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
func getAccountAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) { func getAccountAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.GetAccountAddressCmd) cmd := icmd.(*btcjson.GetAccountAddressCmd)
account, err := w.AccountNumber(cmd.Account) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, cmd.Account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
addr, err := w.CurrentAddress(account) addr, err := w.CurrentAddress(account, waddrmgr.KeyScopeBIP0044)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -588,7 +588,7 @@ func getUnconfirmedBalance(icmd interface{}, w *wallet.Wallet) (interface{}, err
if cmd.Account != nil { if cmd.Account != nil {
acctName = *cmd.Account acctName = *cmd.Account
} }
account, err := w.AccountNumber(acctName) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, acctName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -627,7 +627,7 @@ func importPrivKey(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
} }
// Import the private key, handling any errors. // Import the private key, handling any errors.
_, err = w.ImportPrivateKey(wif, nil, *cmd.Rescan) _, err = w.ImportPrivateKey(waddrmgr.KeyScopeBIP0044, wif, nil, *cmd.Rescan)
switch { switch {
case waddrmgr.IsError(err, waddrmgr.ErrDuplicateAddress): case waddrmgr.IsError(err, waddrmgr.ErrDuplicateAddress):
// Do not return duplicate key errors to the client. // Do not return duplicate key errors to the client.
@ -657,7 +657,7 @@ func createNewAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
return nil, &ErrReservedAccountName return nil, &ErrReservedAccountName
} }
_, err := w.NextAccount(cmd.Account) _, err := w.NextAccount(waddrmgr.KeyScopeBIP0044, cmd.Account)
if waddrmgr.IsError(err, waddrmgr.ErrLocked) { if waddrmgr.IsError(err, waddrmgr.ErrLocked) {
return nil, &btcjson.RPCError{ return nil, &btcjson.RPCError{
Code: btcjson.ErrRPCWalletUnlockNeeded, Code: btcjson.ErrRPCWalletUnlockNeeded,
@ -680,11 +680,11 @@ func renameAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
} }
// Check that given account exists // Check that given account exists
account, err := w.AccountNumber(cmd.OldAccount) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, cmd.OldAccount)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return nil, w.RenameAccount(account, cmd.NewAccount) return nil, w.RenameAccount(waddrmgr.KeyScopeBIP0044, account, cmd.NewAccount)
} }
// getNewAddress handles a getnewaddress request by returning a new // getNewAddress handles a getnewaddress request by returning a new
@ -699,11 +699,11 @@ func getNewAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
if cmd.Account != nil { if cmd.Account != nil {
acctName = *cmd.Account acctName = *cmd.Account
} }
account, err := w.AccountNumber(acctName) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, acctName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
addr, err := w.NewAddress(account, waddrmgr.PubKeyHash) addr, err := w.NewAddress(account, waddrmgr.KeyScopeBIP0044)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -724,11 +724,11 @@ func getRawChangeAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error
if cmd.Account != nil { if cmd.Account != nil {
acctName = *cmd.Account acctName = *cmd.Account
} }
account, err := w.AccountNumber(acctName) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, acctName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
addr, err := w.NewChangeAddress(account, waddrmgr.PubKeyHash) addr, err := w.NewChangeAddress(account, waddrmgr.KeyScopeBIP0044)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -742,7 +742,7 @@ func getRawChangeAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error
func getReceivedByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) { func getReceivedByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.GetReceivedByAccountCmd) cmd := icmd.(*btcjson.GetReceivedByAccountCmd)
account, err := w.AccountNumber(cmd.Account) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, cmd.Account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -750,7 +750,9 @@ func getReceivedByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, erro
// TODO: This is more inefficient that it could be, but the entire // TODO: This is more inefficient that it could be, but the entire
// algorithm is already dominated by reading every transaction in the // algorithm is already dominated by reading every transaction in the
// wallet's history. // wallet's history.
results, err := w.TotalReceivedForAccounts(int32(*cmd.MinConf)) results, err := w.TotalReceivedForAccounts(
waddrmgr.KeyScopeBIP0044, int32(*cmd.MinConf),
)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -893,7 +895,7 @@ func getTransaction(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
address = addr.EncodeAddress() address = addr.EncodeAddress()
account, err := w.AccountOfAddress(addr) account, err := w.AccountOfAddress(addr)
if err == nil { if err == nil {
name, err := w.AccountName(account) name, err := w.AccountName(waddrmgr.KeyScopeBIP0044, account)
if err == nil { if err == nil {
accountName = name accountName = name
} }
@ -1042,7 +1044,7 @@ func listAccounts(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.ListAccountsCmd) cmd := icmd.(*btcjson.ListAccountsCmd)
accountBalances := map[string]float64{} accountBalances := map[string]float64{}
results, err := w.AccountBalances(int32(*cmd.MinConf)) results, err := w.AccountBalances(waddrmgr.KeyScopeBIP0044, int32(*cmd.MinConf))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1072,7 +1074,9 @@ func listLockUnspent(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
func listReceivedByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) { func listReceivedByAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.ListReceivedByAccountCmd) cmd := icmd.(*btcjson.ListReceivedByAccountCmd)
results, err := w.TotalReceivedForAccounts(int32(*cmd.MinConf)) results, err := w.TotalReceivedForAccounts(
waddrmgr.KeyScopeBIP0044, int32(*cmd.MinConf),
)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1419,7 +1423,9 @@ func sendFrom(icmd interface{}, w *wallet.Wallet, chainClient *chain.RPCClient)
} }
} }
account, err := w.AccountNumber(cmd.FromAccount) account, err := w.AccountNumber(
waddrmgr.KeyScopeBIP0044, cmd.FromAccount,
)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1462,7 +1468,7 @@ func sendMany(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
} }
} }
account, err := w.AccountNumber(cmd.FromAccount) account, err := w.AccountNumber(waddrmgr.KeyScopeBIP0044, cmd.FromAccount)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1768,7 +1774,7 @@ func validateAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
// The address lookup was successful which means there is further // The address lookup was successful which means there is further
// information about it available and it is "mine". // information about it available and it is "mine".
result.IsMine = true result.IsMine = true
acctName, err := w.AccountName(ainfo.Account()) acctName, err := w.AccountName(waddrmgr.KeyScopeBIP0044, ainfo.Account())
if err != nil { if err != nil {
return nil, &ErrAccountNameNotFound return nil, &ErrAccountNameNotFound
} }

16
rpc/rpcserver/server.go
View file

@ -151,7 +151,7 @@ func (s *walletServer) Network(ctx context.Context, req *pb.NetworkRequest) (
func (s *walletServer) AccountNumber(ctx context.Context, req *pb.AccountNumberRequest) ( func (s *walletServer) AccountNumber(ctx context.Context, req *pb.AccountNumberRequest) (
*pb.AccountNumberResponse, error) { *pb.AccountNumberResponse, error) {
accountNum, err := s.wallet.AccountNumber(req.AccountName) accountNum, err := s.wallet.AccountNumber(waddrmgr.KeyScopeBIP0044, req.AccountName)
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }
@ -162,7 +162,7 @@ func (s *walletServer) AccountNumber(ctx context.Context, req *pb.AccountNumberR
func (s *walletServer) Accounts(ctx context.Context, req *pb.AccountsRequest) ( func (s *walletServer) Accounts(ctx context.Context, req *pb.AccountsRequest) (
*pb.AccountsResponse, error) { *pb.AccountsResponse, error) {
resp, err := s.wallet.Accounts() resp, err := s.wallet.Accounts(waddrmgr.KeyScopeBIP0044)
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }
@ -188,7 +188,7 @@ func (s *walletServer) Accounts(ctx context.Context, req *pb.AccountsRequest) (
func (s *walletServer) RenameAccount(ctx context.Context, req *pb.RenameAccountRequest) ( func (s *walletServer) RenameAccount(ctx context.Context, req *pb.RenameAccountRequest) (
*pb.RenameAccountResponse, error) { *pb.RenameAccountResponse, error) {
err := s.wallet.RenameAccount(req.AccountNumber, req.NewName) err := s.wallet.RenameAccount(waddrmgr.KeyScopeBIP0044, req.AccountNumber, req.NewName)
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }
@ -214,7 +214,7 @@ func (s *walletServer) NextAccount(ctx context.Context, req *pb.NextAccountReque
return nil, translateError(err) return nil, translateError(err)
} }
account, err := s.wallet.NextAccount(req.AccountName) account, err := s.wallet.NextAccount(waddrmgr.KeyScopeBIP0044, req.AccountName)
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }
@ -231,9 +231,9 @@ func (s *walletServer) NextAddress(ctx context.Context, req *pb.NextAddressReque
) )
switch req.Kind { switch req.Kind {
case pb.NextAddressRequest_BIP0044_EXTERNAL: case pb.NextAddressRequest_BIP0044_EXTERNAL:
addr, err = s.wallet.NewAddress(req.Account, waddrmgr.PubKeyHash) addr, err = s.wallet.NewAddress(req.Account, waddrmgr.KeyScopeBIP0044)
case pb.NextAddressRequest_BIP0044_INTERNAL: case pb.NextAddressRequest_BIP0044_INTERNAL:
addr, err = s.wallet.NewChangeAddress(req.Account, waddrmgr.PubKeyHash) addr, err = s.wallet.NewChangeAddress(req.Account, waddrmgr.KeyScopeBIP0044)
default: default:
return nil, grpc.Errorf(codes.InvalidArgument, "kind=%v", req.Kind) return nil, grpc.Errorf(codes.InvalidArgument, "kind=%v", req.Kind)
} }
@ -271,7 +271,7 @@ func (s *walletServer) ImportPrivateKey(ctx context.Context, req *pb.ImportPriva
"Only the imported account accepts private key imports") "Only the imported account accepts private key imports")
} }
_, err = s.wallet.ImportPrivateKey(wif, nil, req.Rescan) _, err = s.wallet.ImportPrivateKey(waddrmgr.KeyScopeBIP0044, wif, nil, req.Rescan)
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }
@ -349,7 +349,7 @@ func (s *walletServer) FundTransaction(ctx context.Context, req *pb.FundTransact
var changeScript []byte var changeScript []byte
if req.IncludeChangeScript && totalAmount > btcutil.Amount(req.TargetAmount) { if req.IncludeChangeScript && totalAmount > btcutil.Amount(req.TargetAmount) {
changeAddr, err := s.wallet.NewChangeAddress(req.Account, waddrmgr.PubKeyHash) changeAddr, err := s.wallet.NewChangeAddress(req.Account, waddrmgr.KeyScopeBIP0044)
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }