Update deps to pull in latest gRPC release.

While here, pull in latest btcsuite and logrotate changes. Update for logrotate API changes.
2017-07-19 11:39:25 -04:00 · 2017-07-19 11:39:25 -04:00 · 8e723ea454
parent 4222c0464a
commit 8e723ea454
4 changed files with 725 additions and 32 deletions
--- a/glide.lock
+++ b/glide.lock
@ -1,10 +1,10 @@
-hash: 53f612188086bdf9b593439146ad12259c3cf85c21f568a1d0ea3076e81b2eca
-updated: 2017-06-20T09:17:18.9767533-04:00
+hash: 2fe59efc96b0a2839297653da88cde89208f8f8cf4ced2bb1e828def57e3611b
+updated: 2017-07-19T11:33:58.0769452-04:00
 imports:
 - name: github.com/boltdb/bolt
  version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9
 - name: github.com/btcsuite/btcd
-  version: a6965d493fdfb833b6b3a83c3958ab18968fe24e
+  version: 47885ab8702485be6b6f87a03d4f3be0bc5c982c
  subpackages:
  - blockchain
  - btcec
@ -15,11 +15,11 @@ imports:
  - txscript
  - wire
 - name: github.com/btcsuite/btclog
-  version: 266a29b6e5ad061d4c055cec1c0049e4aae47092
+  version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a
 - name: github.com/btcsuite/btcrpcclient
-  version: 45b9cb481d2aead4e80aab32d7aa86db386430ab
+  version: c72658166ae09457e6beb14e9112241e352ebd35
 - name: github.com/btcsuite/btcutil
-  version: 61ec18f9c8a4552c209416ce363592e35e416997
+  version: 5ffa719c3882fd2ec1e8b9f4978066701c31a343
  subpackages:
  - base58
  - hdkeychain
@ -40,21 +40,22 @@ imports:
 - name: github.com/btcsuite/websocket
  version: 31079b6807923eb23992c421b114992b95131b55
 - name: github.com/golang/protobuf
-  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
+  version: fec3b39b059c0f88fa6b20f5ed012b1aa203a8b4
  subpackages:
  - proto
+  - ptypes/any
 - name: github.com/jessevdk/go-flags
  version: 1679536dcc895411a9f5848d9a0250be7856448c
 - name: github.com/jrick/logrotate
-  version: 4ed05ed86ef17d10ff99cce77481e0fcf6f2c7b0
+  version: a93b200c26cbae3bb09dd0dc2c7c7fe1468a034a
  subpackages:
  - rotator
 - name: golang.org/x/crypto
-  version: adbae1b6b6fb4b02448a0fc0dbbc9ba2b95b294d
+  version: 84f24dfdf3c414ed893ca1b318d0045ef5a1f607
  subpackages:
  - ripemd160
 - name: golang.org/x/net
-  version: fe686d45ea04bc1bd4eff6a52865ce8757320325
+  version: 8663ed5da4fd087c3cfb99a996e628b72e2f0948
  subpackages:
  - context
  - http2
@ -64,26 +65,35 @@ imports:
  - lex/httplex
  - trace
 - name: golang.org/x/sys
-  version: fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a
+  version: cd2c276457edda6df7fb04895d3fd6a6add42926
  subpackages:
  - unix
 - name: golang.org/x/text
-  version: 4e9ab9ee170f2a39bd66c92b3e0a47ff47a4bc77
+  version: 6353ef0f924300eea566d3438817aa4d3374817e
  subpackages:
  - secure/bidirule
  - transform
  - unicode/bidi
  - unicode/norm
+- name: google.golang.org/genproto
+  version: 411e09b969b1170a9f0c467558eb4c4c110d9c77
+  subpackages:
+  - googleapis/rpc/status
 - name: google.golang.org/grpc
-  version: b7f1379d3cbbbeb2ca3405852012e237aa05459e
+  version: b15215fb911b24a5d61d57feec4233d610530464
  subpackages:
  - codes
  - credentials
+  - grpclb/grpc_lb_v1
  - grpclog
  - internal
+  - keepalive
  - metadata
  - naming
  - peer
+  - stats
+  - status
+  - tap
  - transport
 testImports:
 - name: github.com/davecgh/go-spew
--- a/glide.yaml
+++ b/glide.yaml
@ -32,7 +32,7 @@ import:
  subpackages:
  - context
 - package: google.golang.org/grpc
-  version: 1.0.3
+  version: ^1.0.3
  subpackages:
  - codes
  - credentials
--- a/log.go
+++ b/log.go
@ -6,7 +6,6 @@ package main

 import (
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"

@ -26,7 +25,7 @@ type logWriter struct{}

 func (logWriter) Write(p []byte) (n int, err error) {
 	os.Stdout.Write(p)
-	logRotatorPipe.Write(p)
+	logRotator.Write(p)
 	return len(p), nil
 }

@ -48,10 +47,6 @@ var (
 	// application shutdown.
 	logRotator *rotator.Rotator

-	// logRotatorPipe is the write-end pipe for writing to the log rotator.  It
-	// is written to by the Write method of the logWriter type.
-	logRotatorPipe *io.PipeWriter
-
 	log          = backendLog.Logger("BTCW")
 	walletLog    = backendLog.Logger("WLLT")
 	txmgrLog     = backendLog.Logger("TMGR")
@ -90,17 +85,13 @@ func initLogRotator(logFile string) {
 		fmt.Fprintf(os.Stderr, "failed to create log directory: %v\n", err)
 		os.Exit(1)
 	}
-	pr, pw := io.Pipe()
-	r, err := rotator.New(pr, logFile, 10*1024, false, 3)
+	r, err := rotator.New(logFile, 10*1024, false, 3)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to create file rotator: %v\n", err)
 		os.Exit(1)
 	}

-	go r.Run()
-
 	logRotator = r
-	logRotatorPipe = pw
 }

 // setLogLevel sets the logging level for provided subsystem.  Invalid
--- a/rpc/walletrpc/api.pb.go
+++ b/rpc/walletrpc/api.pb.go
@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: api.proto
-// DO NOT EDIT!

 /*
 Package walletrpc is a generated protocol buffer package.
@ -147,6 +146,48 @@ func (m *VersionResponse) String() string            { return proto.CompactTextS
 func (*VersionResponse) ProtoMessage()               {}
 func (*VersionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }

+func (m *VersionResponse) GetVersionString() string {
+	if m != nil {
+		return m.VersionString
+	}
+	return ""
+}
+
+func (m *VersionResponse) GetMajor() uint32 {
+	if m != nil {
+		return m.Major
+	}
+	return 0
+}
+
+func (m *VersionResponse) GetMinor() uint32 {
+	if m != nil {
+		return m.Minor
+	}
+	return 0
+}
+
+func (m *VersionResponse) GetPatch() uint32 {
+	if m != nil {
+		return m.Patch
+	}
+	return 0
+}
+
+func (m *VersionResponse) GetPrerelease() string {
+	if m != nil {
+		return m.Prerelease
+	}
+	return ""
+}
+
+func (m *VersionResponse) GetBuildMetadata() string {
+	if m != nil {
+		return m.BuildMetadata
+	}
+	return ""
+}
+
 type TransactionDetails struct {
 	Hash        []byte                       `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	Transaction []byte                       `protobuf:"bytes,2,opt,name=transaction,proto3" json:"transaction,omitempty"`
@ -161,6 +202,20 @@ func (m *TransactionDetails) String() string            { return proto.CompactTe
 func (*TransactionDetails) ProtoMessage()               {}
 func (*TransactionDetails) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }

+func (m *TransactionDetails) GetHash() []byte {
+	if m != nil {
+		return m.Hash
+	}
+	return nil
+}
+
+func (m *TransactionDetails) GetTransaction() []byte {
+	if m != nil {
+		return m.Transaction
+	}
+	return nil
+}
+
 func (m *TransactionDetails) GetDebits() []*TransactionDetails_Input {
 	if m != nil {
 		return m.Debits
@ -175,6 +230,20 @@ func (m *TransactionDetails) GetCredits() []*TransactionDetails_Output {
 	return nil
 }

+func (m *TransactionDetails) GetFee() int64 {
+	if m != nil {
+		return m.Fee
+	}
+	return 0
+}
+
+func (m *TransactionDetails) GetTimestamp() int64 {
+	if m != nil {
+		return m.Timestamp
+	}
+	return 0
+}
+
 type TransactionDetails_Input struct {
 	Index           uint32 `protobuf:"varint,1,opt,name=index" json:"index,omitempty"`
 	PreviousAccount uint32 `protobuf:"varint,2,opt,name=previous_account,json=previousAccount" json:"previous_account,omitempty"`
@ -186,6 +255,27 @@ func (m *TransactionDetails_Input) String() string            { return proto.Com
 func (*TransactionDetails_Input) ProtoMessage()               {}
 func (*TransactionDetails_Input) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }

+func (m *TransactionDetails_Input) GetIndex() uint32 {
+	if m != nil {
+		return m.Index
+	}
+	return 0
+}
+
+func (m *TransactionDetails_Input) GetPreviousAccount() uint32 {
+	if m != nil {
+		return m.PreviousAccount
+	}
+	return 0
+}
+
+func (m *TransactionDetails_Input) GetPreviousAmount() int64 {
+	if m != nil {
+		return m.PreviousAmount
+	}
+	return 0
+}
+
 type TransactionDetails_Output struct {
 	Index    uint32 `protobuf:"varint,1,opt,name=index" json:"index,omitempty"`
 	Account  uint32 `protobuf:"varint,2,opt,name=account" json:"account,omitempty"`
@ -197,6 +287,27 @@ func (m *TransactionDetails_Output) String() string            { return proto.Co
 func (*TransactionDetails_Output) ProtoMessage()               {}
 func (*TransactionDetails_Output) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }

+func (m *TransactionDetails_Output) GetIndex() uint32 {
+	if m != nil {
+		return m.Index
+	}
+	return 0
+}
+
+func (m *TransactionDetails_Output) GetAccount() uint32 {
+	if m != nil {
+		return m.Account
+	}
+	return 0
+}
+
+func (m *TransactionDetails_Output) GetInternal() bool {
+	if m != nil {
+		return m.Internal
+	}
+	return false
+}
+
 type BlockDetails struct {
 	Hash         []byte                `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	Height       int32                 `protobuf:"varint,2,opt,name=height" json:"height,omitempty"`
@ -209,6 +320,27 @@ func (m *BlockDetails) String() string            { return proto.CompactTextStri
 func (*BlockDetails) ProtoMessage()               {}
 func (*BlockDetails) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }

+func (m *BlockDetails) GetHash() []byte {
+	if m != nil {
+		return m.Hash
+	}
+	return nil
+}
+
+func (m *BlockDetails) GetHeight() int32 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+func (m *BlockDetails) GetTimestamp() int64 {
+	if m != nil {
+		return m.Timestamp
+	}
+	return 0
+}
+
 func (m *BlockDetails) GetTransactions() []*TransactionDetails {
 	if m != nil {
 		return m.Transactions
@ -226,6 +358,20 @@ func (m *AccountBalance) String() string            { return proto.CompactTextSt
 func (*AccountBalance) ProtoMessage()               {}
 func (*AccountBalance) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }

+func (m *AccountBalance) GetAccount() uint32 {
+	if m != nil {
+		return m.Account
+	}
+	return 0
+}
+
+func (m *AccountBalance) GetTotalBalance() int64 {
+	if m != nil {
+		return m.TotalBalance
+	}
+	return 0
+}
+
 type PingRequest struct {
 }

@ -259,6 +405,13 @@ func (m *NetworkResponse) String() string            { return proto.CompactTextS
 func (*NetworkResponse) ProtoMessage()               {}
 func (*NetworkResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }

+func (m *NetworkResponse) GetActiveNetwork() uint32 {
+	if m != nil {
+		return m.ActiveNetwork
+	}
+	return 0
+}
+
 type AccountNumberRequest struct {
 	AccountName string `protobuf:"bytes,1,opt,name=account_name,json=accountName" json:"account_name,omitempty"`
 }
@ -268,6 +421,13 @@ func (m *AccountNumberRequest) String() string            { return proto.Compact
 func (*AccountNumberRequest) ProtoMessage()               {}
 func (*AccountNumberRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }

+func (m *AccountNumberRequest) GetAccountName() string {
+	if m != nil {
+		return m.AccountName
+	}
+	return ""
+}
+
 type AccountNumberResponse struct {
 	AccountNumber uint32 `protobuf:"varint,1,opt,name=account_number,json=accountNumber" json:"account_number,omitempty"`
 }
@ -277,6 +437,13 @@ func (m *AccountNumberResponse) String() string            { return proto.Compac
 func (*AccountNumberResponse) ProtoMessage()               {}
 func (*AccountNumberResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }

+func (m *AccountNumberResponse) GetAccountNumber() uint32 {
+	if m != nil {
+		return m.AccountNumber
+	}
+	return 0
+}
+
 type AccountsRequest struct {
 }

@ -303,6 +470,20 @@ func (m *AccountsResponse) GetAccounts() []*AccountsResponse_Account {
 	return nil
 }

+func (m *AccountsResponse) GetCurrentBlockHash() []byte {
+	if m != nil {
+		return m.CurrentBlockHash
+	}
+	return nil
+}
+
+func (m *AccountsResponse) GetCurrentBlockHeight() int32 {
+	if m != nil {
+		return m.CurrentBlockHeight
+	}
+	return 0
+}
+
 type AccountsResponse_Account struct {
 	AccountNumber    uint32 `protobuf:"varint,1,opt,name=account_number,json=accountNumber" json:"account_number,omitempty"`
 	AccountName      string `protobuf:"bytes,2,opt,name=account_name,json=accountName" json:"account_name,omitempty"`
@ -317,6 +498,48 @@ func (m *AccountsResponse_Account) String() string            { return proto.Com
 func (*AccountsResponse_Account) ProtoMessage()               {}
 func (*AccountsResponse_Account) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12, 0} }

+func (m *AccountsResponse_Account) GetAccountNumber() uint32 {
+	if m != nil {
+		return m.AccountNumber
+	}
+	return 0
+}
+
+func (m *AccountsResponse_Account) GetAccountName() string {
+	if m != nil {
+		return m.AccountName
+	}
+	return ""
+}
+
+func (m *AccountsResponse_Account) GetTotalBalance() int64 {
+	if m != nil {
+		return m.TotalBalance
+	}
+	return 0
+}
+
+func (m *AccountsResponse_Account) GetExternalKeyCount() uint32 {
+	if m != nil {
+		return m.ExternalKeyCount
+	}
+	return 0
+}
+
+func (m *AccountsResponse_Account) GetInternalKeyCount() uint32 {
+	if m != nil {
+		return m.InternalKeyCount
+	}
+	return 0
+}
+
+func (m *AccountsResponse_Account) GetImportedKeyCount() uint32 {
+	if m != nil {
+		return m.ImportedKeyCount
+	}
+	return 0
+}
+
 type RenameAccountRequest struct {
 	AccountNumber uint32 `protobuf:"varint,1,opt,name=account_number,json=accountNumber" json:"account_number,omitempty"`
 	NewName       string `protobuf:"bytes,2,opt,name=new_name,json=newName" json:"new_name,omitempty"`
@ -327,6 +550,20 @@ func (m *RenameAccountRequest) String() string            { return proto.Compact
 func (*RenameAccountRequest) ProtoMessage()               {}
 func (*RenameAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }

+func (m *RenameAccountRequest) GetAccountNumber() uint32 {
+	if m != nil {
+		return m.AccountNumber
+	}
+	return 0
+}
+
+func (m *RenameAccountRequest) GetNewName() string {
+	if m != nil {
+		return m.NewName
+	}
+	return ""
+}
+
 type RenameAccountResponse struct {
 }

@ -345,6 +582,20 @@ func (m *NextAccountRequest) String() string            { return proto.CompactTe
 func (*NextAccountRequest) ProtoMessage()               {}
 func (*NextAccountRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }

+func (m *NextAccountRequest) GetPassphrase() []byte {
+	if m != nil {
+		return m.Passphrase
+	}
+	return nil
+}
+
+func (m *NextAccountRequest) GetAccountName() string {
+	if m != nil {
+		return m.AccountName
+	}
+	return ""
+}
+
 type NextAccountResponse struct {
 	AccountNumber uint32 `protobuf:"varint,1,opt,name=account_number,json=accountNumber" json:"account_number,omitempty"`
 }
@ -354,6 +605,13 @@ func (m *NextAccountResponse) String() string            { return proto.CompactT
 func (*NextAccountResponse) ProtoMessage()               {}
 func (*NextAccountResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }

+func (m *NextAccountResponse) GetAccountNumber() uint32 {
+	if m != nil {
+		return m.AccountNumber
+	}
+	return 0
+}
+
 type NextAddressRequest struct {
 	Account uint32                  `protobuf:"varint,1,opt,name=account" json:"account,omitempty"`
 	Kind    NextAddressRequest_Kind `protobuf:"varint,2,opt,name=kind,enum=walletrpc.NextAddressRequest_Kind" json:"kind,omitempty"`
@ -364,6 +622,20 @@ func (m *NextAddressRequest) String() string            { return proto.CompactTe
 func (*NextAddressRequest) ProtoMessage()               {}
 func (*NextAddressRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }

+func (m *NextAddressRequest) GetAccount() uint32 {
+	if m != nil {
+		return m.Account
+	}
+	return 0
+}
+
+func (m *NextAddressRequest) GetKind() NextAddressRequest_Kind {
+	if m != nil {
+		return m.Kind
+	}
+	return NextAddressRequest_BIP0044_EXTERNAL
+}
+
 type NextAddressResponse struct {
 	Address string `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"`
 }
@ -373,6 +645,13 @@ func (m *NextAddressResponse) String() string            { return proto.CompactT
 func (*NextAddressResponse) ProtoMessage()               {}
 func (*NextAddressResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }

+func (m *NextAddressResponse) GetAddress() string {
+	if m != nil {
+		return m.Address
+	}
+	return ""
+}
+
 type ImportPrivateKeyRequest struct {
 	Passphrase    []byte `protobuf:"bytes,1,opt,name=passphrase,proto3" json:"passphrase,omitempty"`
 	Account       uint32 `protobuf:"varint,2,opt,name=account" json:"account,omitempty"`
@ -385,6 +664,34 @@ func (m *ImportPrivateKeyRequest) String() string            { return proto.Comp
 func (*ImportPrivateKeyRequest) ProtoMessage()               {}
 func (*ImportPrivateKeyRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }

+func (m *ImportPrivateKeyRequest) GetPassphrase() []byte {
+	if m != nil {
+		return m.Passphrase
+	}
+	return nil
+}
+
+func (m *ImportPrivateKeyRequest) GetAccount() uint32 {
+	if m != nil {
+		return m.Account
+	}
+	return 0
+}
+
+func (m *ImportPrivateKeyRequest) GetPrivateKeyWif() string {
+	if m != nil {
+		return m.PrivateKeyWif
+	}
+	return ""
+}
+
+func (m *ImportPrivateKeyRequest) GetRescan() bool {
+	if m != nil {
+		return m.Rescan
+	}
+	return false
+}
+
 type ImportPrivateKeyResponse struct {
 }

@ -403,6 +710,20 @@ func (m *BalanceRequest) String() string            { return proto.CompactTextSt
 func (*BalanceRequest) ProtoMessage()               {}
 func (*BalanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }

+func (m *BalanceRequest) GetAccountNumber() uint32 {
+	if m != nil {
+		return m.AccountNumber
+	}
+	return 0
+}
+
+func (m *BalanceRequest) GetRequiredConfirmations() int32 {
+	if m != nil {
+		return m.RequiredConfirmations
+	}
+	return 0
+}
+
 type BalanceResponse struct {
 	Total          int64 `protobuf:"varint,1,opt,name=total" json:"total,omitempty"`
 	Spendable      int64 `protobuf:"varint,2,opt,name=spendable" json:"spendable,omitempty"`
@ -414,6 +735,27 @@ func (m *BalanceResponse) String() string            { return proto.CompactTextS
 func (*BalanceResponse) ProtoMessage()               {}
 func (*BalanceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }

+func (m *BalanceResponse) GetTotal() int64 {
+	if m != nil {
+		return m.Total
+	}
+	return 0
+}
+
+func (m *BalanceResponse) GetSpendable() int64 {
+	if m != nil {
+		return m.Spendable
+	}
+	return 0
+}
+
+func (m *BalanceResponse) GetImmatureReward() int64 {
+	if m != nil {
+		return m.ImmatureReward
+	}
+	return 0
+}
+
 type GetTransactionsRequest struct {
 	// Optionally specify the starting block from which to begin including all transactions.
 	// Either the starting block hash or height may be specified, but not both.
@ -442,6 +784,41 @@ func (m *GetTransactionsRequest) String() string            { return proto.Compa
 func (*GetTransactionsRequest) ProtoMessage()               {}
 func (*GetTransactionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }

+func (m *GetTransactionsRequest) GetStartingBlockHash() []byte {
+	if m != nil {
+		return m.StartingBlockHash
+	}
+	return nil
+}
+
+func (m *GetTransactionsRequest) GetStartingBlockHeight() int32 {
+	if m != nil {
+		return m.StartingBlockHeight
+	}
+	return 0
+}
+
+func (m *GetTransactionsRequest) GetEndingBlockHash() []byte {
+	if m != nil {
+		return m.EndingBlockHash
+	}
+	return nil
+}
+
+func (m *GetTransactionsRequest) GetEndingBlockHeight() int32 {
+	if m != nil {
+		return m.EndingBlockHeight
+	}
+	return 0
+}
+
+func (m *GetTransactionsRequest) GetMinimumRecentTransactions() int32 {
+	if m != nil {
+		return m.MinimumRecentTransactions
+	}
+	return 0
+}
+
 type GetTransactionsResponse struct {
 	MinedTransactions   []*BlockDetails       `protobuf:"bytes,1,rep,name=mined_transactions,json=minedTransactions" json:"mined_transactions,omitempty"`
 	UnminedTransactions []*TransactionDetails `protobuf:"bytes,2,rep,name=unmined_transactions,json=unminedTransactions" json:"unmined_transactions,omitempty"`
@ -477,6 +854,27 @@ func (m *ChangePassphraseRequest) String() string            { return proto.Comp
 func (*ChangePassphraseRequest) ProtoMessage()               {}
 func (*ChangePassphraseRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }

+func (m *ChangePassphraseRequest) GetKey() ChangePassphraseRequest_Key {
+	if m != nil {
+		return m.Key
+	}
+	return ChangePassphraseRequest_PRIVATE
+}
+
+func (m *ChangePassphraseRequest) GetOldPassphrase() []byte {
+	if m != nil {
+		return m.OldPassphrase
+	}
+	return nil
+}
+
+func (m *ChangePassphraseRequest) GetNewPassphrase() []byte {
+	if m != nil {
+		return m.NewPassphrase
+	}
+	return nil
+}
+
 type ChangePassphraseResponse struct {
 }

@ -498,6 +896,41 @@ func (m *FundTransactionRequest) String() string            { return proto.Compa
 func (*FundTransactionRequest) ProtoMessage()               {}
 func (*FundTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }

+func (m *FundTransactionRequest) GetAccount() uint32 {
+	if m != nil {
+		return m.Account
+	}
+	return 0
+}
+
+func (m *FundTransactionRequest) GetTargetAmount() int64 {
+	if m != nil {
+		return m.TargetAmount
+	}
+	return 0
+}
+
+func (m *FundTransactionRequest) GetRequiredConfirmations() int32 {
+	if m != nil {
+		return m.RequiredConfirmations
+	}
+	return 0
+}
+
+func (m *FundTransactionRequest) GetIncludeImmatureCoinbases() bool {
+	if m != nil {
+		return m.IncludeImmatureCoinbases
+	}
+	return false
+}
+
+func (m *FundTransactionRequest) GetIncludeChangeScript() bool {
+	if m != nil {
+		return m.IncludeChangeScript
+	}
+	return false
+}
+
 type FundTransactionResponse struct {
 	SelectedOutputs []*FundTransactionResponse_PreviousOutput `protobuf:"bytes,1,rep,name=selected_outputs,json=selectedOutputs" json:"selected_outputs,omitempty"`
 	TotalAmount     int64                                     `protobuf:"varint,2,opt,name=total_amount,json=totalAmount" json:"total_amount,omitempty"`
@ -516,6 +949,20 @@ func (m *FundTransactionResponse) GetSelectedOutputs() []*FundTransactionRespons
 	return nil
 }

+func (m *FundTransactionResponse) GetTotalAmount() int64 {
+	if m != nil {
+		return m.TotalAmount
+	}
+	return 0
+}
+
+func (m *FundTransactionResponse) GetChangePkScript() []byte {
+	if m != nil {
+		return m.ChangePkScript
+	}
+	return nil
+}
+
 type FundTransactionResponse_PreviousOutput struct {
 	TransactionHash []byte `protobuf:"bytes,1,opt,name=transaction_hash,json=transactionHash,proto3" json:"transaction_hash,omitempty"`
 	OutputIndex     uint32 `protobuf:"varint,2,opt,name=output_index,json=outputIndex" json:"output_index,omitempty"`
@ -534,6 +981,48 @@ func (*FundTransactionResponse_PreviousOutput) Descriptor() ([]byte, []int) {
 	return fileDescriptor0, []int{28, 0}
 }

+func (m *FundTransactionResponse_PreviousOutput) GetTransactionHash() []byte {
+	if m != nil {
+		return m.TransactionHash
+	}
+	return nil
+}
+
+func (m *FundTransactionResponse_PreviousOutput) GetOutputIndex() uint32 {
+	if m != nil {
+		return m.OutputIndex
+	}
+	return 0
+}
+
+func (m *FundTransactionResponse_PreviousOutput) GetAmount() int64 {
+	if m != nil {
+		return m.Amount
+	}
+	return 0
+}
+
+func (m *FundTransactionResponse_PreviousOutput) GetPkScript() []byte {
+	if m != nil {
+		return m.PkScript
+	}
+	return nil
+}
+
+func (m *FundTransactionResponse_PreviousOutput) GetReceiveTime() int64 {
+	if m != nil {
+		return m.ReceiveTime
+	}
+	return 0
+}
+
+func (m *FundTransactionResponse_PreviousOutput) GetFromCoinbase() bool {
+	if m != nil {
+		return m.FromCoinbase
+	}
+	return false
+}
+
 type SignTransactionRequest struct {
 	Passphrase            []byte `protobuf:"bytes,1,opt,name=passphrase,proto3" json:"passphrase,omitempty"`
 	SerializedTransaction []byte `protobuf:"bytes,2,opt,name=serialized_transaction,json=serializedTransaction,proto3" json:"serialized_transaction,omitempty"`
@ -550,6 +1039,27 @@ func (m *SignTransactionRequest) String() string            { return proto.Compa
 func (*SignTransactionRequest) ProtoMessage()               {}
 func (*SignTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }

+func (m *SignTransactionRequest) GetPassphrase() []byte {
+	if m != nil {
+		return m.Passphrase
+	}
+	return nil
+}
+
+func (m *SignTransactionRequest) GetSerializedTransaction() []byte {
+	if m != nil {
+		return m.SerializedTransaction
+	}
+	return nil
+}
+
+func (m *SignTransactionRequest) GetInputIndexes() []uint32 {
+	if m != nil {
+		return m.InputIndexes
+	}
+	return nil
+}
+
 type SignTransactionResponse struct {
 	Transaction          []byte   `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	UnsignedInputIndexes []uint32 `protobuf:"varint,2,rep,packed,name=unsigned_input_indexes,json=unsignedInputIndexes" json:"unsigned_input_indexes,omitempty"`
@ -560,6 +1070,20 @@ func (m *SignTransactionResponse) String() string            { return proto.Comp
 func (*SignTransactionResponse) ProtoMessage()               {}
 func (*SignTransactionResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }

+func (m *SignTransactionResponse) GetTransaction() []byte {
+	if m != nil {
+		return m.Transaction
+	}
+	return nil
+}
+
+func (m *SignTransactionResponse) GetUnsignedInputIndexes() []uint32 {
+	if m != nil {
+		return m.UnsignedInputIndexes
+	}
+	return nil
+}
+
 type PublishTransactionRequest struct {
 	SignedTransaction []byte `protobuf:"bytes,1,opt,name=signed_transaction,json=signedTransaction,proto3" json:"signed_transaction,omitempty"`
 }
@ -569,6 +1093,13 @@ func (m *PublishTransactionRequest) String() string            { return proto.Co
 func (*PublishTransactionRequest) ProtoMessage()               {}
 func (*PublishTransactionRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }

+func (m *PublishTransactionRequest) GetSignedTransaction() []byte {
+	if m != nil {
+		return m.SignedTransaction
+	}
+	return nil
+}
+
 type PublishTransactionResponse struct {
 }

@ -620,6 +1151,13 @@ func (m *TransactionNotificationsResponse) GetAttachedBlocks() []*BlockDetails {
 	return nil
 }

+func (m *TransactionNotificationsResponse) GetDetachedBlocks() [][]byte {
+	if m != nil {
+		return m.DetachedBlocks
+	}
+	return nil
+}
+
 func (m *TransactionNotificationsResponse) GetUnminedTransactions() []*TransactionDetails {
 	if m != nil {
 		return m.UnminedTransactions
@ -627,6 +1165,13 @@ func (m *TransactionNotificationsResponse) GetUnminedTransactions() []*Transacti
 	return nil
 }

+func (m *TransactionNotificationsResponse) GetUnminedTransactionHashes() [][]byte {
+	if m != nil {
+		return m.UnminedTransactionHashes
+	}
+	return nil
+}
+
 type SpentnessNotificationsRequest struct {
 	Account         uint32 `protobuf:"varint,1,opt,name=account" json:"account,omitempty"`
 	NoNotifyUnspent bool   `protobuf:"varint,2,opt,name=no_notify_unspent,json=noNotifyUnspent" json:"no_notify_unspent,omitempty"`
@ -638,6 +1183,27 @@ func (m *SpentnessNotificationsRequest) String() string            { return prot
 func (*SpentnessNotificationsRequest) ProtoMessage()               {}
 func (*SpentnessNotificationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{35} }

+func (m *SpentnessNotificationsRequest) GetAccount() uint32 {
+	if m != nil {
+		return m.Account
+	}
+	return 0
+}
+
+func (m *SpentnessNotificationsRequest) GetNoNotifyUnspent() bool {
+	if m != nil {
+		return m.NoNotifyUnspent
+	}
+	return false
+}
+
+func (m *SpentnessNotificationsRequest) GetNoNotifySpent() bool {
+	if m != nil {
+		return m.NoNotifySpent
+	}
+	return false
+}
+
 type SpentnessNotificationsResponse struct {
 	TransactionHash []byte                                  `protobuf:"bytes,1,opt,name=transaction_hash,json=transactionHash,proto3" json:"transaction_hash,omitempty"`
 	OutputIndex     uint32                                  `protobuf:"varint,2,opt,name=output_index,json=outputIndex" json:"output_index,omitempty"`
@ -649,6 +1215,20 @@ func (m *SpentnessNotificationsResponse) String() string            { return pro
 func (*SpentnessNotificationsResponse) ProtoMessage()               {}
 func (*SpentnessNotificationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} }

+func (m *SpentnessNotificationsResponse) GetTransactionHash() []byte {
+	if m != nil {
+		return m.TransactionHash
+	}
+	return nil
+}
+
+func (m *SpentnessNotificationsResponse) GetOutputIndex() uint32 {
+	if m != nil {
+		return m.OutputIndex
+	}
+	return 0
+}
+
 func (m *SpentnessNotificationsResponse) GetSpender() *SpentnessNotificationsResponse_Spender {
 	if m != nil {
 		return m.Spender
@ -670,6 +1250,20 @@ func (*SpentnessNotificationsResponse_Spender) Descriptor() ([]byte, []int) {
 	return fileDescriptor0, []int{36, 0}
 }

+func (m *SpentnessNotificationsResponse_Spender) GetTransactionHash() []byte {
+	if m != nil {
+		return m.TransactionHash
+	}
+	return nil
+}
+
+func (m *SpentnessNotificationsResponse_Spender) GetInputIndex() uint32 {
+	if m != nil {
+		return m.InputIndex
+	}
+	return 0
+}
+
 type AccountNotificationsRequest struct {
 }

@ -691,6 +1285,41 @@ func (m *AccountNotificationsResponse) String() string            { return proto
 func (*AccountNotificationsResponse) ProtoMessage()               {}
 func (*AccountNotificationsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} }

+func (m *AccountNotificationsResponse) GetAccountNumber() uint32 {
+	if m != nil {
+		return m.AccountNumber
+	}
+	return 0
+}
+
+func (m *AccountNotificationsResponse) GetAccountName() string {
+	if m != nil {
+		return m.AccountName
+	}
+	return ""
+}
+
+func (m *AccountNotificationsResponse) GetExternalKeyCount() uint32 {
+	if m != nil {
+		return m.ExternalKeyCount
+	}
+	return 0
+}
+
+func (m *AccountNotificationsResponse) GetInternalKeyCount() uint32 {
+	if m != nil {
+		return m.InternalKeyCount
+	}
+	return 0
+}
+
+func (m *AccountNotificationsResponse) GetImportedKeyCount() uint32 {
+	if m != nil {
+		return m.ImportedKeyCount
+	}
+	return 0
+}
+
 type CreateWalletRequest struct {
 	PublicPassphrase  []byte `protobuf:"bytes,1,opt,name=public_passphrase,json=publicPassphrase,proto3" json:"public_passphrase,omitempty"`
 	PrivatePassphrase []byte `protobuf:"bytes,2,opt,name=private_passphrase,json=privatePassphrase,proto3" json:"private_passphrase,omitempty"`
@ -702,6 +1331,27 @@ func (m *CreateWalletRequest) String() string            { return proto.CompactT
 func (*CreateWalletRequest) ProtoMessage()               {}
 func (*CreateWalletRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} }

+func (m *CreateWalletRequest) GetPublicPassphrase() []byte {
+	if m != nil {
+		return m.PublicPassphrase
+	}
+	return nil
+}
+
+func (m *CreateWalletRequest) GetPrivatePassphrase() []byte {
+	if m != nil {
+		return m.PrivatePassphrase
+	}
+	return nil
+}
+
+func (m *CreateWalletRequest) GetSeed() []byte {
+	if m != nil {
+		return m.Seed
+	}
+	return nil
+}
+
 type CreateWalletResponse struct {
 }

@ -719,6 +1369,13 @@ func (m *OpenWalletRequest) String() string            { return proto.CompactTex
 func (*OpenWalletRequest) ProtoMessage()               {}
 func (*OpenWalletRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{41} }

+func (m *OpenWalletRequest) GetPublicPassphrase() []byte {
+	if m != nil {
+		return m.PublicPassphrase
+	}
+	return nil
+}
+
 type OpenWalletResponse struct {
 }

@ -760,6 +1417,13 @@ func (m *WalletExistsResponse) String() string            { return proto.Compact
 func (*WalletExistsResponse) ProtoMessage()               {}
 func (*WalletExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{46} }

+func (m *WalletExistsResponse) GetExists() bool {
+	if m != nil {
+		return m.Exists
+	}
+	return false
+}
+
 type StartConsensusRpcRequest struct {
 	NetworkAddress string `protobuf:"bytes,1,opt,name=network_address,json=networkAddress" json:"network_address,omitempty"`
 	Username       string `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
@ -772,6 +1436,34 @@ func (m *StartConsensusRpcRequest) String() string            { return proto.Com
 func (*StartConsensusRpcRequest) ProtoMessage()               {}
 func (*StartConsensusRpcRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{47} }

+func (m *StartConsensusRpcRequest) GetNetworkAddress() string {
+	if m != nil {
+		return m.NetworkAddress
+	}
+	return ""
+}
+
+func (m *StartConsensusRpcRequest) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *StartConsensusRpcRequest) GetPassword() []byte {
+	if m != nil {
+		return m.Password
+	}
+	return nil
+}
+
+func (m *StartConsensusRpcRequest) GetCertificate() []byte {
+	if m != nil {
+		return m.Certificate
+	}
+	return nil
+}
+
 type StartConsensusRpcResponse struct {
 }

@ -845,7 +1537,7 @@ var _ grpc.ClientConn

 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion3
+const _ = grpc.SupportPackageIsVersion4

 // Client API for VersionService service

@ -908,7 +1600,7 @@ var _VersionService_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: fileDescriptor0,
+	Metadata: "api.proto",
 }

 // Client API for WalletService service
@ -1588,7 +2280,7 @@ var _WalletService_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: fileDescriptor0,
+	Metadata: "api.proto",
 }

 // Client API for WalletLoaderService service
@ -1784,14 +2476,14 @@ var _WalletLoaderService_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: fileDescriptor0,
+	Metadata: "api.proto",
 }

 func init() { proto.RegisterFile("api.proto", fileDescriptor0) }

 var fileDescriptor0 = []byte{
 	// 2402 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x19, 0x4b, 0x73, 0x1b, 0x49,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x19, 0x4b, 0x73, 0x1b, 0x49,
 	0x79, 0xc7, 0xe3, 0x87, 0xfc, 0xe9, 0xdd, 0x96, 0x65, 0x65, 0x12, 0x27, 0xce, 0xec, 0x23, 0xd9,
 	0xec, 0xae, 0x09, 0x26, 0x0b, 0x4b, 0xb1, 0x15, 0x36, 0x31, 0x59, 0x56, 0x24, 0x38, 0xaa, 0x71,
 	0xb2, 0x49, 0xd5, 0x52, 0x4c, 0x8d, 0x67, 0xda, 0x76, 0x63, 0xa9, 0x47, 0x99, 0x19, 0xc5, 0x31,