RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return unique txids from socket.io getAddressTxids

Browse Source
This commit is contained in:
Martin Boehm 2018-02-24 00:02:29 +01:00
parent aff7f3909c
commit 1c8386f05d
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
server/socketio.go
View File

@ -203,13 +203,30 @@ func unmarshalGetAddressRequest(params []byte) (addr []string, rr reqRange, err
return return
} }
func (s *SocketIoServer) getAddressTxids(addr []string, rr *reqRange) ([]string, error) { func uniqueTxids(txids []string) []string {
uniqueTxids := make([]string, 0, len(txids))
txidsMap := make(map[string]struct{})
for _, txid := range txids {
_, e := txidsMap[txid]
if !e {
uniqueTxids = append(uniqueTxids, txid)
txidsMap[txid] = struct{}{}
}
}
return uniqueTxids
}
type resultAddressTxids struct {
Result []string `json:"result"`
}
func (s *SocketIoServer) getAddressTxids(addr []string, rr *reqRange) (res resultAddressTxids, err error) {
txids := make([]string, 0) txids := make([]string, 0)
lower, higher := uint32(rr.To), uint32(rr.Start) lower, higher := uint32(rr.To), uint32(rr.Start)
for _, address := range addr { for _, address := range addr {
script, err := bchain.AddressToOutputScript(address) script, err := bchain.AddressToOutputScript(address)
if err != nil { if err != nil {
return nil, err return res, err
} }
if !rr.QueryMempoolOnly { if !rr.QueryMempoolOnly {
err = s.db.GetTransactions(script, lower, higher, func(txid string, vout uint32, isOutput bool) error { err = s.db.GetTransactions(script, lower, higher, func(txid string, vout uint32, isOutput bool) error {
@ -223,21 +240,22 @@ func (s *SocketIoServer) getAddressTxids(addr []string, rr *reqRange) ([]string,
return nil return nil
}) })
if err != nil { if err != nil {
return nil, err return res, err
} }
} }
if rr.QueryMempoolOnly || rr.QueryMempol { if rr.QueryMempoolOnly || rr.QueryMempol {
mtxids, err := s.mempool.GetTransactions(script) mtxids, err := s.mempool.GetTransactions(script)
if err != nil { if err != nil {
return nil, err return res, err
} }
txids = append(txids, mtxids...) txids = append(txids, mtxids...)
} }
if err != nil { if err != nil {
return nil, err return res, err
} }
} }
return txids, nil res.Result = uniqueTxids(txids)
return res, nil
} }
type addressHistoryIndexes struct { type addressHistoryIndexes struct {
@ -295,19 +313,6 @@ type resultGetAddressHistory struct {
} `json:"result"` } `json:"result"`
} }
func uniqueTxids(txids []string) []string {
uniqueTxids := make([]string, 0, len(txids))
txidsMap := make(map[string]struct{})
for _, txid := range txids {
_, e := txidsMap[txid]
if !e {
uniqueTxids = append(uniqueTxids, txid)
txidsMap[txid] = struct{}{}
}
}
return uniqueTxids
}
func stringInSlice(a string, list []string) bool { func stringInSlice(a string, list []string) bool {
for _, b := range list { for _, b := range list {
if b == a { if b == a {
@ -335,7 +340,7 @@ func txToResTx(tx *bchain.Tx, height int, hi []txInputs, ho []txOutputs) resTx {
} }
func (s *SocketIoServer) getAddressHistory(addr []string, rr *reqRange) (res resultGetAddressHistory, err error) { func (s *SocketIoServer) getAddressHistory(addr []string, rr *reqRange) (res resultGetAddressHistory, err error) {
txids, err := s.getAddressTxids(addr, rr) txr, err := s.getAddressTxids(addr, rr)
if err != nil { if err != nil {
return return
} }
@ -343,8 +348,7 @@ func (s *SocketIoServer) getAddressHistory(addr []string, rr *reqRange) (res res
if err != nil { if err != nil {
return return
} }
// todo - proper sorting of txids, probably by height desc txids := txr.Result
txids = uniqueTxids(txids)
res.Result.TotalCount = len(txids) res.Result.TotalCount = len(txids)
res.Result.Items = make([]addressHistoryItem, 0) res.Result.Items = make([]addressHistoryItem, 0)
for i, txid := range txids { for i, txid := range txids {