Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-11-27 15:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass tests

Browse Source
This commit is contained in:
D-Stacks 2022-10-09 19:55:08 +02:00
parent f7fcffe6aa
commit 11f5a49d5d
4 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
domain/consensus/consensus.go
View File

@ -404,7 +404,7 @@ func (s *consensus) GetBlocks(blockHashes []*externalapi.DomainHash) ([]*externa
blocks, err := s.blockStore.Blocks(s.databaseContext, stagingArea, blockHashes) blocks, err := s.blockStore.Blocks(s.databaseContext, stagingArea, blockHashes)
if err != nil { if err != nil {
if errors.Is(err, database.ErrNotFound) { if errors.Is(err, database.ErrNotFound) {
return nil, errors.Wrapf(err, "Quried block %s does not exist") return nil, errors.Wrapf(err, "could not find Quried blocks")
} }
return nil, err return nil, err
} }

2
domain/consensus/model/externalapi/consensus.go
View File

@ -14,7 +14,7 @@ type Consensus interface {
ApplyPruningPointProof(pruningPointProof *PruningPointProof) error ApplyPruningPointProof(pruningPointProof *PruningPointProof) error
GetBlock(blockHash *DomainHash) (*DomainBlock, error) GetBlock(blockHash *DomainHash) (*DomainBlock, error)
GetBlocks(blockHashes []*DomainHash) (*DomainBlock, error) GetBlocks(blockHashes []*DomainHash) ([]*DomainBlock, error)
GetBlockEvenIfHeaderOnly(blockHash *DomainHash) (*DomainBlock, error) GetBlockEvenIfHeaderOnly(blockHash *DomainHash) (*DomainBlock, error)
GetBlockHeader(blockHash *DomainHash) (BlockHeader, error) GetBlockHeader(blockHash *DomainHash) (BlockHeader, error)
GetBlockInfo(blockHash *DomainHash) (*BlockInfo, error) GetBlockInfo(blockHash *DomainHash) (*BlockInfo, error)

2
domain/txindex/model.go
View File

@ -13,7 +13,7 @@ type TXAcceptanceChange struct {
Removed map[externalapi.DomainTransactionID]*externalapi.DomainHash Removed map[externalapi.DomainTransactionID]*externalapi.DomainHash
} }
//TxIDsToBlocks is a map of TxIDs to corrospnding blockHashes //TxIDsToBlockHashes is a map of TxIDs to corrospnding blockHashes
type TxIDsToBlockHashes map[*externalapi.DomainTransactionID]*externalapi.DomainHash type TxIDsToBlockHashes map[*externalapi.DomainTransactionID]*externalapi.DomainHash
//TxIDsToBlocks is a map of TxIDs to corrospnding blocks //TxIDsToBlocks is a map of TxIDs to corrospnding blocks

54
domain/txindex/txindex.go
View File

@ -1,13 +1,11 @@
package txindex package txindex
import ( import (
"errors"
"fmt" "fmt"
"sync" "sync"
"github.com/kaspanet/kaspad/domain" "github.com/kaspanet/kaspad/domain"
"github.com/kaspanet/kaspad/domain/consensus/model/externalapi" "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
"github.com/kaspanet/kaspad/domain/consensus/processes/dagtraversalmanager"
"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing" "github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
"github.com/kaspanet/kaspad/infrastructure/db/database" "github.com/kaspanet/kaspad/infrastructure/db/database"
"github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/infrastructure/logger"
@ -262,6 +260,7 @@ func (ti *TXIndex) TXAcceptingBlockHash(txID *externalapi.DomainTransactionID) (
return acceptingBlockHash, found, nil return acceptingBlockHash, found, nil
} }
// TXAcceptingBlockHashes returns the accepting block hashes for for the given txIDs
func (ti *TXIndex) TXAcceptingBlockHashes(txIDs []*externalapi.DomainTransactionID) (acceptingBlockHashes TxIDsToBlockHashes, found bool, err error) { func (ti *TXIndex) TXAcceptingBlockHashes(txIDs []*externalapi.DomainTransactionID) (acceptingBlockHashes TxIDsToBlockHashes, found bool, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlockHash") onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlockHash")
defer onEnd() defer onEnd()
@ -280,9 +279,9 @@ func (ti *TXIndex) TXAcceptingBlockHashes(txIDs []*externalapi.DomainTransaction
return acceptingBlockHashes, found, nil return acceptingBlockHashes, found, nil
} }
// TXAcceptingBlock returns the accepting block for for the given txID
func (ti *TXIndex) TXAcceptingBlock(txID *externalapi.DomainTransactionID) (
func (ti *TXIndex) TXAcceptingBlock(txID *externalapi.DomainTransactionID) (block *externalapi.DomainBlock, found bool, err error) { block *externalapi.DomainBlock, found bool, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlock") onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlock")
defer onEnd() defer onEnd()
@ -301,28 +300,43 @@ func (ti *TXIndex) TXAcceptingBlock(txID *externalapi.DomainTransactionID) (bloc
return acceptingBlock, true, nil return acceptingBlock, true, nil
} }
func (ti *TXIndex) TXAcceptingBlocks(txIDs []*externalapi.DomainTransactionID) (acceptingBlocks TxIDsToBlocks, found bool, err error) { // TXAcceptingBlocks returns the accepting blocks for for the given txIDs
func (ti *TXIndex) TXAcceptingBlocks(txIDs []*externalapi.DomainTransactionID) (
acceptingBlocks []*externalapi.DomainBlock, found bool, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlock") onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlock")
defer onEnd() defer onEnd()
ti.mutex.Lock() ti.mutex.Lock()
defer ti.mutex.Unlock() defer ti.mutex.Unlock()
acceptingBlockHash, found, err := ti.store.getTxAcceptingBlockHashes(txIDs) acceptingBlockHashTxIDPairs, found, err := ti.store.getTxAcceptingBlockHashes(txIDs)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
acceptingBlocks, err = ti.domain.Consensus().GetBlocks(acceptingBlockHash) acceptingBlockHashes := make([]*externalapi.DomainHash, len(acceptingBlockHashTxIDPairs))
i := 0
for _, acceptingBlockHash := range acceptingBlockHashTxIDPairs {
acceptingBlockHashes[i] = acceptingBlockHash
i++
}
if !found {
return nil, false, nil
}
acceptingBlocks, err = ti.domain.Consensus().GetBlocks(acceptingBlockHashes)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
return acceptingBlock, true, nil
return acceptingBlocks, true, nil
} }
// GetTX returns the domain transaction for for the given txID
func (ti *TXIndex) GetTX(txID *externalapi.DomainTransactionID) (
func (ti *TXIndex) GetTX(txID *externalapi.DomainTransactionID) (block *externalapi.DomainTransaction, found bool, err error) { block *externalapi.DomainTransaction, found bool, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.GetTX") onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.GetTX")
defer onEnd() defer onEnd()
@ -348,12 +362,13 @@ func (ti *TXIndex) GetTX(txID *externalapi.DomainTransactionID) (block *external
} }
} }
return nil, false, fmt.Errorf("Could not find transaction with ID %s in Txindex database", txID.String()) return nil, false, fmt.Errorf("Could not find transaction with ID %s in Txindex database", txID.String())
} }
func (ti *TXIndex) GetTXConfirmations(txID *externalapi.DomainTransactionID) (BlockHashTxIDPair uint64, found bool, err error) { // GetTXConfirmations returns the tx confirmations for for the given txID
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.GetTX") func (ti *TXIndex) GetTXConfirmations(txID *externalapi.DomainTransactionID) (
BlockHashTxIDPair uint64, found bool, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.GetTXConfirmations")
defer onEnd() defer onEnd()
ti.mutex.Lock() ti.mutex.Lock()
@ -377,6 +392,7 @@ func (ti *TXIndex) GetTXConfirmations(txID *externalapi.DomainTransactionID) (Bl
return virtualBlock.BlueScore - acceptingBlockHeader.BlueScore(), true, nil return virtualBlock.BlueScore - acceptingBlockHeader.BlueScore(), true, nil
} }
// TXIncludingBlockHash returns the including block hash for the given txID
func (ti *TXIndex) TXIncludingBlockHash(txID *externalapi.DomainTransactionID) (includingBlockHash *externalapi.DomainHash, found bool, err error) { func (ti *TXIndex) TXIncludingBlockHash(txID *externalapi.DomainTransactionID) (includingBlockHash *externalapi.DomainHash, found bool, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlock") onEnd := logger.LogAndMeasureExecutionTime(log, "TXIndex.TXAcceptingBlock")
defer onEnd() defer onEnd()
@ -404,11 +420,3 @@ func (ti *TXIndex) TXIncludingBlockHash(txID *externalapi.DomainTransactionID) (
return nil, false, fmt.Errorf("Could not find including blockHash for transaction with ID %s in Txindex database", txID.String()) return nil, false, fmt.Errorf("Could not find including blockHash for transaction with ID %s in Txindex database", txID.String())
} }
//TO DO: Get Block from TxID
//TO DO: Get Including BlockHash from AcceptingBlock
//TO DO: Get Including Block from AcceptingBlock
//TO DO: Get Number of confirmations