Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-11-24 06:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix not found sending err, add to kaspactl

Browse Source
This commit is contained in:
D-Stacks 2022-06-24 21:11:38 +02:00
parent 560a1a99b1
commit 09b2c53b3f
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kaspactl/commands.go
View File

@ -15,6 +15,8 @@ var commandTypes = []reflect.Type{
reflect.TypeOf(protowire.KaspadMessage_GetCurrentNetworkRequest{}), reflect.TypeOf(protowire.KaspadMessage_GetCurrentNetworkRequest{}),
reflect.TypeOf(protowire.KaspadMessage_GetInfoRequest{}), reflect.TypeOf(protowire.KaspadMessage_GetInfoRequest{}),
reflect.TypeOf(protowire.KaspadMessage_GetAcceptingBlockHashOfTxRequest{}),
reflect.TypeOf(protowire.KaspadMessage_GetBlockRequest{}), reflect.TypeOf(protowire.KaspadMessage_GetBlockRequest{}),
reflect.TypeOf(protowire.KaspadMessage_GetBlocksRequest{}), reflect.TypeOf(protowire.KaspadMessage_GetBlocksRequest{}),
reflect.TypeOf(protowire.KaspadMessage_GetHeadersRequest{}), reflect.TypeOf(protowire.KaspadMessage_GetHeadersRequest{}),

2
domain/txindex/store.go
View File

@ -217,7 +217,7 @@ func (tis *txIndexStore) getTxAcceptingBlockHash(txID *externalapi.DomainTransac
key := tis.convertTxIDToKey(txAcceptedIndexBucket, *txID) key := tis.convertTxIDToKey(txAcceptedIndexBucket, *txID)
serializedAcceptingBlockHash, err := tis.database.Get(key) serializedAcceptingBlockHash, err := tis.database.Get(key)
if err != nil { if err != nil {
if err == database.ErrNotFound { if database.IsNotFoundError(err) {
return nil, false, nil return nil, false, nil
} }
return nil, false, err return nil, false, err

20
domain/txindex/txindex.go
View File

@ -5,6 +5,7 @@ import (
"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/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"
) )
@ -139,7 +140,7 @@ func (ti *TXIndex) Update(virtualChangeSet *externalapi.VirtualChangeSet) (*TXAc
ti.mutex.Lock() ti.mutex.Lock()
defer ti.mutex.Unlock() defer ti.mutex.Unlock()
log.Tracef("Updating TX index with VirtualSelectedParentChainChanges: %+v", virtualChangeSet.VirtualSelectedParentChainChanges) log.Info("Updating TX index with VirtualSelectedParentChainChanges: %+v", virtualChangeSet.VirtualSelectedParentChainChanges)
err := ti.removeTXIDs(virtualChangeSet.VirtualSelectedParentChainChanges, 1000) err := ti.removeTXIDs(virtualChangeSet.VirtualSelectedParentChainChanges, 1000)
if err != nil { if err != nil {
@ -164,7 +165,6 @@ func (ti *TXIndex) Update(virtualChangeSet *externalapi.VirtualChangeSet) (*TXAc
return nil, err return nil, err
} }
log.Tracef("TX index updated with the TXAcceptanceChange: %+v", txIndexChanges)
return txIndexChanges, nil return txIndexChanges, nil
} }
@ -188,8 +188,12 @@ func (ti *TXIndex) addTXIDs(selectedParentChainChanges *externalapi.SelectedChai
chainBlockAcceptanceData := chainBlocksAcceptanceData[i] chainBlockAcceptanceData := chainBlocksAcceptanceData[i]
for _, blockAcceptanceData := range chainBlockAcceptanceData { for _, blockAcceptanceData := range chainBlockAcceptanceData {
for _, transactionAcceptanceData := range blockAcceptanceData.TransactionAcceptanceData { for _, transactionAcceptanceData := range blockAcceptanceData.TransactionAcceptanceData {
if transactionAcceptanceData.IsAccepted && transactionAcceptanceData.Transaction.ID != nil { log.Info("TX index Adding: ", len(blockAcceptanceData.TransactionAcceptanceData))
ti.store.add(*transactionAcceptanceData.Transaction.ID, addedChainBlock) if transactionAcceptanceData.IsAccepted {
ti.store.add(
*consensushashing.TransactionID(transactionAcceptanceData.Transaction),
addedChainBlock,
)
} }
} }
} }
@ -218,9 +222,13 @@ func (ti *TXIndex) removeTXIDs(selectedParentChainChanges *externalapi.SelectedC
for i, removedChainBlock := range chainBlocksChunk { for i, removedChainBlock := range chainBlocksChunk {
chainBlockAcceptanceData := chainBlocksAcceptanceData[i] chainBlockAcceptanceData := chainBlocksAcceptanceData[i]
for _, blockAcceptanceData := range chainBlockAcceptanceData { for _, blockAcceptanceData := range chainBlockAcceptanceData {
log.Info("TX index Removing: ", len(blockAcceptanceData.TransactionAcceptanceData))
for _, transactionAcceptanceData := range blockAcceptanceData.TransactionAcceptanceData { for _, transactionAcceptanceData := range blockAcceptanceData.TransactionAcceptanceData {
if transactionAcceptanceData.IsAccepted && transactionAcceptanceData.Transaction.ID != nil { if transactionAcceptanceData.IsAccepted {
ti.store.remove(*transactionAcceptanceData.Transaction.ID, removedChainBlock) ti.store.remove(
*consensushashing.TransactionID(transactionAcceptanceData.Transaction),
removedChainBlock,
)
} }
} }
} }