TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #655 from nspcc-dev/fix-mempool-deadlock-on-reverification

Browse source 
core: get transactions from dao when mempool should not be used
This commit is contained in:
Roman Khimov 2020-02-11 13:34:23 +03:00 committed by GitHub
commit 38de2af073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/core/blockchain.go
View file

@ -412,7 +412,7 @@ func (bc *Blockchain) storeBlock(block *block.Block) error {
// Process TX inputs that are grouped by previous hash. // Process TX inputs that are grouped by previous hash.
for prevHash, inputs := range tx.GroupInputsByPrevHash() { for prevHash, inputs := range tx.GroupInputsByPrevHash() {
prevTX, prevTXHeight, err := bc.GetTransaction(prevHash) prevTX, prevTXHeight, err := bc.dao.GetTransaction(prevHash)
if err != nil { if err != nil {
return fmt.Errorf("could not find previous TX: %s", prevHash) return fmt.Errorf("could not find previous TX: %s", prevHash)
} }
@ -812,7 +812,7 @@ func (bc *Blockchain) GetBlock(hash util.Uint256) (*block.Block, error) {
return nil, fmt.Errorf("only header is available") return nil, fmt.Errorf("only header is available")
} }
for _, tx := range block.Transactions { for _, tx := range block.Transactions {
stx, _, err := bc.GetTransaction(tx.Hash()) stx, _, err := bc.dao.GetTransaction(tx.Hash())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -941,7 +941,7 @@ func (bc *Blockchain) References(t *transaction.Transaction) map[transaction.Inp
references := make(map[transaction.Input]*transaction.Output) references := make(map[transaction.Input]*transaction.Output)
for prevHash, inputs := range t.GroupInputsByPrevHash() { for prevHash, inputs := range t.GroupInputsByPrevHash() {
if tx, _, err := bc.GetTransaction(prevHash); err != nil { if tx, _, err := bc.dao.GetTransaction(prevHash); err != nil {
tx = nil tx = nil
} else if tx != nil { } else if tx != nil {
for _, in := range inputs { for _, in := range inputs {
@ -1250,7 +1250,7 @@ func (bc *Blockchain) GetScriptHashesForVerifyingClaim(t *transaction.Transactio
clGroups[in.PrevHash] = append(clGroups[in.PrevHash], in) clGroups[in.PrevHash] = append(clGroups[in.PrevHash], in)
} }
for group, inputs := range clGroups { for group, inputs := range clGroups {
refTx, _, err := bc.GetTransaction(group) refTx, _, err := bc.dao.GetTransaction(group)
if err != nil { if err != nil {
return nil, err return nil, err
} }