DragonX/lightwalletd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return tx heights

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-09-17 13:26:23 -07:00
parent d36126ba9d
commit e723c4e1d8
4 changed files with 84 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/service.go
View File

@@ -212,33 +212,34 @@ func (s *SqlStreamer) GetBlockRange(span *walletrpc.BlockRange, resp walletrpc.C
func (s *SqlStreamer) GetTransaction(ctx context.Context, txf *walletrpc.TxFilter) (*walletrpc.RawTransaction, error) {
var txBytes []byte
var txHeight int
var err error
if txf.Hash != nil {
leHashString := hex.EncodeToString(txf.Hash)
txBytes, err = storage.GetTxByHash(ctx, s.db, leHashString)
txBytes, txHeight, err = storage.GetTxByHash(ctx, s.db, leHashString)
if err != nil {
return nil, err
}
return &walletrpc.RawTransaction{Data: txBytes}, nil
return &walletrpc.RawTransaction{Data: txBytes, Height: uint64(txHeight)}, nil
}
if txf.Block.Hash != nil {
leHashString := hex.EncodeToString(txf.Hash)
txBytes, err = storage.GetTxByHashAndIndex(ctx, s.db, leHashString, int(txf.Index))
txBytes, txHeight, err = storage.GetTxByHashAndIndex(ctx, s.db, leHashString, int(txf.Index))
if err != nil {
return nil, err
}
return &walletrpc.RawTransaction{Data: txBytes}, nil
return &walletrpc.RawTransaction{Data: txBytes, Height: uint64(txHeight)}, nil
}
// A totally unset protobuf will attempt to fetch the genesis coinbase tx.
txBytes, err = storage.GetTxByHeightAndIndex(ctx, s.db, int(txf.Block.Height), int(txf.Index))
txBytes, txHeight, err = storage.GetTxByHeightAndIndex(ctx, s.db, int(txf.Block.Height), int(txf.Index))
if err != nil {
return nil, err
}
return &walletrpc.RawTransaction{Data: txBytes}, nil
return &walletrpc.RawTransaction{Data: txBytes, Height: uint64(txHeight)}, nil
}
// GetLightdInfo gets the LightWalletD (this server) info