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

Fix get mempoool imput addresses concurrently

Browse Source
This commit is contained in:
Martin Boehm 2018-05-28 17:48:39 +02:00
parent 919a26dfd6
commit f11c4f7791
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bchain/mempool_utxo.go
View File

@ -44,7 +44,7 @@ func NewUTXOMempool(chain BlockChain, workers int, subworkers int) *UTXOMempool
} }
for i := 0; i < workers; i++ { for i := 0; i < workers; i++ {
go func(i int) { go func(i int) {
chanInput := make(chan *Vin, 1) chanInput := make(chan outpoint, 1)
chanResult := make(chan *addrIndex, 1) chanResult := make(chan *addrIndex, 1)
for j := 0; j < subworkers; j++ { for j := 0; j < subworkers; j++ {
go func(j int) { go func(j int) {
@ -91,27 +91,27 @@ func (m *UTXOMempool) updateMappings(newTxToInputOutput map[string][]addrIndex,
m.addrIDToTx = newAddrIDToTx m.addrIDToTx = newAddrIDToTx
} }
func (m *UTXOMempool) getInputAddress(input *Vin) *addrIndex { func (m *UTXOMempool) getInputAddress(input outpoint) *addrIndex {
// TODO - possibly get from DB unspenttxs - however some output txs can be also in mempool // TODO - possibly get from DB unspenttxs - however some output txs can be also in mempool
itx, err := m.chain.GetTransactionForMempool(input.Txid) itx, err := m.chain.GetTransactionForMempool(input.txid)
if err != nil { if err != nil {
glog.Error("cannot get transaction ", input.Txid, ": ", err) glog.Error("cannot get transaction ", input.txid, ": ", err)
return nil return nil
} }
if int(input.Vout) >= len(itx.Vout) { if int(input.vout) >= len(itx.Vout) {
glog.Error("Vout len in transaction ", input.Txid, " ", len(itx.Vout), " input.Vout=", input.Vout) glog.Error("Vout len in transaction ", input.txid, " ", len(itx.Vout), " input.Vout=", input.vout)
return nil return nil
} }
addrID, err := m.chain.GetChainParser().GetAddrIDFromVout(&itx.Vout[input.Vout]) addrID, err := m.chain.GetChainParser().GetAddrIDFromVout(&itx.Vout[input.vout])
if err != nil { if err != nil {
glog.Error("error in addrID in ", input.Txid, " ", input.Vout, ": ", err) glog.Error("error in addrID in ", input.txid, " ", input.vout, ": ", err)
return nil return nil
} }
return &addrIndex{string(addrID), int32(^input.Vout)} return &addrIndex{string(addrID), ^input.vout}
} }
func (m *UTXOMempool) getTxAddrs(txid string, chanInput chan *Vin, chanResult chan *addrIndex) ([]addrIndex, bool) { func (m *UTXOMempool) getTxAddrs(txid string, chanInput chan outpoint, chanResult chan *addrIndex) ([]addrIndex, bool) {
tx, err := m.chain.GetTransactionForMempool(txid) tx, err := m.chain.GetTransactionForMempool(txid)
if err != nil { if err != nil {
glog.Error("cannot get transaction ", txid, ": ", err) glog.Error("cannot get transaction ", txid, ": ", err)
@ -137,6 +137,7 @@ func (m *UTXOMempool) getTxAddrs(txid string, chanInput chan *Vin, chanResult ch
if input.Coinbase != "" { if input.Coinbase != "" {
continue continue
} }
o := outpoint{input.Txid, int32(input.Vout)}
loop: loop:
for { for {
select { select {
@ -147,7 +148,7 @@ func (m *UTXOMempool) getTxAddrs(txid string, chanInput chan *Vin, chanResult ch
} }
dispatched-- dispatched--
// send input to be processed // send input to be processed
case chanInput <- &input: case chanInput <- o:
dispatched++ dispatched++
break loop break loop
} }