diff --git a/.travis.yml b/.travis.yml index 9ab6d23..20758a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,17 @@ language: go go: - - 1.5.4 - - 1.6.2 + - 1.6.3 + - 1.7.3 sudo: false before_install: - - gotools=golang.org/x/tools - - export GO15VENDOREXPERIMENT=1 -install: - - go get -v github.com/Masterminds/glide + - GLIDE_TAG=v0.12.3 + - GLIDE_DOWNLOAD="https://github.com/Masterminds/glide/releases/download/$GLIDE_TAG/glide-$GLIDE_TAG-linux-amd64.tar.gz" + - curl -L $GLIDE_DOWNLOAD | tar -xvz + - export PATH=$PATH:$PWD/linux-amd64/ - glide install - - go get -v $(glide novendor) - - go get -v $gotools/cmd/cover +install: + - go install -v $(glide novendor) + - go get -v golang.org/x/tools/cmd/cover - go get -v github.com/golang/lint/golint - go get -v github.com/davecgh/go-spew/spew script: diff --git a/glide.lock b/glide.lock index c44db77..009bf96 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,10 @@ -hash: 0cff4a723566a3e33910785c104bddde49d1e0ba2d51f3833599a423140f5163 -updated: 2016-08-12T09:43:45.22287-05:00 +hash: 5efa5cef5495a0b5256f45ecb2456ea21101934ed56e780a46b1c16e30177ebc +updated: 2016-10-27T11:04:37.4161268-04:00 imports: - name: github.com/boltdb/bolt - version: 831b652a7f8dbefaf94da0eb66abd46c0c4bcf23 + version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9 - name: github.com/btcsuite/btcd - version: a7b35d9f9e24f8cebf3dc30cf083668700690095 + version: e3eeb4a34a04c8ec40298fee9f9d8fe2ce0c13ca subpackages: - blockchain - btcec @@ -15,16 +15,16 @@ imports: - txscript - wire - name: github.com/btcsuite/btclog - version: f96df2375f37300305f329b8e5258764b4f19a7f + version: 73889fb79bd687870312b6e40effcecffbd57d30 - name: github.com/btcsuite/btcrpcclient - version: c39e35318d5dc8d7e5e4171a34a17bc03dce06b4 + version: 2b780d16b042054d07aa322146194118fd7f7b81 - name: github.com/btcsuite/btcutil - version: 22c91fa80a5e90e3feda26cf6d43adc249306188 + version: 68e5965458062d031a6e333b35c778ce464fb73f subpackages: - base58 - hdkeychain - name: github.com/btcsuite/fastsha256 - version: 302ad4db268b46f9ebda3078f6f7397f96047735 + version: 637e656429416087660c84436a2a035d69d54e2e - name: github.com/btcsuite/go-socks version: cfe8b59e565c1a5bd4e2005d77cd9aa8b2e14524 subpackages: @@ -44,25 +44,27 @@ imports: - name: github.com/btcsuite/websocket version: 31079b6807923eb23992c421b114992b95131b55 - name: github.com/golang/protobuf - version: 2ebff28ac76fb19e2d25e5ddd4885708dfdd5611 + version: 98fa357170587e470c5f27d3c3ea0947b71eb455 subpackages: - proto - name: github.com/jessevdk/go-flags version: 1679536dcc895411a9f5848d9a0250be7856448c - name: golang.org/x/net - version: fb93926129b8ec0056f2f458b1f519654814edf0 + version: c46f265c325130a7a6c7b27db8c6fe14b64f1a68 subpackages: - context - http2 - http2/hpack + - idna - internal/timeseries + - lex/httplex - trace - name: golang.org/x/sys - version: f64b50fbea64174967a8882830d621a18ee1548e + version: c200b10b5d5e122be351b67af224adc6128af5bf subpackages: - unix - name: google.golang.org/grpc - version: dd828651e45229541896bc41cd9cf2f89ac7002a + version: b7f1379d3cbbbeb2ca3405852012e237aa05459e subpackages: - codes - credentials @@ -70,10 +72,10 @@ imports: - internal - metadata - naming - - transport - peer + - transport testImports: - name: github.com/davecgh/go-spew - version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d + version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 subpackages: - spew diff --git a/glide.yaml b/glide.yaml index e130d57..ac7f2f3 100644 --- a/glide.yaml +++ b/glide.yaml @@ -29,6 +29,7 @@ import: subpackages: - context - package: google.golang.org/grpc + version: ^1.0.0 subpackages: - codes - credentials @@ -36,4 +37,4 @@ import: - package: github.com/jessevdk/go-flags version: 1679536dcc895411a9f5848d9a0250be7856448c - package: github.com/boltdb/bolt - version: 831b652a7f8dbefaf94da0eb66abd46c0c4bcf23 + version: ^1.3.0 diff --git a/rpc/legacyrpc/methods.go b/rpc/legacyrpc/methods.go index 17f1d78..dca89e7 100644 --- a/rpc/legacyrpc/methods.go +++ b/rpc/legacyrpc/methods.go @@ -1250,7 +1250,7 @@ func listSinceBlock(icmd interface{}, w *wallet.Wallet, chainClient *chain.RPCCl if err != nil { return nil, DeserializationError{err} } - block, err := chainClient.GetBlockVerbose(hash, false) + block, err := chainClient.GetBlockVerbose(hash) if err != nil { return nil, err } diff --git a/rpc/walletrpc/api.pb.go b/rpc/walletrpc/api.pb.go index 8bae3b0..dbe4c0b 100644 --- a/rpc/walletrpc/api.pb.go +++ b/rpc/walletrpc/api.pb.go @@ -77,7 +77,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type NextAddressRequest_Kind int32 @@ -540,7 +542,7 @@ type SignTransactionRequest struct { // will be signed. Rather than returning an incompletely signed // transaction if any of the inputs to be signed can not be, the RPC // immediately errors. - InputIndexes []uint32 `protobuf:"varint,3,rep,name=input_indexes,json=inputIndexes" json:"input_indexes,omitempty"` + InputIndexes []uint32 `protobuf:"varint,3,rep,packed,name=input_indexes,json=inputIndexes" json:"input_indexes,omitempty"` } func (m *SignTransactionRequest) Reset() { *m = SignTransactionRequest{} } @@ -550,7 +552,7 @@ func (*SignTransactionRequest) Descriptor() ([]byte, []int) { return fileDescrip type SignTransactionResponse struct { Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"` - UnsignedInputIndexes []uint32 `protobuf:"varint,2,rep,name=unsigned_input_indexes,json=unsignedInputIndexes" json:"unsigned_input_indexes,omitempty"` + UnsignedInputIndexes []uint32 `protobuf:"varint,2,rep,packed,name=unsigned_input_indexes,json=unsignedInputIndexes" json:"unsigned_input_indexes,omitempty"` } func (m *SignTransactionResponse) Reset() { *m = SignTransactionResponse{} } @@ -843,7 +845,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.SupportPackageIsVersion2 +const _ = grpc.SupportPackageIsVersion3 // Client API for VersionService service @@ -905,7 +907,8 @@ var _VersionService_serviceDesc = grpc.ServiceDesc{ Handler: _VersionService_Version_Handler, }, }, - Streams: []grpc.StreamDesc{}, + Streams: []grpc.StreamDesc{}, + Metadata: fileDescriptor0, } // Client API for WalletService service @@ -1585,6 +1588,7 @@ var _WalletService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, + Metadata: fileDescriptor0, } // Client API for WalletLoaderService service @@ -1779,159 +1783,163 @@ var _WalletLoaderService_serviceDesc = grpc.ServiceDesc{ Handler: _WalletLoaderService_StartConsensusRpc_Handler, }, }, - Streams: []grpc.StreamDesc{}, + Streams: []grpc.StreamDesc{}, + Metadata: fileDescriptor0, } +func init() { proto.RegisterFile("api.proto", fileDescriptor0) } + var fileDescriptor0 = []byte{ - // 2391 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x59, 0x5b, 0x73, 0xdc, 0x48, - 0x15, 0x66, 0x2c, 0xdf, 0x72, 0xe6, 0xde, 0xbe, 0x4d, 0x94, 0x38, 0xc9, 0x2a, 0xbb, 0xd9, 0xec, - 0x2e, 0x98, 0x60, 0x02, 0x2c, 0xc5, 0x56, 0xd8, 0xc4, 0x64, 0xd9, 0x21, 0xc1, 0x99, 0x92, 0x93, - 0x4d, 0xaa, 0xa0, 0x98, 0x92, 0x35, 0xed, 0x58, 0x78, 0x46, 0x9a, 0x48, 0x9a, 0x38, 0xe1, 0x89, - 0xa2, 0x8a, 0x47, 0x5e, 0x80, 0x07, 0x0a, 0x6a, 0x5f, 0xf8, 0x05, 0x54, 0xf1, 0xc2, 0x23, 0xfc, - 0x06, 0x1e, 0xf9, 0x17, 0xfc, 0x02, 0xfa, 0x72, 0x7a, 0xd4, 0x2d, 0x69, 0xc6, 0xf6, 0x16, 0x6f, - 0xa3, 0xaf, 0xcf, 0x39, 0x7d, 0xfa, 0xf4, 0xb9, 0xf6, 0xc0, 0x25, 0x6f, 0x1c, 0xec, 0x8c, 0xe3, - 0x28, 0x8d, 0xc8, 0xa5, 0x53, 0x6f, 0x38, 0xa4, 0x69, 0x3c, 0xf6, 0x9d, 0x16, 0x34, 0xbe, 0xa0, - 0x71, 0x12, 0x44, 0xa1, 0x4b, 0x5f, 0x4d, 0x68, 0x92, 0x3a, 0xff, 0xaa, 0x40, 0x73, 0x0a, 0x25, - 0xe3, 0x28, 0x4c, 0x28, 0x79, 0x0f, 0x1a, 0xaf, 0x25, 0xd4, 0x4f, 0xd2, 0x38, 0x08, 0x5f, 0x76, - 0x2a, 0x37, 0x2a, 0xb7, 0x2f, 0xb9, 0x75, 0x44, 0x0f, 0x04, 0x48, 0xd6, 0x61, 0x69, 0xe4, 0xfd, - 0x32, 0x8a, 0x3b, 0x0b, 0x6c, 0xb5, 0xee, 0xca, 0x0f, 0x81, 0x06, 0x21, 0x43, 0x2d, 0x44, 0xf9, - 0x07, 0x47, 0xc7, 0x5e, 0xea, 0x1f, 0x77, 0x16, 0x25, 0x2a, 0x3e, 0xc8, 0x35, 0x80, 0x71, 0x4c, - 0x63, 0x3a, 0xa4, 0x5e, 0x42, 0x3b, 0x4b, 0x62, 0x13, 0x0d, 0xe1, 0x8a, 0x1c, 0x4e, 0x82, 0xe1, - 0xa0, 0x3f, 0xa2, 0xa9, 0x37, 0xf0, 0x52, 0xaf, 0xb3, 0x2c, 0x15, 0x11, 0xe8, 0x4f, 0x11, 0x74, - 0xfe, 0x69, 0x01, 0x79, 0x1a, 0x7b, 0x61, 0xe2, 0xf9, 0x29, 0x53, 0xef, 0x47, 0x0c, 0x0f, 0x86, - 0x09, 0x21, 0xb0, 0x78, 0xec, 0x25, 0xc7, 0x42, 0xf9, 0x9a, 0x2b, 0x7e, 0x93, 0x1b, 0x50, 0x4d, - 0x33, 0x4a, 0xa1, 0x79, 0xcd, 0xd5, 0x21, 0xf2, 0x03, 0x58, 0x1e, 0xd0, 0xc3, 0x20, 0x4d, 0xd8, - 0x01, 0xac, 0xdb, 0xd5, 0xdd, 0x9b, 0x3b, 0x53, 0xf3, 0xed, 0x14, 0x37, 0xd9, 0xe9, 0x86, 0xe3, - 0x49, 0xea, 0x22, 0x0b, 0xb9, 0x07, 0x2b, 0x7e, 0x4c, 0x07, 0x9c, 0x7b, 0x51, 0x70, 0xbf, 0x3b, - 0x9f, 0xfb, 0xc9, 0x24, 0xe5, 0xec, 0x8a, 0x89, 0xb4, 0xc0, 0x3a, 0xa2, 0xd2, 0x12, 0x96, 0xcb, - 0x7f, 0x92, 0xab, 0x70, 0x29, 0x0d, 0x46, 0xec, 0xa6, 0xbc, 0xd1, 0x58, 0x9c, 0xde, 0x72, 0x33, - 0xc0, 0x7e, 0x05, 0x4b, 0x42, 0x01, 0x6e, 0xdf, 0x20, 0x1c, 0xd0, 0x37, 0xe2, 0xb0, 0xcc, 0xbe, - 0xe2, 0x83, 0x7c, 0x00, 0x2d, 0x66, 0xcd, 0xd7, 0x41, 0x34, 0x49, 0xfa, 0x9e, 0xef, 0x47, 0x93, - 0x30, 0xc5, 0xcb, 0x6a, 0x2a, 0xfc, 0xbe, 0x84, 0xc9, 0xfb, 0xd0, 0xcc, 0x48, 0x47, 0x82, 0xd2, - 0x12, 0xbb, 0x35, 0xa6, 0x94, 0x02, 0xb5, 0x9f, 0xc2, 0xb2, 0xd4, 0x7a, 0xc6, 0x9e, 0x1d, 0x58, - 0x31, 0xb7, 0x52, 0x9f, 0xc4, 0x86, 0xd5, 0x20, 0x4c, 0x69, 0x1c, 0x7a, 0x43, 0x21, 0x7b, 0xd5, - 0x9d, 0x7e, 0x3b, 0x7f, 0xa9, 0x40, 0xed, 0xc1, 0x30, 0xf2, 0x4f, 0xe6, 0x5d, 0xde, 0x26, 0x2c, - 0x1f, 0xd3, 0xe0, 0xe5, 0xb1, 0x94, 0xbc, 0xe4, 0xe2, 0x97, 0x69, 0x23, 0x2b, 0x67, 0x23, 0x72, - 0x1f, 0x6a, 0xda, 0xfd, 0xaa, 0x8b, 0xd9, 0x9e, 0x7b, 0x31, 0xae, 0xc1, 0xe2, 0x3c, 0x81, 0x06, - 0xda, 0xe9, 0x81, 0x37, 0xf4, 0x42, 0x9f, 0xea, 0xa7, 0xac, 0x98, 0xa7, 0xbc, 0x09, 0xf5, 0x34, - 0x4a, 0xbd, 0x61, 0xff, 0x50, 0x92, 0x0a, 0x5d, 0x2d, 0x26, 0x90, 0x83, 0xc8, 0xee, 0xd4, 0xa1, - 0xda, 0x63, 0x21, 0xa4, 0x82, 0xb0, 0x01, 0x35, 0xf9, 0x29, 0x03, 0x90, 0x87, 0xe9, 0x3e, 0x4d, - 0x4f, 0xa3, 0xf8, 0x44, 0x51, 0x7c, 0x0c, 0xcd, 0x29, 0x92, 0x45, 0x29, 0xd7, 0xef, 0x35, 0xed, - 0x87, 0x72, 0x05, 0x35, 0xa9, 0x4b, 0x14, 0xc9, 0x9d, 0xef, 0xc3, 0x3a, 0xea, 0xbe, 0x3f, 0x19, - 0x1d, 0xd2, 0x18, 0x25, 0x92, 0x77, 0xa0, 0x86, 0x2a, 0xf7, 0x43, 0x6f, 0x44, 0x31, 0xc4, 0xab, - 0x88, 0xed, 0x33, 0xc8, 0xb9, 0x07, 0x1b, 0x39, 0x56, 0x7d, 0x6b, 0xe4, 0x15, 0x2b, 0xd9, 0xd6, - 0x1a, 0xb9, 0xd3, 0x86, 0x26, 0xf2, 0x27, 0xea, 0x1c, 0xff, 0xb0, 0xa0, 0x95, 0x61, 0x28, 0xee, - 0x87, 0xb0, 0x8a, 0x8c, 0x09, 0x13, 0x94, 0x0f, 0xba, 0x3c, 0xb9, 0x02, 0xdc, 0x29, 0x13, 0xf9, - 0x3a, 0x10, 0x7f, 0x12, 0xc7, 0x94, 0xe9, 0x73, 0xc8, 0x9d, 0xa8, 0x2f, 0x5c, 0x47, 0x06, 0x77, - 0x0b, 0x57, 0x84, 0x77, 0x7d, 0xce, 0xdd, 0xe8, 0x0e, 0xac, 0xe7, 0xa8, 0xa5, 0x53, 0x59, 0xc2, - 0xa9, 0x88, 0x41, 0x2f, 0x56, 0xec, 0xdf, 0x2c, 0xc0, 0x8a, 0x0a, 0x94, 0xf3, 0x9d, 0xbd, 0x60, - 0xde, 0x85, 0x82, 0x79, 0x8b, 0x9e, 0x62, 0x15, 0x3d, 0x85, 0x1f, 0x8d, 0xbe, 0x91, 0x41, 0xd2, - 0x3f, 0xa1, 0x6f, 0xfb, 0xd2, 0xe7, 0x64, 0x16, 0x6d, 0xa9, 0x95, 0x47, 0xf4, 0xed, 0x9e, 0x50, - 0x8e, 0x51, 0xab, 0x90, 0xd2, 0xa8, 0x97, 0x24, 0xb5, 0x5a, 0x31, 0xa8, 0x47, 0xe3, 0x28, 0x4e, - 0xe9, 0x40, 0xa3, 0x5e, 0x46, 0x6a, 0x5c, 0x51, 0xd4, 0xce, 0x0b, 0x58, 0x77, 0x29, 0x3f, 0x8b, - 0xb2, 0x3f, 0x3a, 0xd2, 0x39, 0x0d, 0x72, 0x19, 0x56, 0x43, 0x7a, 0xaa, 0x1b, 0x63, 0x85, 0x7d, - 0x0b, 0x3f, 0xdb, 0x82, 0x8d, 0x9c, 0x64, 0x8c, 0x83, 0xe7, 0x40, 0xf6, 0xd9, 0x19, 0x73, 0x1b, - 0xf2, 0xaa, 0xe1, 0x25, 0xc9, 0xf8, 0x38, 0xe6, 0x55, 0x43, 0x26, 0x08, 0x0d, 0x39, 0x87, 0xe9, - 0x9d, 0x4f, 0x60, 0xcd, 0x10, 0x7c, 0x31, 0xbf, 0xfe, 0x73, 0x05, 0xf5, 0x1a, 0x0c, 0x62, 0x9a, - 0x28, 0xdf, 0x9e, 0x93, 0x13, 0xbe, 0x0b, 0x8b, 0x27, 0x2c, 0x3b, 0x0a, 0x4d, 0x1a, 0xbb, 0x8e, - 0xe6, 0xdc, 0x45, 0x31, 0x3b, 0x8f, 0x18, 0xa5, 0x2b, 0xe8, 0x9d, 0x5d, 0x58, 0xe4, 0x5f, 0x2c, - 0xd3, 0xb6, 0x1e, 0x74, 0x7b, 0x77, 0xee, 0xdc, 0xbd, 0xdb, 0x7f, 0xf8, 0xe2, 0xe9, 0x43, 0x77, - 0xff, 0xfe, 0xe3, 0xd6, 0xd7, 0x74, 0xb4, 0xbb, 0x8f, 0x68, 0xc5, 0xf9, 0x26, 0x1e, 0x4d, 0x09, - 0xc5, 0xa3, 0x71, 0xe5, 0x24, 0x84, 0x91, 0xae, 0x3e, 0x9d, 0x3f, 0x54, 0x60, 0xab, 0x2b, 0x2e, - 0xbb, 0x17, 0x07, 0xaf, 0xbd, 0x94, 0xb2, 0x1b, 0x3f, 0xaf, 0xa9, 0x67, 0x27, 0xfb, 0x5b, 0xbc, - 0x9e, 0x08, 0x71, 0xc2, 0xb5, 0x4e, 0x83, 0x23, 0xe1, 0xde, 0xac, 0x76, 0x8f, 0xa7, 0xbb, 0x3c, - 0x0f, 0x8e, 0x78, 0x4e, 0x67, 0x5a, 0xf8, 0x5e, 0x28, 0x7c, 0x7a, 0xd5, 0xc5, 0x2f, 0xc7, 0x86, - 0x4e, 0x51, 0x29, 0x74, 0x8b, 0x10, 0x1a, 0x18, 0x1e, 0x17, 0xf4, 0xc1, 0xef, 0xc0, 0x66, 0xcc, - 0x38, 0x02, 0x56, 0x6d, 0x99, 0xb3, 0x87, 0x47, 0x41, 0x3c, 0xf2, 0x64, 0x51, 0x90, 0x05, 0x65, - 0x43, 0xad, 0xee, 0xe9, 0x8b, 0x6c, 0xbf, 0xe6, 0x74, 0x3f, 0x34, 0x27, 0xab, 0x7d, 0x22, 0x4c, - 0xc5, 0x3e, 0x96, 0x2b, 0x3f, 0x78, 0x21, 0x4a, 0xc6, 0x34, 0x1c, 0x78, 0x87, 0x43, 0x95, 0xf7, - 0x33, 0x80, 0x97, 0xd8, 0x60, 0xc4, 0x64, 0x4e, 0x62, 0xda, 0x8f, 0xe9, 0xa9, 0x17, 0x0f, 0x54, - 0x89, 0x55, 0xb0, 0x2b, 0x50, 0xe7, 0x4f, 0x0b, 0xb0, 0xf9, 0x63, 0x9a, 0x6a, 0x65, 0x69, 0xea, - 0x63, 0x3b, 0xb0, 0xc6, 0xaa, 0x5a, 0x9c, 0xb2, 0x6a, 0xa1, 0xa7, 0x3a, 0x79, 0x33, 0x6d, 0xb5, - 0x94, 0xe5, 0xba, 0x5d, 0xd8, 0xc8, 0xd3, 0x67, 0x15, 0xb4, 0xed, 0xae, 0x99, 0x1c, 0xb2, 0x9c, - 0x7e, 0x08, 0x6d, 0xa6, 0x72, 0x6e, 0x07, 0x4b, 0xec, 0xd0, 0x94, 0x0b, 0x99, 0x7c, 0xa6, 0x8f, - 0x49, 0x2b, 0xa5, 0x2f, 0x0a, 0x73, 0xb6, 0x75, 0x6a, 0x29, 0xfb, 0x1e, 0x5c, 0x61, 0x0d, 0x61, - 0x30, 0x9a, 0x8c, 0x98, 0x09, 0x7c, 0x9e, 0x82, 0x8d, 0xda, 0xbc, 0x24, 0xf8, 0x2e, 0x23, 0x89, - 0x2b, 0x28, 0x74, 0x33, 0x38, 0x7f, 0x67, 0xce, 0x5a, 0x30, 0x0d, 0xde, 0xc9, 0x67, 0x40, 0x18, - 0x23, 0xbb, 0x5a, 0x43, 0xa4, 0x2c, 0x28, 0x5b, 0x5a, 0xcc, 0xe9, 0x7d, 0x86, 0xdb, 0x16, 0x2c, - 0xba, 0x3c, 0xd2, 0x83, 0xf5, 0x49, 0x58, 0x22, 0x69, 0xe1, 0x3c, 0x8d, 0xc3, 0x1a, 0xb2, 0x1a, - 0x5a, 0xb3, 0x26, 0x7b, 0x6b, 0xef, 0xd8, 0x0b, 0x5f, 0xd2, 0xde, 0x34, 0x76, 0xd4, 0x8d, 0x7e, - 0x0c, 0x16, 0x0b, 0x10, 0x71, 0x83, 0x8d, 0xdd, 0x5b, 0x9a, 0xf0, 0x19, 0x0c, 0x3b, 0x3c, 0x12, - 0x38, 0x0b, 0x77, 0xfa, 0x88, 0xf5, 0xc6, 0x5a, 0x80, 0xca, 0x8a, 0x57, 0x67, 0x68, 0xc6, 0xc6, - 0xc9, 0x78, 0xe2, 0xd5, 0xc8, 0xe4, 0x5d, 0xd6, 0x19, 0x9a, 0x91, 0x39, 0xd7, 0xc0, 0x62, 0x92, - 0x49, 0x15, 0x56, 0x7a, 0x6e, 0xf7, 0x8b, 0xfb, 0x4f, 0x1f, 0xb2, 0x0c, 0x03, 0xb0, 0xdc, 0x7b, - 0xf6, 0xe0, 0x71, 0x77, 0x8f, 0xe5, 0x15, 0x16, 0x90, 0x45, 0x8d, 0x30, 0x20, 0x7f, 0xcd, 0x1c, - 0xf6, 0xb3, 0x49, 0xa8, 0x1f, 0xfa, 0xec, 0xa4, 0xc8, 0xcb, 0x9f, 0x17, 0xbf, 0xa4, 0xa9, 0xea, - 0x37, 0x55, 0xa3, 0x24, 0x40, 0xd9, 0x6d, 0xce, 0x89, 0x58, 0x6b, 0x4e, 0xc4, 0x92, 0x4f, 0xc0, - 0x0e, 0x42, 0x7f, 0x38, 0x19, 0xd0, 0xfe, 0x34, 0xe4, 0xfc, 0x28, 0x08, 0x0f, 0x99, 0xd6, 0x09, - 0x66, 0x9a, 0x0e, 0x52, 0x74, 0x91, 0x60, 0x4f, 0xad, 0xf3, 0xa0, 0x51, 0xdc, 0xbe, 0x38, 0x72, - 0x3f, 0xf1, 0xe3, 0x60, 0x2c, 0x0b, 0xe9, 0xaa, 0xbb, 0x86, 0x8b, 0xd2, 0x1c, 0x07, 0x62, 0xc9, - 0xf9, 0xab, 0x05, 0x5b, 0x05, 0x13, 0xa0, 0x63, 0xfe, 0x1c, 0x5a, 0x09, 0x9b, 0x68, 0x7c, 0x5e, - 0x67, 0x23, 0xd1, 0x3b, 0x2b, 0xb7, 0xfc, 0x96, 0x76, 0xdf, 0x33, 0xb8, 0x77, 0x7a, 0xd8, 0x7f, - 0xe3, 0xac, 0xd0, 0x54, 0xa2, 0xe4, 0x77, 0xc2, 0xcb, 0x9d, 0x6c, 0x23, 0x0c, 0x33, 0x56, 0x05, - 0x86, 0x56, 0xbc, 0x0d, 0x2d, 0x3c, 0xc8, 0xf8, 0x44, 0x9d, 0x45, 0x3a, 0x41, 0x43, 0xe2, 0xbd, - 0x13, 0x79, 0x0c, 0xfb, 0x3f, 0x15, 0x68, 0x98, 0x1b, 0xf2, 0x21, 0x42, 0x0b, 0x03, 0x3d, 0xdf, - 0x34, 0x35, 0x5c, 0x64, 0x03, 0xa6, 0x8a, 0x3c, 0x5f, 0x5f, 0x0e, 0x06, 0xb2, 0x26, 0x54, 0x25, - 0xd6, 0x15, 0xe3, 0x01, 0xcb, 0xf7, 0xc6, 0x78, 0x81, 0x5f, 0xe4, 0x0a, 0x5c, 0xca, 0x74, 0x5b, - 0x14, 0xe2, 0x57, 0xc7, 0xa8, 0x15, 0x97, 0xcb, 0xb3, 0x05, 0xef, 0x75, 0x79, 0x5f, 0x8f, 0xf3, - 0x51, 0x15, 0xb1, 0xa7, 0x81, 0x6c, 0xa6, 0x8e, 0xe2, 0x68, 0x34, 0xbd, 0x65, 0xd1, 0xc6, 0xac, - 0xba, 0x35, 0x0e, 0xaa, 0x9b, 0x75, 0xfe, 0x58, 0x81, 0xcd, 0x83, 0xe0, 0x65, 0x58, 0xe2, 0xa7, - 0x67, 0x55, 0x3a, 0xe6, 0x88, 0x09, 0x8d, 0x03, 0x6f, 0x18, 0xfc, 0xca, 0xcc, 0x0b, 0x18, 0x74, - 0x1b, 0xd9, 0xaa, 0x26, 0x9d, 0xab, 0x15, 0x84, 0x53, 0x83, 0x50, 0x39, 0x54, 0xd6, 0xdd, 0x9a, - 0x00, 0xbb, 0x12, 0x73, 0x5e, 0xc1, 0x56, 0x41, 0x2b, 0x74, 0x9d, 0xdc, 0xbc, 0x5a, 0x29, 0xce, - 0xab, 0x77, 0x61, 0x73, 0x12, 0x26, 0x8c, 0x9d, 0xa9, 0x65, 0x6e, 0xb5, 0x20, 0xb6, 0x5a, 0x57, - 0xab, 0x5d, 0x7d, 0xcb, 0x9f, 0xc0, 0xe5, 0xde, 0xe4, 0x70, 0x18, 0x24, 0xc7, 0x25, 0xb6, 0xf8, - 0x06, 0x10, 0x14, 0x58, 0xdc, 0xbb, 0x2d, 0x57, 0x34, 0x2e, 0xe7, 0x2a, 0xd8, 0x65, 0xb2, 0x30, - 0x37, 0xbc, 0x03, 0xd7, 0x35, 0x78, 0x3f, 0x4a, 0x83, 0xa3, 0xc0, 0xf7, 0xf4, 0xa2, 0xe6, 0x7c, - 0xb9, 0x00, 0x37, 0x66, 0xd3, 0xa0, 0x25, 0x3e, 0x85, 0xa6, 0x97, 0xa6, 0x9e, 0x7f, 0xcc, 0xd4, - 0x12, 0xb5, 0xe6, 0xcc, 0xd4, 0xde, 0x50, 0xf4, 0x02, 0x4d, 0x78, 0xfd, 0x1d, 0x50, 0x53, 0x02, - 0x37, 0x11, 0x0b, 0x02, 0x05, 0x23, 0xe1, 0xac, 0x02, 0x60, 0x7d, 0xd5, 0x02, 0xc0, 0xf3, 0x51, - 0x89, 0x44, 0x11, 0x4b, 0x54, 0x4e, 0xa4, 0x35, 0xb7, 0x53, 0x64, 0xfc, 0x5c, 0xac, 0x3b, 0xbf, - 0xab, 0xc0, 0xf6, 0x01, 0x6b, 0x23, 0xd2, 0x90, 0xf5, 0x6b, 0x65, 0x16, 0x9c, 0x93, 0x65, 0x59, - 0x31, 0x0f, 0xa3, 0x7e, 0xc8, 0x99, 0xde, 0xf6, 0x99, 0x2b, 0x70, 0x31, 0xc2, 0x65, 0x57, 0xdd, - 0x66, 0x18, 0x09, 0x61, 0x6f, 0x9f, 0x49, 0x98, 0xf7, 0x6c, 0x19, 0xad, 0xa4, 0x94, 0x73, 0x7a, - 0x5d, 0x51, 0x0a, 0x2d, 0x9c, 0xdf, 0x2f, 0xc0, 0xb5, 0x59, 0xfa, 0xe0, 0x6d, 0xfd, 0x7f, 0x93, - 0xc6, 0x23, 0x58, 0x11, 0x6d, 0x14, 0x95, 0xaf, 0x4a, 0x66, 0xde, 0x9c, 0xaf, 0x89, 0x58, 0x66, - 0x8c, 0xae, 0x92, 0x60, 0x3f, 0x83, 0x15, 0xc4, 0x2e, 0xa2, 0xe5, 0x75, 0xa8, 0x6a, 0xd1, 0x85, - 0x4a, 0x42, 0x16, 0xc6, 0xce, 0x36, 0x5c, 0x51, 0xc3, 0x72, 0x99, 0x8f, 0xff, 0xb7, 0x02, 0x57, - 0xcb, 0xd7, 0x2f, 0x34, 0x7b, 0x9c, 0x67, 0xae, 0x2c, 0x1f, 0x19, 0xad, 0x0b, 0x8d, 0x8c, 0x8b, - 0x17, 0x1a, 0x19, 0x97, 0x66, 0x8c, 0x8c, 0xbf, 0xad, 0xc0, 0xda, 0x5e, 0x4c, 0x59, 0xfb, 0xfe, - 0x5c, 0x5c, 0x97, 0x72, 0xd7, 0x8f, 0xa0, 0x3d, 0xe6, 0x19, 0xc3, 0xef, 0x17, 0x72, 0x6e, 0x4b, - 0x2e, 0x68, 0xfd, 0x0b, 0xcb, 0x46, 0x6a, 0x92, 0x28, 0xb4, 0x3a, 0x6d, 0x5c, 0xd1, 0xc8, 0x09, - 0x2c, 0x26, 0x94, 0x0e, 0xb0, 0xbe, 0x89, 0xdf, 0xce, 0x26, 0xac, 0x9b, 0x6a, 0x60, 0x6e, 0xfa, - 0x14, 0xda, 0x4f, 0x98, 0x2b, 0x7c, 0x75, 0xe5, 0x9c, 0x75, 0x20, 0xba, 0x04, 0x94, 0xcb, 0xd0, - 0xbd, 0x61, 0x94, 0x98, 0xa7, 0x76, 0x36, 0x98, 0x31, 0x74, 0x14, 0x89, 0x19, 0x2c, 0x91, 0x87, - 0x6f, 0x82, 0x24, 0x7b, 0x29, 0xd9, 0x81, 0x75, 0x13, 0x46, 0x3f, 0x61, 0x05, 0x94, 0x0a, 0x44, - 0xe8, 0xc4, 0x06, 0x26, 0xf9, 0xe5, 0x7c, 0x59, 0x81, 0xce, 0x01, 0xef, 0xe6, 0xf7, 0x38, 0x59, - 0x98, 0x4c, 0x12, 0x77, 0xec, 0xab, 0x33, 0xb1, 0xd4, 0x87, 0x8f, 0x44, 0x7d, 0x73, 0x0a, 0x6c, - 0x20, 0x8c, 0xe3, 0x22, 0x7f, 0xa3, 0x9b, 0x24, 0xfc, 0xca, 0xa7, 0xae, 0x35, 0xfd, 0xe6, 0x6b, - 0xdc, 0x22, 0x8c, 0x5c, 0x59, 0x77, 0xfa, 0xcd, 0xeb, 0x94, 0x4f, 0x63, 0xf4, 0x6b, 0x8a, 0x05, - 0x5c, 0x87, 0x9c, 0x2b, 0x70, 0xb9, 0x44, 0x3d, 0x79, 0xa8, 0x5d, 0x77, 0xfa, 0x2e, 0x7d, 0x40, - 0xe3, 0xd7, 0x81, 0xcf, 0xd3, 0xfd, 0x0a, 0x22, 0xe4, 0xb2, 0x16, 0xec, 0xe6, 0xeb, 0xb5, 0x6d, - 0x97, 0x2d, 0xa1, 0xcc, 0x7f, 0x57, 0xa1, 0x2e, 0x2d, 0xa8, 0x64, 0x7e, 0x0f, 0x16, 0xf9, 0x33, - 0x1b, 0xd9, 0xd4, 0xb8, 0xb4, 0x67, 0x38, 0x7b, 0xab, 0x80, 0x4f, 0x6b, 0xcf, 0x0a, 0x3e, 0xa7, - 0x19, 0xca, 0x98, 0x6f, 0x74, 0x86, 0x32, 0xf9, 0xc7, 0x3a, 0x17, 0xea, 0xc6, 0x53, 0x1a, 0xb9, - 0x5e, 0x7c, 0xe1, 0x32, 0xde, 0xe7, 0xec, 0x1b, 0xb3, 0x09, 0x50, 0xe6, 0x1e, 0xac, 0xaa, 0xb7, - 0x31, 0x62, 0x97, 0x3e, 0x98, 0x49, 0x49, 0x57, 0xe6, 0x3c, 0xa6, 0xf1, 0xa3, 0xa9, 0xa7, 0x26, - 0xfd, 0x68, 0xe6, 0x7c, 0x6d, 0x1c, 0x2d, 0x3f, 0x0a, 0xbf, 0x80, 0x66, 0x6e, 0x22, 0x23, 0xef, - 0x68, 0xe4, 0xe5, 0x83, 0xac, 0xed, 0xcc, 0x23, 0x41, 0xc9, 0x13, 0xe8, 0xcc, 0x6a, 0x0b, 0xc8, - 0x87, 0xe5, 0x55, 0xb8, 0x2c, 0xf7, 0xda, 0x1f, 0x9d, 0x8b, 0x56, 0x6e, 0x7a, 0xa7, 0x42, 0x22, - 0xd6, 0x24, 0x96, 0xd6, 0x14, 0x72, 0xfb, 0x1c, 0x65, 0x47, 0x6e, 0xf9, 0xc1, 0xb9, 0x0b, 0x14, - 0xdb, 0x30, 0xc8, 0x9e, 0x68, 0x8d, 0xed, 0x6e, 0x95, 0xb8, 0x40, 0xd9, 0x66, 0xef, 0x9f, 0x49, - 0x37, 0xdd, 0xea, 0x67, 0xd0, 0xca, 0x4f, 0x71, 0xc4, 0x39, 0x7b, 0xe8, 0xb4, 0x6f, 0xce, 0xa5, - 0xc9, 0x9c, 0xdc, 0x78, 0xc7, 0x33, 0x9c, 0xbc, 0xec, 0xed, 0xd0, 0x70, 0xf2, 0xd2, 0x27, 0x40, - 0xf2, 0x18, 0xaa, 0xda, 0x4b, 0x1d, 0xd9, 0xce, 0xbf, 0x9d, 0x99, 0xf2, 0xae, 0xcd, 0x5a, 0xce, - 0x49, 0xc3, 0x6c, 0xb7, 0x3d, 0xf7, 0x25, 0xae, 0x28, 0x2d, 0xf7, 0xa6, 0xc6, 0x8c, 0x99, 0x7f, - 0xa3, 0x32, 0x8c, 0x39, 0xe3, 0x55, 0xcd, 0x30, 0xe6, 0xac, 0x47, 0x2e, 0x1e, 0x56, 0xb9, 0x89, - 0xd0, 0x08, 0xab, 0xf2, 0x71, 0xdb, 0x08, 0xab, 0x59, 0xe3, 0x28, 0x93, 0x9c, 0x1b, 0x37, 0x0c, - 0xc9, 0xe5, 0x03, 0x92, 0x21, 0x79, 0xd6, 0xb4, 0xe2, 0x01, 0x29, 0x4e, 0x02, 0x44, 0xff, 0x0f, - 0x6c, 0xe6, 0xd0, 0x61, 0xbf, 0x77, 0x06, 0x15, 0x66, 0xf5, 0xbf, 0x59, 0xaa, 0x5c, 0x3e, 0x8e, - 0x3c, 0xd6, 0xc3, 0xa9, 0xdc, 0xfe, 0x04, 0x6a, 0x7a, 0xb9, 0x24, 0xfa, 0xdd, 0x95, 0x94, 0x57, - 0xfb, 0xfa, 0xcc, 0x75, 0x3c, 0x0b, 0x13, 0xa8, 0xf7, 0x0c, 0x86, 0xc0, 0x92, 0x9e, 0xc6, 0x10, - 0x58, 0xd6, 0x6c, 0x90, 0x2e, 0x40, 0xd6, 0x2a, 0x90, 0xab, 0x1a, 0x79, 0xa1, 0x07, 0xb1, 0xb7, - 0x67, 0xac, 0x66, 0x6e, 0xac, 0x75, 0x12, 0x86, 0x1b, 0x17, 0xfb, 0x0e, 0xc3, 0x8d, 0x4b, 0x1a, - 0x10, 0xf2, 0x0b, 0x68, 0x17, 0x2a, 0x33, 0xd1, 0x7d, 0x74, 0x56, 0x5b, 0x61, 0xbf, 0x3b, 0x9f, - 0x48, 0xca, 0x3f, 0x5c, 0x16, 0x7f, 0x43, 0x7f, 0xfb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x22, - 0xfc, 0x70, 0xb3, 0x93, 0x1e, 0x00, 0x00, + // 2402 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 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, + 0x27, 0x8a, 0x2a, 0x8e, 0x5c, 0x80, 0x03, 0x05, 0xb5, 0x17, 0x7e, 0x01, 0x55, 0x5c, 0x38, 0xb2, + 0xbf, 0x81, 0x23, 0xff, 0x82, 0x5f, 0x40, 0xf5, 0x4b, 0xea, 0xd6, 0x8c, 0x64, 0x7b, 0x8b, 0x9b, + 0xe6, 0x7b, 0xf5, 0xd7, 0x5f, 0x7f, 0x6f, 0xc1, 0x6a, 0x30, 0x24, 0xdb, 0xc3, 0x24, 0xce, 0x62, + 0xb4, 0x7a, 0x1a, 0xf4, 0xfb, 0x38, 0x4b, 0x86, 0xa1, 0xdb, 0x80, 0xda, 0x97, 0x38, 0x49, 0x49, + 0x4c, 0x3d, 0xfc, 0x6a, 0x84, 0xd3, 0xcc, 0xfd, 0xc6, 0x82, 0xfa, 0x18, 0x94, 0x0e, 0x63, 0x9a, + 0x62, 0xf4, 0x2e, 0xd4, 0x5e, 0x0b, 0x90, 0x9f, 0x66, 0x09, 0xa1, 0x47, 0x1d, 0x6b, 0xcb, 0xba, + 0xbd, 0xea, 0x55, 0x25, 0x74, 0x9f, 0x03, 0x51, 0x0b, 0x96, 0x06, 0xc1, 0xaf, 0xe2, 0xa4, 0xb3, + 0xb0, 0x65, 0xdd, 0xae, 0x7a, 0xe2, 0x83, 0x43, 0x09, 0x8d, 0x93, 0x8e, 0x2d, 0xa1, 0xec, 0x83, + 0x41, 0x87, 0x41, 0x16, 0x1e, 0x77, 0x16, 0x05, 0x94, 0x7f, 0xa0, 0xeb, 0x00, 0xc3, 0x04, 0x27, + 0xb8, 0x8f, 0x83, 0x14, 0x77, 0x96, 0xf8, 0x21, 0x1a, 0x84, 0x29, 0x72, 0x30, 0x22, 0xfd, 0xc8, + 0x1f, 0xe0, 0x2c, 0x88, 0x82, 0x2c, 0xe8, 0x2c, 0x0b, 0x45, 0x38, 0xf4, 0xe7, 0x12, 0xe8, 0xfe, + 0xcb, 0x06, 0xf4, 0x2c, 0x09, 0x68, 0x1a, 0x84, 0x19, 0x89, 0xe9, 0x4f, 0x70, 0x16, 0x90, 0x7e, + 0x8a, 0x10, 0x2c, 0x1e, 0x07, 0xe9, 0x31, 0x57, 0xbe, 0xe2, 0xf1, 0xdf, 0x68, 0x0b, 0xca, 0xd9, + 0x84, 0x92, 0x6b, 0x5e, 0xf1, 0x74, 0x10, 0xfa, 0x11, 0x2c, 0x47, 0xf8, 0x80, 0x64, 0x69, 0xc7, + 0xde, 0xb2, 0x6f, 0x97, 0x77, 0xde, 0xde, 0x1e, 0x9b, 0x6f, 0x3b, 0x7f, 0xc8, 0x76, 0x97, 0x0e, + 0x47, 0x99, 0x27, 0x59, 0xd0, 0x7d, 0x58, 0x09, 0x13, 0x1c, 0x31, 0xee, 0x45, 0xce, 0xfd, 0xce, + 0x7c, 0xee, 0xa7, 0xa3, 0x8c, 0xb1, 0x2b, 0x26, 0xd4, 0x00, 0xfb, 0x10, 0x0b, 0x4b, 0xd8, 0x1e, + 0xfb, 0x89, 0xae, 0xc1, 0x6a, 0x46, 0x06, 0x38, 0xcd, 0x82, 0xc1, 0x90, 0xdf, 0xde, 0xf6, 0x26, + 0x00, 0xe7, 0x15, 0x2c, 0x71, 0x05, 0x98, 0x7d, 0x09, 0x8d, 0xf0, 0x1b, 0x7e, 0xd9, 0xaa, 0x27, + 0x3e, 0xd0, 0xfb, 0xd0, 0x18, 0x26, 0xf8, 0x35, 0x89, 0x47, 0xa9, 0x1f, 0x84, 0x61, 0x3c, 0xa2, + 0x99, 0x7c, 0xac, 0xba, 0x82, 0x3f, 0x10, 0x60, 0x74, 0x0b, 0xea, 0x13, 0xd2, 0x01, 0xa7, 0xb4, + 0xf9, 0x69, 0xb5, 0x31, 0x25, 0x87, 0x3a, 0xcf, 0x60, 0x59, 0x68, 0x3d, 0xe3, 0xcc, 0x0e, 0xac, + 0x98, 0x47, 0xa9, 0x4f, 0xe4, 0x40, 0x89, 0xd0, 0x0c, 0x27, 0x34, 0xe8, 0x73, 0xd9, 0x25, 0x6f, + 0xfc, 0xed, 0xfe, 0xd5, 0x82, 0xca, 0xc3, 0x7e, 0x1c, 0x9e, 0xcc, 0x7b, 0xbc, 0x36, 0x2c, 0x1f, + 0x63, 0x72, 0x74, 0x2c, 0x24, 0x2f, 0x79, 0xf2, 0xcb, 0xb4, 0x91, 0x3d, 0x65, 0x23, 0xf4, 0x00, + 0x2a, 0xda, 0xfb, 0xaa, 0x87, 0xd9, 0x9c, 0xfb, 0x30, 0x9e, 0xc1, 0xe2, 0x3e, 0x85, 0x9a, 0xb4, + 0xd3, 0xc3, 0xa0, 0x1f, 0xd0, 0x10, 0xeb, 0xb7, 0xb4, 0xcc, 0x5b, 0xbe, 0x0d, 0xd5, 0x2c, 0xce, + 0x82, 0xbe, 0x7f, 0x20, 0x48, 0xb9, 0xae, 0xb6, 0x57, 0xe1, 0x40, 0xc9, 0xee, 0x56, 0xa1, 0xdc, + 0x23, 0xf4, 0x48, 0x05, 0x61, 0x0d, 0x2a, 0xe2, 0x53, 0x04, 0x20, 0x0b, 0xd3, 0x3d, 0x9c, 0x9d, + 0xc6, 0xc9, 0x89, 0xa2, 0xf8, 0x04, 0xea, 0x63, 0xc8, 0x24, 0x4a, 0x99, 0x7e, 0xaf, 0xb1, 0x4f, + 0x05, 0x46, 0x6a, 0x52, 0x15, 0x50, 0x49, 0xee, 0xfe, 0x10, 0x5a, 0x52, 0xf7, 0xbd, 0xd1, 0xe0, + 0x00, 0x27, 0x52, 0x22, 0xba, 0x09, 0x15, 0xa9, 0xb2, 0x4f, 0x83, 0x01, 0x96, 0x21, 0x5e, 0x96, + 0xb0, 0xbd, 0x60, 0x80, 0xdd, 0xfb, 0xb0, 0x3e, 0xc5, 0xaa, 0x1f, 0x2d, 0x79, 0x39, 0x66, 0x72, + 0xb4, 0x46, 0xee, 0x36, 0xa1, 0x2e, 0xf9, 0x53, 0x75, 0x8f, 0x7f, 0xda, 0xd0, 0x98, 0xc0, 0xa4, + 0xb8, 0x1f, 0x43, 0x49, 0x32, 0xa6, 0x1d, 0x2b, 0x17, 0x74, 0xd3, 0xe4, 0x0a, 0xe0, 0x8d, 0x99, + 0xd0, 0x87, 0x80, 0xc2, 0x51, 0x92, 0x60, 0x9a, 0xf9, 0x07, 0xcc, 0x89, 0x7c, 0xee, 0x3a, 0x22, + 0xb8, 0x1b, 0x12, 0xc3, 0xbd, 0xeb, 0x0b, 0xe6, 0x46, 0x77, 0xa1, 0x35, 0x45, 0x2d, 0x9c, 0xca, + 0xe6, 0x4e, 0x85, 0x0c, 0x7a, 0x8e, 0x71, 0x7e, 0xbb, 0x00, 0x2b, 0x2a, 0x50, 0x2e, 0x76, 0xf7, + 0x9c, 0x79, 0x17, 0x72, 0xe6, 0xcd, 0x7b, 0x8a, 0x9d, 0xf7, 0x14, 0x76, 0x35, 0xfc, 0x46, 0x04, + 0x89, 0x7f, 0x82, 0xcf, 0x7c, 0xe1, 0x73, 0x22, 0x8b, 0x36, 0x14, 0xe6, 0x31, 0x3e, 0xdb, 0xe5, + 0xca, 0x7d, 0x08, 0x48, 0x85, 0x94, 0x46, 0xbd, 0x24, 0xa8, 0x15, 0xc6, 0xa0, 0x1e, 0x0c, 0xe3, + 0x24, 0xc3, 0x91, 0x46, 0xbd, 0x2c, 0xa9, 0x25, 0x46, 0x51, 0xbb, 0x2f, 0xa1, 0xe5, 0x61, 0x76, + 0x17, 0x65, 0x7f, 0xe9, 0x48, 0x17, 0x34, 0xc8, 0x15, 0x28, 0x51, 0x7c, 0xaa, 0x1b, 0x63, 0x85, + 0xe2, 0x53, 0xee, 0x67, 0x1b, 0xb0, 0x3e, 0x25, 0x59, 0xc6, 0xc1, 0x0b, 0x40, 0x7b, 0xf8, 0x4d, + 0x36, 0x75, 0x20, 0xab, 0x1a, 0x41, 0x9a, 0x0e, 0x8f, 0x13, 0x56, 0x35, 0x44, 0x82, 0xd0, 0x20, + 0x17, 0x30, 0xbd, 0xfb, 0x29, 0xac, 0x19, 0x82, 0x2f, 0xe7, 0xd7, 0x7f, 0xb1, 0xa4, 0x5e, 0x51, + 0x94, 0xe0, 0x54, 0xf9, 0xf6, 0x9c, 0x9c, 0xf0, 0x7d, 0x58, 0x3c, 0x21, 0x34, 0xe2, 0x9a, 0xd4, + 0x76, 0x5c, 0xcd, 0xb9, 0xf3, 0x62, 0xb6, 0x1f, 0x13, 0x1a, 0x79, 0x9c, 0xde, 0xdd, 0x81, 0x45, + 0xf6, 0x85, 0x5a, 0xd0, 0x78, 0xd8, 0xed, 0xdd, 0xbd, 0x7b, 0xef, 0x9e, 0xff, 0xe8, 0xe5, 0xb3, + 0x47, 0xde, 0xde, 0x83, 0x27, 0x8d, 0xb7, 0x74, 0x68, 0x77, 0x4f, 0x42, 0x2d, 0xf7, 0x3b, 0xf2, + 0x6a, 0x4a, 0xa8, 0xbc, 0x1a, 0x53, 0x4e, 0x80, 0x64, 0xa4, 0xab, 0x4f, 0xf7, 0x8f, 0x16, 0x6c, + 0x74, 0xf9, 0x63, 0xf7, 0x12, 0xf2, 0x3a, 0xc8, 0xf0, 0x63, 0x7c, 0x76, 0x51, 0x53, 0xcf, 0x4e, + 0xf6, 0xef, 0xb1, 0x7a, 0xc2, 0xc5, 0x71, 0xd7, 0x3a, 0x25, 0x87, 0xdc, 0xbd, 0x57, 0xbd, 0xea, + 0x70, 0x7c, 0xca, 0x0b, 0x72, 0xc8, 0x72, 0x7a, 0x82, 0xd3, 0x30, 0xa0, 0xdc, 0xa7, 0x4b, 0x9e, + 0xfc, 0x72, 0x1d, 0xe8, 0xe4, 0x95, 0x92, 0x6e, 0x41, 0xa1, 0x26, 0xc3, 0xe3, 0x92, 0x3e, 0xf8, + 0x31, 0xb4, 0x13, 0xfc, 0x6a, 0x44, 0x12, 0x1c, 0xf9, 0x61, 0x4c, 0x0f, 0x49, 0x32, 0x08, 0x44, + 0x51, 0x10, 0x05, 0x65, 0x5d, 0x61, 0x77, 0x75, 0xa4, 0x4b, 0xa1, 0x3e, 0x3e, 0x4f, 0x9a, 0xb3, + 0x05, 0x4b, 0x3c, 0x4c, 0xf9, 0x39, 0xb6, 0x27, 0x3e, 0x58, 0x21, 0x4a, 0x87, 0x98, 0x46, 0xc1, + 0x41, 0x5f, 0xe5, 0xfd, 0x09, 0x80, 0x95, 0x58, 0x32, 0x18, 0x04, 0xd9, 0x28, 0xc1, 0x7e, 0x82, + 0x4f, 0x83, 0x24, 0x52, 0x25, 0x56, 0x81, 0x3d, 0x0e, 0x75, 0xff, 0xbc, 0x00, 0xed, 0x9f, 0xe2, + 0x4c, 0x2b, 0x4b, 0x63, 0x1f, 0xdb, 0x86, 0xb5, 0x34, 0x0b, 0x92, 0x8c, 0xd0, 0x23, 0x3d, 0xd5, + 0x89, 0x97, 0x69, 0x2a, 0xd4, 0x24, 0xd7, 0xed, 0xc0, 0xfa, 0x34, 0xfd, 0xa4, 0x82, 0x36, 0xbd, + 0x35, 0x93, 0x43, 0x94, 0xd3, 0x3b, 0xd0, 0xc4, 0x34, 0x9a, 0x3a, 0xc1, 0xe6, 0x27, 0xd4, 0x05, + 0x62, 0x22, 0x7f, 0x1b, 0xd6, 0x4c, 0x5a, 0x21, 0x7d, 0x91, 0x9b, 0xb3, 0xa9, 0x53, 0x0b, 0xd9, + 0xf7, 0xe1, 0xea, 0x80, 0x50, 0x32, 0x18, 0x0d, 0xfc, 0x04, 0x87, 0x2c, 0x05, 0x1b, 0xb5, 0x79, + 0x89, 0xf3, 0x5d, 0x91, 0x24, 0x1e, 0xa7, 0xd0, 0xcd, 0xe0, 0xfe, 0xc3, 0x82, 0x8d, 0x9c, 0x69, + 0xe4, 0x9b, 0x7c, 0x0e, 0x68, 0x40, 0x28, 0x8e, 0x4c, 0x91, 0xa2, 0xa0, 0x6c, 0x68, 0x31, 0xa7, + 0xf7, 0x19, 0x5e, 0x93, 0xb3, 0xe8, 0xf2, 0x50, 0x0f, 0x5a, 0x23, 0x5a, 0x20, 0x69, 0xe1, 0x22, + 0x8d, 0xc3, 0x9a, 0x64, 0x35, 0xb4, 0xfe, 0xc6, 0x82, 0x8d, 0xdd, 0xe3, 0x80, 0x1e, 0xe1, 0xde, + 0x38, 0x76, 0xd4, 0x8b, 0x7e, 0x02, 0xf6, 0x09, 0x3e, 0xe3, 0x2f, 0x58, 0xdb, 0x79, 0x4f, 0x13, + 0x3e, 0x83, 0x61, 0x9b, 0x45, 0x02, 0x63, 0x61, 0x4e, 0x1f, 0xf7, 0x23, 0x5f, 0x0b, 0x50, 0x51, + 0xf1, 0xaa, 0x71, 0x3f, 0x9a, 0xb0, 0x31, 0x32, 0x96, 0x78, 0x35, 0x32, 0xf1, 0x96, 0x55, 0x8a, + 0x4f, 0x27, 0x64, 0xee, 0x75, 0xb0, 0x1f, 0xe3, 0x33, 0x54, 0x86, 0x95, 0x9e, 0xd7, 0xfd, 0xf2, + 0xc1, 0xb3, 0x47, 0x8d, 0xb7, 0x10, 0xc0, 0x72, 0xef, 0xf9, 0xc3, 0x27, 0xdd, 0xdd, 0x86, 0xc5, + 0x02, 0x32, 0xaf, 0x91, 0x0c, 0xc8, 0xdf, 0x2c, 0x40, 0xfb, 0xf3, 0x11, 0xd5, 0x2f, 0x7d, 0x7e, + 0x52, 0x64, 0xe5, 0x2f, 0x48, 0x8e, 0x70, 0xa6, 0xfa, 0x4d, 0xd5, 0x28, 0x71, 0xa0, 0xe8, 0x36, + 0xe7, 0x44, 0xac, 0x3d, 0x27, 0x62, 0xd1, 0xa7, 0xe0, 0x10, 0x1a, 0xf6, 0x47, 0x11, 0xf6, 0xc7, + 0x21, 0x17, 0xc6, 0x84, 0x1e, 0x04, 0x29, 0x4e, 0x65, 0xa6, 0xe9, 0x48, 0x8a, 0xae, 0x24, 0xd8, + 0x55, 0x78, 0x16, 0x34, 0x8a, 0x3b, 0xe4, 0x57, 0xf6, 0xd3, 0x30, 0x21, 0x43, 0x51, 0x48, 0x4b, + 0xde, 0x9a, 0x44, 0x0a, 0x73, 0xec, 0x73, 0x94, 0xfb, 0x37, 0x1b, 0x36, 0x72, 0x26, 0x90, 0x8e, + 0xf9, 0x0b, 0x68, 0xa4, 0xb8, 0x8f, 0x43, 0x56, 0x67, 0x63, 0xde, 0x3b, 0x2b, 0xb7, 0xfc, 0xae, + 0xf6, 0xde, 0x33, 0xb8, 0xb7, 0x7b, 0xb2, 0xff, 0x96, 0xb3, 0x42, 0x5d, 0x89, 0x12, 0xdf, 0x29, + 0x2b, 0x77, 0xa2, 0x8d, 0x30, 0xcc, 0x58, 0xe6, 0x30, 0x69, 0xc5, 0xdb, 0xd0, 0x90, 0x17, 0x19, + 0x9e, 0xa8, 0xbb, 0x08, 0x27, 0xa8, 0x09, 0x78, 0xef, 0x44, 0x5c, 0xc3, 0xf9, 0x8f, 0x05, 0x35, + 0xf3, 0x40, 0x36, 0x44, 0x68, 0x61, 0xa0, 0xe7, 0x9b, 0xba, 0x06, 0xe7, 0xd9, 0xe0, 0x26, 0x54, + 0xc4, 0xfd, 0x7c, 0x31, 0x18, 0x88, 0x9a, 0x50, 0x16, 0xb0, 0x2e, 0x1f, 0x0f, 0xda, 0xb0, 0x6c, + 0x8c, 0x17, 0xf2, 0x0b, 0x5d, 0x85, 0xd5, 0x89, 0x6e, 0x8b, 0x5c, 0x7c, 0x69, 0x28, 0xb5, 0x62, + 0x72, 0x59, 0xb6, 0x60, 0xbd, 0x2e, 0xeb, 0xeb, 0xe5, 0x7c, 0x54, 0x96, 0xb0, 0x67, 0x44, 0x34, + 0x53, 0x87, 0x49, 0x3c, 0x18, 0xbf, 0x32, 0x6f, 0x63, 0x4a, 0x5e, 0x85, 0x01, 0xd5, 0xcb, 0xba, + 0x7f, 0xb2, 0xa0, 0xbd, 0x4f, 0x8e, 0x68, 0x81, 0x9f, 0x9e, 0x57, 0xe9, 0x3e, 0x86, 0x76, 0x8a, + 0x13, 0x12, 0xf4, 0xc9, 0xaf, 0xcd, 0xbc, 0x20, 0x83, 0x6e, 0x7d, 0x82, 0xd5, 0xa4, 0x33, 0xb5, + 0x08, 0x1d, 0x1b, 0x04, 0x8b, 0xa1, 0xb2, 0xea, 0x55, 0x38, 0xb0, 0x2b, 0x60, 0xee, 0x2b, 0xd8, + 0xc8, 0x69, 0x25, 0x5d, 0x67, 0x6a, 0x5e, 0xb5, 0xf2, 0xf3, 0xea, 0x3d, 0x68, 0x8f, 0x68, 0x4a, + 0x8e, 0x58, 0xba, 0x32, 0x8f, 0x5a, 0xe0, 0x47, 0xb5, 0x14, 0xb6, 0xab, 0x1f, 0xf9, 0x33, 0xb8, + 0xd2, 0x1b, 0x1d, 0xf4, 0x49, 0x7a, 0x5c, 0x60, 0x8b, 0x8f, 0x00, 0x49, 0x81, 0xf9, 0xb3, 0x9b, + 0x02, 0xa3, 0x71, 0xb9, 0xd7, 0xc0, 0x29, 0x92, 0x25, 0x73, 0xc3, 0x4d, 0xb8, 0xa1, 0x81, 0xf7, + 0xe2, 0x8c, 0x1c, 0x92, 0x30, 0xd0, 0x8b, 0x9a, 0xfb, 0xf5, 0x02, 0x6c, 0xcd, 0xa6, 0x91, 0x96, + 0xf8, 0x0c, 0xea, 0x41, 0x96, 0x05, 0xe1, 0x31, 0x8e, 0x44, 0xad, 0x39, 0x37, 0xb5, 0xd7, 0x14, + 0x3d, 0x87, 0xa6, 0xac, 0xfe, 0x46, 0xd8, 0x94, 0xc0, 0x4c, 0x54, 0xf1, 0x6a, 0x0a, 0x2c, 0x09, + 0x67, 0x15, 0x00, 0xfb, 0xdb, 0x16, 0x00, 0x96, 0x8f, 0x0a, 0x24, 0xf2, 0x58, 0xc2, 0x62, 0x22, + 0xad, 0x78, 0x9d, 0x3c, 0xe3, 0x17, 0x1c, 0xef, 0xfe, 0xde, 0x82, 0xcd, 0xfd, 0x21, 0xa6, 0x19, + 0xc5, 0x69, 0x5a, 0x64, 0xc1, 0x39, 0x59, 0xf6, 0x0e, 0x34, 0x69, 0xec, 0x53, 0xc6, 0x74, 0xe6, + 0x8f, 0x28, 0xeb, 0x46, 0x44, 0x8a, 0x28, 0x79, 0x75, 0x1a, 0x73, 0x61, 0x67, 0xcf, 0x05, 0x98, + 0xf5, 0x6c, 0x13, 0x5a, 0x41, 0x29, 0xe6, 0xf4, 0xaa, 0xa2, 0xe4, 0x5a, 0xb8, 0x7f, 0x58, 0x80, + 0xeb, 0xb3, 0xf4, 0x91, 0xaf, 0xf5, 0xff, 0x4d, 0x1a, 0x8f, 0x61, 0x85, 0xb7, 0x51, 0x58, 0x6c, + 0x95, 0xcc, 0xbc, 0x39, 0x5f, 0x13, 0x8e, 0x8e, 0x70, 0xe2, 0x29, 0x09, 0xce, 0x73, 0x58, 0x91, + 0xb0, 0xcb, 0x68, 0x79, 0x03, 0xca, 0x5a, 0x74, 0x49, 0x25, 0x61, 0x12, 0xc6, 0xee, 0x26, 0x5c, + 0x55, 0xc3, 0x72, 0x91, 0x8f, 0xff, 0xd7, 0x82, 0x6b, 0xc5, 0xf8, 0x4b, 0xcd, 0x1e, 0x17, 0x99, + 0x2b, 0x8b, 0x47, 0x46, 0xfb, 0x52, 0x23, 0xe3, 0xe2, 0xa5, 0x46, 0xc6, 0xa5, 0x19, 0x23, 0xe3, + 0xef, 0x2c, 0x58, 0xdb, 0x4d, 0x70, 0x90, 0xe1, 0x17, 0xfc, 0xb9, 0x94, 0xbb, 0x7e, 0x00, 0xcd, + 0x21, 0xcb, 0x18, 0xa1, 0x9f, 0xcb, 0xb9, 0x0d, 0x81, 0xd0, 0xfa, 0x97, 0x8f, 0x00, 0xa9, 0x49, + 0x22, 0xd7, 0xea, 0x34, 0x25, 0x46, 0x23, 0x47, 0xb0, 0x98, 0x62, 0x1c, 0xc9, 0xfa, 0xc6, 0x7f, + 0xbb, 0x6d, 0x68, 0x99, 0x6a, 0xc8, 0xdc, 0xf4, 0x19, 0x34, 0x9f, 0x0e, 0x31, 0xfd, 0xf6, 0xca, + 0xb9, 0x2d, 0x40, 0xba, 0x04, 0x29, 0xb7, 0x05, 0x68, 0xb7, 0x1f, 0xa7, 0xe6, 0xad, 0xdd, 0x75, + 0x58, 0x33, 0xa0, 0x92, 0x78, 0x1d, 0xd6, 0x04, 0xe4, 0xd1, 0x1b, 0x92, 0x4e, 0x36, 0x25, 0xdb, + 0xd0, 0x32, 0xc1, 0xd2, 0x4f, 0xda, 0xb0, 0x8c, 0x39, 0x84, 0xeb, 0x54, 0xf2, 0xe4, 0x97, 0xfb, + 0xb5, 0x05, 0x9d, 0x7d, 0xd6, 0xcd, 0xef, 0x32, 0x32, 0x9a, 0x8e, 0x52, 0x6f, 0x18, 0xaa, 0x3b, + 0xdd, 0x82, 0xba, 0x5c, 0x12, 0xf9, 0xe6, 0x14, 0x58, 0x93, 0x60, 0x39, 0x2e, 0x22, 0x07, 0x4a, + 0xa3, 0x94, 0x3d, 0xf9, 0xd8, 0xb5, 0xc6, 0xdf, 0x0c, 0xc7, 0x2c, 0x72, 0x1a, 0x27, 0xca, 0xba, + 0xe3, 0x6f, 0x56, 0xa7, 0x42, 0x9c, 0x48, 0xbf, 0xc6, 0xb2, 0x80, 0xeb, 0x20, 0xf7, 0x2a, 0x5c, + 0x29, 0x50, 0x4f, 0x5c, 0x6a, 0xc7, 0x1b, 0xef, 0xa5, 0xf7, 0x71, 0xf2, 0x9a, 0x84, 0x2c, 0xdd, + 0xaf, 0x48, 0x08, 0xba, 0xa2, 0x05, 0xbb, 0xb9, 0xbd, 0x76, 0x9c, 0x22, 0x94, 0x94, 0xf9, 0xef, + 0x32, 0x54, 0x85, 0x05, 0x95, 0xcc, 0x1f, 0xc0, 0x62, 0x8f, 0xd0, 0x23, 0xd4, 0xd6, 0xb8, 0xb4, + 0x35, 0x9c, 0xb3, 0x91, 0x83, 0x8f, 0x6b, 0xcf, 0x8a, 0x5c, 0xa7, 0x19, 0xca, 0x98, 0x3b, 0x3a, + 0x43, 0x99, 0xe9, 0x65, 0x9d, 0x07, 0x55, 0x63, 0x95, 0x86, 0x6e, 0xe4, 0x37, 0x5c, 0xc6, 0x7e, + 0xce, 0xd9, 0x9a, 0x4d, 0x20, 0x65, 0xee, 0x42, 0x49, 0xed, 0xc6, 0x90, 0x53, 0xb8, 0x30, 0x13, + 0x92, 0xae, 0xce, 0x59, 0xa6, 0xb1, 0xab, 0xa9, 0x55, 0x93, 0x7e, 0x35, 0x73, 0xbe, 0x36, 0xae, + 0x36, 0x3d, 0x0a, 0xbf, 0x84, 0xfa, 0xd4, 0x44, 0x86, 0x6e, 0x6a, 0xe4, 0xc5, 0x83, 0xac, 0xe3, + 0xce, 0x23, 0x91, 0x92, 0x47, 0xd0, 0x99, 0xd5, 0x16, 0xa0, 0x3b, 0xc5, 0x55, 0xb8, 0x28, 0xf7, + 0x3a, 0x1f, 0x5c, 0x88, 0x56, 0x1c, 0x7a, 0xd7, 0x42, 0x31, 0xb4, 0x8b, 0x6b, 0x0a, 0xba, 0x7d, + 0x81, 0xb2, 0x23, 0x8e, 0x7c, 0xff, 0xc2, 0x05, 0xea, 0xae, 0x85, 0xc8, 0x64, 0x45, 0x6b, 0x1c, + 0xf7, 0x5e, 0x81, 0x0b, 0x14, 0x1d, 0x76, 0xeb, 0x5c, 0xba, 0xf1, 0x51, 0x5f, 0x41, 0x63, 0x7a, + 0x8a, 0x43, 0xee, 0xf9, 0x43, 0xa7, 0xf3, 0xf6, 0x5c, 0x9a, 0x89, 0x93, 0x1b, 0x7b, 0x3c, 0xc3, + 0xc9, 0x8b, 0x76, 0x87, 0x86, 0x93, 0x17, 0xae, 0x00, 0xd1, 0x13, 0x28, 0x6b, 0x9b, 0x3a, 0xb4, + 0x39, 0xbd, 0x3b, 0x33, 0xe5, 0x5d, 0x9f, 0x85, 0x9e, 0x92, 0x26, 0xb3, 0xdd, 0xe6, 0xdc, 0x4d, + 0x5c, 0x5e, 0xda, 0xd4, 0x4e, 0xed, 0x2b, 0x68, 0x4c, 0xef, 0xa8, 0x0c, 0x63, 0xce, 0xd8, 0xaa, + 0x19, 0xc6, 0x9c, 0xb5, 0xe4, 0x62, 0x61, 0x35, 0x35, 0x11, 0x1a, 0x61, 0x55, 0x3c, 0x6e, 0x1b, + 0x61, 0x35, 0x6b, 0x1c, 0x7d, 0x09, 0xf5, 0xa9, 0x71, 0xc3, 0x90, 0x5c, 0x3c, 0x20, 0x19, 0x92, + 0x67, 0x4d, 0x2b, 0x01, 0xa0, 0xfc, 0x24, 0x80, 0xf4, 0xff, 0xc0, 0x66, 0x0e, 0x1d, 0xce, 0xbb, + 0xe7, 0x50, 0xc9, 0xac, 0xfe, 0x77, 0x5b, 0x95, 0xcb, 0x27, 0x71, 0x10, 0xe1, 0x44, 0xe5, 0xf6, + 0xa7, 0x50, 0xd1, 0xcb, 0x25, 0xd2, 0xdf, 0xae, 0xa0, 0xbc, 0x3a, 0x37, 0x66, 0xe2, 0xe5, 0x5d, + 0x9e, 0x42, 0x45, 0xef, 0x19, 0x0c, 0x81, 0x05, 0x3d, 0x8d, 0x21, 0xb0, 0xa8, 0xd9, 0x40, 0x5d, + 0x80, 0x49, 0xab, 0x80, 0xae, 0x69, 0xe4, 0xb9, 0x1e, 0xc4, 0xd9, 0x9c, 0x81, 0x9d, 0xb8, 0xb1, + 0xd6, 0x49, 0x18, 0x6e, 0x9c, 0xef, 0x3b, 0x0c, 0x37, 0x2e, 0x68, 0x40, 0xd0, 0x2f, 0xa1, 0x99, + 0xab, 0xcc, 0x48, 0xf7, 0xd1, 0x59, 0x6d, 0x85, 0xf3, 0xce, 0x7c, 0x22, 0x21, 0xff, 0x60, 0x99, + 0xff, 0x0d, 0xfd, 0xbd, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x22, 0xfc, 0x70, 0xb3, 0x93, 0x1e, + 0x00, 0x00, } diff --git a/wallet/wallet.go b/wallet/wallet.go index 4f6f2a0..97025d5 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -1137,7 +1137,7 @@ func (w *Wallet) GetTransactions(startBlock, endBlock *BlockIdentifier, cancel < if chainClient == nil { return nil, errors.New("no chain server client") } - startResp = chainClient.GetBlockVerboseAsync(startBlock.hash, false) + startResp = chainClient.GetBlockVerboseAsync(startBlock.hash) } } if endBlock != nil { @@ -1147,7 +1147,7 @@ func (w *Wallet) GetTransactions(startBlock, endBlock *BlockIdentifier, cancel < if chainClient == nil { return nil, errors.New("no chain server client") } - endResp = chainClient.GetBlockVerboseAsync(endBlock.hash, false) + endResp = chainClient.GetBlockVerboseAsync(endBlock.hash) } } if startResp != nil { @@ -1598,17 +1598,14 @@ func (w *Wallet) ExportWatchingWallet() (string, error) { } // Export the watching only wallet's serialized data. - woWallet := *w - woWallet.db = woDb - woWallet.Manager = woMgr - return woWallet.exportBase64() + return exportBase64DB(woDb) } -// exportBase64 exports a wallet's serialized database as a base64-encoded +// exportBase64DB exports a wallet's serialized database as a base64-encoded // string. -func (w *Wallet) exportBase64() (string, error) { +func exportBase64DB(db walletdb.DB) (string, error) { var buf bytes.Buffer - if err := w.db.Copy(&buf); err != nil { + if err := db.Copy(&buf); err != nil { return "", err } return base64.StdEncoding.EncodeToString(buf.Bytes()), nil