From 3b4573c4f0a6c769dc1e36f5d86833c99d68a091 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Wed, 18 Sep 2019 21:16:15 -0700 Subject: [PATCH] Add chainname and activation height to getinfo --- cmd/ingest/main.go | 35 ++---------- common/common.go | 42 +++++++++++++++ frontend/service.go | 11 ++-- walletrpc/service.pb.go | 116 +++++++++++++++++++++++----------------- walletrpc/service.proto | 2 + 5 files changed, 122 insertions(+), 84 deletions(-) create mode 100644 common/common.go diff --git a/cmd/ingest/main.go b/cmd/ingest/main.go index f49498f..c7aca21 100644 --- a/cmd/ingest/main.go +++ b/cmd/ingest/main.go @@ -17,6 +17,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" + "github.com/adityapk00/lightwalletd/common" "github.com/adityapk00/lightwalletd/frontend" "github.com/adityapk00/lightwalletd/parser" "github.com/adityapk00/lightwalletd/storage" @@ -120,14 +121,14 @@ func main() { } // Get the sapling activation height from the RPC - saplingHeight, err := getSaplingActivationHeight(rpcClient) + saplingHeight, chainName, err := common.GetSaplingInfo(rpcClient) if err != nil { log.WithFields(logrus.Fields{ "error": err, }).Warn("Unable to get sapling activation height") } - log.WithField("saplingHeight", saplingHeight).Info("Got sapling height ", saplingHeight) + log.WithField("saplingHeight", saplingHeight).Info("Got sapling height ", saplingHeight, " chain ", chainName) //ingest from Sapling testnet height if height < saplingHeight { @@ -192,36 +193,6 @@ func main() { } } -func getSaplingActivationHeight(rpcClient *rpcclient.Client) (int, error) { - result, rpcErr := rpcClient.RawRequest("getblockchaininfo", make([]json.RawMessage, 0)) - - var err error - var errCode int64 - - // For some reason, the error responses are not JSON - if rpcErr != nil { - errParts := strings.SplitN(rpcErr.Error(), ":", 2) - errCode, err = strconv.ParseInt(errParts[0], 10, 32) - //Check to see if we are requesting a height the zcashd doesn't have yet - if err == nil && errCode == -8 { - return -1, nil - } - return -1, errors.Wrap(rpcErr, "error requesting block") - } - - var f interface{} - err = json.Unmarshal(result, &f) - if err != nil { - return -1, errors.Wrap(err, "error reading JSON response") - } - - upgradeJSON := f.(map[string]interface{})["upgrades"] - saplingJSON := upgradeJSON.(map[string]interface{})["76b809bb"] // Sapling ID - saplingHeight := saplingJSON.(map[string]interface{})["activationheight"].(float64) - - return int(saplingHeight), nil -} - func getBlock(rpcClient *rpcclient.Client, height int) (*parser.Block, error) { params := make([]json.RawMessage, 2) params[0] = json.RawMessage("\"" + strconv.Itoa(height) + "\"") diff --git a/common/common.go b/common/common.go new file mode 100644 index 0000000..a3aea98 --- /dev/null +++ b/common/common.go @@ -0,0 +1,42 @@ +package common + +import ( + "encoding/json" + "strconv" + "strings" + + "github.com/adityapk00/btcd/rpcclient" + "github.com/pkg/errors" +) + +func GetSaplingInfo(rpcClient *rpcclient.Client) (int, string, error) { + result, rpcErr := rpcClient.RawRequest("getblockchaininfo", make([]json.RawMessage, 0)) + + var err error + var errCode int64 + + // For some reason, the error responses are not JSON + if rpcErr != nil { + errParts := strings.SplitN(rpcErr.Error(), ":", 2) + errCode, err = strconv.ParseInt(errParts[0], 10, 32) + //Check to see if we are requesting a height the zcashd doesn't have yet + if err == nil && errCode == -8 { + return -1, "", nil + } + return -1, "", errors.Wrap(rpcErr, "error requesting block") + } + + var f interface{} + err = json.Unmarshal(result, &f) + if err != nil { + return -1, "", errors.Wrap(err, "error reading JSON response") + } + + chainName := f.(map[string]interface{})["chain"].(string) + + upgradeJSON := f.(map[string]interface{})["upgrades"] + saplingJSON := upgradeJSON.(map[string]interface{})["76b809bb"] // Sapling ID + saplingHeight := saplingJSON.(map[string]interface{})["activationheight"].(float64) + + return int(saplingHeight), chainName, nil +} diff --git a/frontend/service.go b/frontend/service.go index c933092..587a3e9 100644 --- a/frontend/service.go +++ b/frontend/service.go @@ -18,6 +18,7 @@ import ( // blank import for sqlite driver support _ "github.com/mattn/go-sqlite3" + "github.com/adityapk00/lightwalletd/common" "github.com/adityapk00/lightwalletd/storage" "github.com/adityapk00/lightwalletd/walletrpc" ) @@ -244,12 +245,16 @@ func (s *SqlStreamer) GetTransaction(ctx context.Context, txf *walletrpc.TxFilte // GetLightdInfo gets the LightWalletD (this server) info func (s *SqlStreamer) GetLightdInfo(ctx context.Context, in *walletrpc.Empty) (*walletrpc.LightdInfo, error) { + saplingHeight, chainName, _ := common.GetSaplingInfo(s.client) + // TODO these are called Error but they aren't at the moment. // A success will return code 0 and message txhash. return &walletrpc.LightdInfo{ - Version: "0.1-zeclightd", - Vendor: "ZecWallet LightWalletD", - TaddrSupport: true, + Version: "0.1-zeclightd", + Vendor: "ZecWallet LightWalletD", + TaddrSupport: true, + ChainName: chainName, + SaplingActivationHeight: uint64(saplingHeight), }, nil } diff --git a/walletrpc/service.pb.go b/walletrpc/service.pb.go index 3eb193e..18ff694 100644 --- a/walletrpc/service.pb.go +++ b/walletrpc/service.pb.go @@ -340,12 +340,14 @@ func (m *Empty) XXX_DiscardUnknown() { var xxx_messageInfo_Empty proto.InternalMessageInfo type LightdInfo struct { - Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` - Vendor string `protobuf:"bytes,2,opt,name=vendor,proto3" json:"vendor,omitempty"` - TaddrSupport bool `protobuf:"varint,3,opt,name=taddrSupport,proto3" json:"taddrSupport,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + Vendor string `protobuf:"bytes,2,opt,name=vendor,proto3" json:"vendor,omitempty"` + TaddrSupport bool `protobuf:"varint,3,opt,name=taddrSupport,proto3" json:"taddrSupport,omitempty"` + ChainName string `protobuf:"bytes,4,opt,name=chainName,proto3" json:"chainName,omitempty"` + SaplingActivationHeight uint64 `protobuf:"varint,5,opt,name=saplingActivationHeight,proto3" json:"saplingActivationHeight,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *LightdInfo) Reset() { *m = LightdInfo{} } @@ -394,6 +396,20 @@ func (m *LightdInfo) GetTaddrSupport() bool { return false } +func (m *LightdInfo) GetChainName() string { + if m != nil { + return m.ChainName + } + return "" +} + +func (m *LightdInfo) GetSaplingActivationHeight() uint64 { + if m != nil { + return m.SaplingActivationHeight + } + return 0 +} + type TransparentAddress struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -576,49 +592,51 @@ func init() { func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } var fileDescriptor_a0b84a42fa06f626 = []byte{ - // 662 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x41, 0x6f, 0x13, 0x3d, - 0x10, 0x4d, 0xda, 0x6c, 0xdb, 0x4c, 0xd2, 0x56, 0x9f, 0xf5, 0x15, 0x45, 0xa1, 0x40, 0x30, 0x42, - 0x2a, 0x97, 0x55, 0x55, 0x8a, 0xb8, 0x70, 0xa1, 0x01, 0xaa, 0x4a, 0x45, 0x02, 0x27, 0x70, 0x28, - 0x87, 0xca, 0x5d, 0x4f, 0x9b, 0xa5, 0xc9, 0x7a, 0x65, 0x3b, 0x69, 0xe0, 0x0f, 0xf2, 0x8f, 0x38, - 0x23, 0xcf, 0x6e, 0xda, 0x8d, 0xca, 0x92, 0xdc, 0x3c, 0xde, 0x37, 0xef, 0xd9, 0x33, 0x6f, 0xbc, - 0xb0, 0x69, 0xd1, 0x4c, 0xe2, 0x08, 0xc3, 0xd4, 0x68, 0xa7, 0xd9, 0x4e, 0x24, 0xed, 0x20, 0xfc, - 0x19, 0xde, 0xc8, 0xe1, 0x10, 0x5d, 0x68, 0xd5, 0x75, 0x68, 0xd2, 0xa8, 0xbd, 0x13, 0xe9, 0x51, - 0x2a, 0x23, 0x77, 0x7e, 0xa9, 0xcd, 0x48, 0x3a, 0x9b, 0xa1, 0xf9, 0x2b, 0x58, 0x3f, 0x1a, 0xea, - 0xe8, 0xfa, 0xe4, 0x1d, 0x7b, 0x00, 0x6b, 0x03, 0x8c, 0xaf, 0x06, 0xae, 0x55, 0xed, 0x54, 0xf7, - 0x6a, 0x22, 0x8f, 0x18, 0x83, 0xda, 0x40, 0xda, 0x41, 0x6b, 0xa5, 0x53, 0xdd, 0x6b, 0x0a, 0x5a, - 0x73, 0x07, 0x40, 0x69, 0x42, 0x26, 0x57, 0xc8, 0x0e, 0x21, 0xb0, 0x4e, 0x9a, 0x2c, 0xb1, 0x71, - 0xf0, 0x38, 0xfc, 0xeb, 0x11, 0xc2, 0x5c, 0x48, 0x64, 0x60, 0xb6, 0x0f, 0xab, 0x98, 0x28, 0xa2, - 0x5d, 0x9c, 0xe3, 0xa1, 0xfc, 0x3b, 0x6c, 0xf4, 0xa7, 0x1f, 0xe2, 0xa1, 0x43, 0xe3, 0x35, 0x2f, - 0xfc, 0xb7, 0x65, 0x35, 0x09, 0xcc, 0xfe, 0x87, 0x20, 0x4e, 0x14, 0x4e, 0x49, 0xb5, 0x26, 0xb2, - 0xe0, 0xf6, 0x86, 0xab, 0x85, 0x1b, 0xbe, 0x81, 0x2d, 0x21, 0x6f, 0xfa, 0x46, 0x26, 0x56, 0x46, - 0x2e, 0xd6, 0x89, 0x47, 0x29, 0xe9, 0x24, 0x09, 0x36, 0x05, 0xad, 0x0b, 0x35, 0x5b, 0x29, 0xd6, - 0x8c, 0x7f, 0x82, 0x66, 0x0f, 0x13, 0x25, 0xd0, 0xa6, 0x3a, 0xb1, 0xc8, 0x76, 0xa1, 0x8e, 0xc6, - 0x68, 0xd3, 0xd5, 0x0a, 0x89, 0x20, 0x10, 0x77, 0x1b, 0x8c, 0x43, 0x93, 0x82, 0x8f, 0x68, 0xad, - 0xbc, 0x42, 0xe2, 0xaa, 0x8b, 0xb9, 0x3d, 0xde, 0x80, 0x7a, 0x77, 0x20, 0xe3, 0xa4, 0x97, 0x62, - 0xc4, 0xd7, 0x21, 0x78, 0x3f, 0x4a, 0xdd, 0x0f, 0x7e, 0x01, 0x70, 0xea, 0x05, 0xd5, 0x49, 0x72, - 0xa9, 0x59, 0x0b, 0xd6, 0x27, 0x68, 0x6c, 0xac, 0x13, 0xd2, 0xa8, 0x8b, 0x59, 0xe8, 0xcf, 0x39, - 0xc1, 0x44, 0x69, 0x93, 0x73, 0xe7, 0x91, 0x57, 0x76, 0x52, 0x29, 0xd3, 0x1b, 0xa7, 0xa9, 0x36, - 0x8e, 0x2a, 0xb0, 0x21, 0xe6, 0xf6, 0x78, 0x08, 0x8c, 0xca, 0x90, 0x4a, 0x83, 0x89, 0x7b, 0xab, - 0x94, 0x41, 0x6b, 0xbd, 0x96, 0xcc, 0x96, 0x33, 0xad, 0x3c, 0xe4, 0x06, 0x1e, 0xdd, 0xc7, 0x53, - 0x1f, 0xf2, 0xd6, 0x95, 0xa6, 0xb2, 0xd7, 0x10, 0x18, 0xef, 0xa8, 0xdc, 0x14, 0x4f, 0xff, 0xd5, - 0x54, 0xb2, 0x9e, 0xc8, 0xf0, 0xfc, 0x57, 0x15, 0x6a, 0x5f, 0xdc, 0x54, 0xb3, 0xee, 0x3c, 0x77, - 0xe3, 0xe0, 0x45, 0x09, 0xc7, 0xfd, 0x23, 0xde, 0x1d, 0x83, 0x41, 0xcd, 0x4d, 0x63, 0x35, 0x73, - 0xbc, 0x5f, 0xb3, 0x0e, 0x34, 0xf4, 0xd8, 0xa5, 0x63, 0x77, 0x42, 0xfe, 0x59, 0xa5, 0x76, 0x17, - 0xb7, 0x7c, 0x8d, 0x6d, 0x64, 0xe2, 0xd4, 0xb5, 0x6a, 0x94, 0x97, 0x47, 0xde, 0x73, 0x13, 0x39, - 0x1c, 0x63, 0x2b, 0xc8, 0x3c, 0x47, 0x41, 0xc1, 0x39, 0x6b, 0x45, 0xe7, 0x1c, 0xfc, 0x0e, 0xe0, - 0xbf, 0x6e, 0x36, 0xaa, 0xfd, 0x69, 0xcf, 0x19, 0x94, 0x23, 0x34, 0xac, 0x0f, 0x5b, 0xc7, 0xe8, - 0x4e, 0xa5, 0x43, 0xeb, 0xe8, 0xf6, 0xac, 0x53, 0x72, 0xaf, 0x5b, 0x93, 0xb4, 0x17, 0x8c, 0x04, - 0xaf, 0xb0, 0xcf, 0xb0, 0x71, 0x8c, 0x39, 0xdf, 0x02, 0x74, 0xfb, 0x59, 0x99, 0x5e, 0x76, 0x56, - 0x82, 0xf1, 0x0a, 0xfb, 0x06, 0x9b, 0x33, 0xca, 0xec, 0x6d, 0x58, 0xdc, 0xc3, 0x25, 0xa9, 0xf7, - 0xab, 0xec, 0x8c, 0xaa, 0x50, 0x9c, 0xc9, 0x27, 0x65, 0xdd, 0xcd, 0x9f, 0x89, 0xf6, 0xf3, 0x12, - 0xc0, 0xfc, 0x6c, 0xf3, 0x0a, 0x3b, 0x87, 0x6d, 0x3f, 0xb1, 0x45, 0xf2, 0xe5, 0x72, 0x4b, 0x8f, - 0x5f, 0x7c, 0x00, 0x78, 0x85, 0x7d, 0xa5, 0x62, 0x7b, 0x93, 0x5a, 0xb6, 0xbc, 0x29, 0xdb, 0x0f, - 0x4b, 0xa0, 0x9e, 0x88, 0x8a, 0x62, 0x60, 0xfb, 0x18, 0x67, 0xf0, 0xfe, 0x34, 0x56, 0x96, 0x1d, - 0x2e, 0x4d, 0x5f, 0x18, 0xcb, 0xa5, 0x4b, 0xb5, 0x5f, 0x65, 0x82, 0xba, 0x5c, 0x78, 0x79, 0x76, - 0x4b, 0x72, 0xe9, 0x95, 0x6a, 0x97, 0x79, 0xe0, 0x8e, 0x80, 0x57, 0x8e, 0x1a, 0x67, 0xf5, 0xec, - 0xb3, 0x49, 0xa3, 0x8b, 0x35, 0xfa, 0x3b, 0xbd, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x39, 0x0c, - 0xff, 0xa5, 0xdc, 0x06, 0x00, 0x00, + // 700 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x55, 0xcf, 0x6e, 0x13, 0x3f, + 0x10, 0x6e, 0xda, 0xa4, 0x6d, 0x26, 0x69, 0xab, 0x9f, 0xf5, 0x2b, 0x44, 0xa1, 0x40, 0x31, 0x42, + 0x82, 0xcb, 0xaa, 0x2a, 0x45, 0x70, 0xe0, 0xd2, 0x86, 0x7f, 0x95, 0x0a, 0x02, 0x27, 0x70, 0x28, + 0x87, 0xca, 0xdd, 0x75, 0x93, 0xa5, 0xc9, 0x7a, 0x65, 0x3b, 0x69, 0xe0, 0xd1, 0x78, 0x01, 0xde, + 0x88, 0x33, 0xf6, 0x78, 0xd3, 0x6c, 0x54, 0x96, 0xe4, 0xb6, 0x63, 0xcf, 0x7c, 0x33, 0xf3, 0xcd, + 0xe7, 0x59, 0xd8, 0xd0, 0x42, 0x8d, 0xe2, 0x50, 0x04, 0xa9, 0x92, 0x46, 0x92, 0xed, 0x90, 0xeb, + 0x5e, 0xf0, 0x23, 0xb8, 0xe2, 0xfd, 0xbe, 0x30, 0x81, 0x8e, 0x2e, 0x03, 0x95, 0x86, 0xcd, 0xed, + 0x50, 0x0e, 0x52, 0x1e, 0x9a, 0xb3, 0x0b, 0xa9, 0x06, 0xdc, 0x68, 0xef, 0x4d, 0x9f, 0xc1, 0xda, + 0x51, 0x5f, 0x86, 0x97, 0xc7, 0xaf, 0xc8, 0x2d, 0x58, 0xed, 0x89, 0xb8, 0xdb, 0x33, 0x8d, 0xd2, + 0x6e, 0xe9, 0x71, 0x99, 0x65, 0x16, 0x21, 0x50, 0xee, 0x59, 0xc8, 0xc6, 0xb2, 0x3d, 0xad, 0x33, + 0xfc, 0xa6, 0x06, 0x00, 0xc3, 0x18, 0x4f, 0xba, 0x82, 0x1c, 0x40, 0x45, 0x1b, 0xae, 0x7c, 0x60, + 0x6d, 0xff, 0x5e, 0xf0, 0xd7, 0x12, 0x82, 0x2c, 0x11, 0xf3, 0xce, 0x64, 0x0f, 0x56, 0x44, 0x12, + 0x21, 0xec, 0xfc, 0x18, 0xe7, 0x4a, 0xbf, 0xc1, 0x7a, 0x67, 0xfc, 0x26, 0xee, 0x1b, 0xa1, 0x5c, + 0xce, 0x73, 0x77, 0xb7, 0x68, 0x4e, 0x74, 0x26, 0xff, 0x43, 0x25, 0x4e, 0x22, 0x31, 0xc6, 0xac, + 0x65, 0xe6, 0x8d, 0xeb, 0x0e, 0x57, 0x72, 0x1d, 0xbe, 0x84, 0x4d, 0xc6, 0xaf, 0x3a, 0x8a, 0x27, + 0xda, 0xb2, 0x16, 0xcb, 0xc4, 0x79, 0x45, 0xdc, 0x70, 0x4c, 0x68, 0xbd, 0xdc, 0x77, 0x8e, 0xb3, + 0xe5, 0x3c, 0x67, 0xf4, 0x23, 0xd4, 0xdb, 0xb6, 0x62, 0x26, 0x74, 0x2a, 0x13, 0x2d, 0xc8, 0x0e, + 0x54, 0x85, 0x52, 0x52, 0xb5, 0x64, 0x24, 0x10, 0xa0, 0xc2, 0xa6, 0x07, 0x84, 0x42, 0x1d, 0x8d, + 0xf7, 0x42, 0x6b, 0xde, 0x15, 0x88, 0x55, 0x65, 0x33, 0x67, 0xb4, 0x06, 0xd5, 0x56, 0x8f, 0xc7, + 0x49, 0x3b, 0x15, 0x21, 0x5d, 0x83, 0xca, 0xeb, 0x41, 0x6a, 0xbe, 0xd3, 0x9f, 0x25, 0x80, 0x13, + 0x97, 0x31, 0x3a, 0x4e, 0x2e, 0x24, 0x69, 0xc0, 0xda, 0x48, 0x28, 0x6d, 0xab, 0xc5, 0x24, 0x55, + 0x36, 0x31, 0x5d, 0xa1, 0x23, 0x5b, 0x90, 0x54, 0x19, 0x78, 0x66, 0xb9, 0xd4, 0x86, 0x47, 0x91, + 0x6a, 0x0f, 0xd3, 0x54, 0xda, 0x09, 0x3a, 0x0a, 0xd6, 0xd9, 0xcc, 0x99, 0x2b, 0x3e, 0x74, 0xa9, + 0x3f, 0xf0, 0x81, 0x68, 0x94, 0x31, 0x7c, 0x7a, 0x40, 0x5e, 0xc0, 0x6d, 0xcd, 0xd3, 0x7e, 0x9c, + 0x74, 0x0f, 0x2d, 0x4f, 0x23, 0xee, 0xb8, 0x7a, 0xe7, 0x39, 0xa9, 0x20, 0x27, 0x45, 0xd7, 0x34, + 0x00, 0x82, 0xfc, 0xa6, 0x5c, 0x89, 0xc4, 0x1c, 0xda, 0x8c, 0xb6, 0x57, 0xd7, 0x03, 0xf7, 0x9f, + 0x93, 0x1e, 0x32, 0x93, 0x2a, 0xb8, 0x7b, 0xd3, 0x1f, 0x07, 0x9c, 0x69, 0xa2, 0x30, 0x94, 0x3c, + 0x87, 0x8a, 0x72, 0x52, 0xcd, 0xd4, 0xf6, 0xe0, 0x5f, 0x6a, 0x41, 0x4d, 0x33, 0xef, 0x4f, 0x7f, + 0x95, 0xa0, 0xfc, 0xd9, 0x8c, 0x25, 0x69, 0xcd, 0x62, 0xd7, 0xf6, 0x9f, 0x14, 0x60, 0xdc, 0x2c, + 0x71, 0x5a, 0x86, 0x95, 0x90, 0x19, 0xc7, 0xd1, 0xe4, 0x29, 0xb9, 0x6f, 0xb2, 0x0b, 0x35, 0x39, + 0x34, 0xe9, 0xd0, 0x1c, 0xa3, 0x30, 0x57, 0x90, 0xb3, 0xfc, 0x91, 0x9b, 0x9d, 0x0e, 0x55, 0x9c, + 0x1a, 0x24, 0xbf, 0xce, 0x32, 0xcb, 0x89, 0x79, 0xc4, 0xfb, 0x43, 0x91, 0xf1, 0xec, 0x8d, 0x9c, + 0x24, 0x57, 0xf3, 0x92, 0xdc, 0xff, 0x5d, 0x81, 0xff, 0x5a, 0x7e, 0x07, 0x74, 0xc6, 0x6d, 0xa3, + 0x84, 0x1d, 0x9e, 0x22, 0x1d, 0xd8, 0x7c, 0x2b, 0xcc, 0x09, 0x37, 0x42, 0x1b, 0xec, 0x9e, 0xec, + 0x16, 0xf4, 0x75, 0xad, 0xbe, 0xe6, 0x9c, 0xb7, 0x46, 0x97, 0xc8, 0x27, 0x58, 0xb7, 0xa8, 0x1e, + 0x6f, 0x8e, 0x77, 0xf3, 0x61, 0x51, 0x3e, 0x5f, 0x2b, 0xba, 0x59, 0xc8, 0xaf, 0xb0, 0x31, 0x81, + 0xf4, 0x4b, 0x67, 0xfe, 0x0c, 0x17, 0x84, 0xde, 0x2b, 0x91, 0x53, 0x64, 0x21, 0xff, 0xd8, 0xef, + 0x17, 0x4d, 0x37, 0xdb, 0x3f, 0xcd, 0x47, 0x05, 0x0e, 0xb3, 0x4b, 0xc3, 0x16, 0x7e, 0x06, 0x5b, + 0x6e, 0x15, 0xe4, 0xc1, 0x17, 0x8b, 0x2d, 0x2c, 0x3f, 0xbf, 0x59, 0x6c, 0x82, 0x2f, 0x48, 0xb6, + 0x13, 0xa9, 0x26, 0x8b, 0x8b, 0xb2, 0x79, 0xa7, 0xc0, 0xd5, 0x01, 0x21, 0x29, 0x0a, 0xb6, 0x2c, + 0x6e, 0xe6, 0xde, 0xb1, 0x52, 0xd5, 0xe4, 0x60, 0x61, 0xf8, 0xdc, 0xb3, 0x5c, 0x98, 0x2a, 0x9b, + 0x93, 0xe1, 0x94, 0x73, 0x1b, 0x6d, 0xa7, 0x20, 0x16, 0xd7, 0x5f, 0xb3, 0x48, 0x03, 0x53, 0x00, + 0xba, 0x74, 0x54, 0x3b, 0xad, 0xfa, 0x6b, 0x7b, 0x73, 0xbe, 0x8a, 0xbf, 0xbd, 0xa7, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0xb2, 0x4f, 0xf9, 0x1a, 0x35, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/walletrpc/service.proto b/walletrpc/service.proto index 915cf1d..21c77e3 100644 --- a/walletrpc/service.proto +++ b/walletrpc/service.proto @@ -48,6 +48,8 @@ message LightdInfo { string version = 1; string vendor = 2; bool taddrSupport = 3; + string chainName = 4; + uint64 saplingActivationHeight = 5; } message TransparentAddress {