Add a github action deploy script to build and publish releases

* Refactor mergeSetIncrease to return the current BFS block to allow easier merging

* Remove unneeded Heap/HashSet usages

* Add new IsAnyAncestorOf to DagTopolyManager

* Check if the new candidate is in the future of any existing candidate

* Add comments and fix off-by-one in the mergeSetIncrease queue

* Fixed DAGToplogy test mock

* Fix review comments

.github/workflows/go-deploy.yml

@@ -0,0 +1,68 @@
+name: Build and Upload assets
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    name: Building For ${{ matrix.os }}
+    steps:
+      - name: Fix windows CRLF
+        run: git config --global core.autocrlf false
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      # We need to increase the page size because the tests run out of memory on github CI windows.
+      # Use the powershell script from this github action: https://github.com/al-cheb/configure-pagefile-action/blob/master/scripts/SetPageFileSize.ps1
+      # MIT License (MIT) Copyright (c) 2020 Maxim Lobanov and contributors
+      - name: Increase page size on windows
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: powershell -command .\.github\workflows\SetPageFileSize.ps1
+
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+
+      - name: Build on linux
+        if: runner.os == 'Linux'
+        # `-extldflags=-static` - means static link everything, `-tags netgo,osusergo` means use pure go replacements for "os/user" and "net"
+        # `-s -w` strips the binary to produce smaller size binaries
+        run: |
+          binary="kaspad-${{ github.event.release.tag_name }}-linux"
+          echo "binary=${binary}" >> $GITHUB_ENV
+          go build -v -ldflags="-s -w -extldflags=-static" -tags netgo,osusergo -o "${binary}"
+
+      - name: Build on Windows
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          binary="kaspad-${{ github.event.release.tag_name }}-win64.exe"
+          echo "binary=${binary}" >> $GITHUB_ENV
+          go build -v -ldflags="-s -w" -o "${binary}"
+
+      - name: Build on MacOS
+        if: runner.os == 'macOS'
+        run: |
+          binary="kaspad-${{ github.event.release.tag_name }}-osx"
+          echo "binary=${binary}" >> $GITHUB_ENV
+          go build -v -ldflags="-s -w" -o "${binary}"
+
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: "./${{ env.binary }}"
+          asset_name: "${{ env.binary }}"
+          asset_content_type: application/zip

.github/workflows/go-race.yml

@@ -9,6 +9,7 @@ jobs:
   race_test:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         branch: [ master, latest ]
     name: Race detection on ${{ matrix.branch }}

.github/workflows/go.yml

@@ -11,6 +11,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ ubuntu-16.04, macos-10.15 ]
     name: Testing on on ${{ matrix.os }}
@@ -34,7 +35,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
 
       # Source: https://github.com/actions/cache/blob/main/examples.md#go---modules
@@ -48,7 +49,7 @@ jobs:
 
       - name: Test
         shell: bash
-        run: ./build_and_test.sh
+        run: ./build_and_test.sh -v
 
   coverage:
     runs-on: ubuntu-20.04
@@ -60,10 +61,10 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Create coverage file
-        run: go test -covermode=atomic -coverpkg=./... -coverprofile coverage.txt ./...
+        run: go test -v -covermode=atomic -coverpkg=./... -coverprofile coverage.txt ./...
 
       - name: Upload coverage file
         run: bash <(curl -s https://codecov.io/bash)

README.md

@@ -18,7 +18,7 @@ Kaspa is an attempt at a proof-of-work cryptocurrency with instant confirmations
 
 ## Requirements
 
-Go 1.15 or later.
+Go 1.16 or later.
 
 ## Installation
 

app/app.go

@@ -7,19 +7,17 @@ import (
 	"runtime"
 	"time"
 
+	"github.com/kaspanet/kaspad/infrastructure/config"
 	"github.com/kaspanet/kaspad/infrastructure/db/database"
 	"github.com/kaspanet/kaspad/infrastructure/db/database/ldb"
-
-	"github.com/kaspanet/kaspad/infrastructure/os/signal"
-	"github.com/kaspanet/kaspad/util/profiling"
-	"github.com/kaspanet/kaspad/version"
-
-	"github.com/kaspanet/kaspad/util/panics"
-
-	"github.com/kaspanet/kaspad/infrastructure/config"
+	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/infrastructure/os/execenv"
 	"github.com/kaspanet/kaspad/infrastructure/os/limits"
+	"github.com/kaspanet/kaspad/infrastructure/os/signal"
 	"github.com/kaspanet/kaspad/infrastructure/os/winservice"
+	"github.com/kaspanet/kaspad/util/panics"
+	"github.com/kaspanet/kaspad/util/profiling"
+	"github.com/kaspanet/kaspad/version"
 )
 
 const leveldbCacheSizeMiB = 256
@@ -51,6 +49,7 @@ func StartApp() error {
 		fmt.Fprintln(os.Stderr, err)
 		return err
 	}
+	defer logger.BackendLog.Close()
 	defer panics.HandlePanic(log, "MAIN", nil)
 
 	app := &kaspadApp{cfg: cfg}

app/appmessage/domainconverters.go

@@ -164,11 +164,7 @@ func outpointToDomainOutpoint(outpoint *Outpoint) *externalapi.DomainOutpoint {
 func RPCTransactionToDomainTransaction(rpcTransaction *RPCTransaction) (*externalapi.DomainTransaction, error) {
 	inputs := make([]*externalapi.DomainTransactionInput, len(rpcTransaction.Inputs))
 	for i, input := range rpcTransaction.Inputs {
-		transactionIDBytes, err := hex.DecodeString(input.PreviousOutpoint.TransactionID)
-		if err != nil {
-			return nil, err
-		}
-		transactionID, err := transactionid.FromBytes(transactionIDBytes)
+		transactionID, err := transactionid.FromString(input.PreviousOutpoint.TransactionID)
 		if err != nil {
 			return nil, err
 		}
@@ -198,19 +194,11 @@ func RPCTransactionToDomainTransaction(rpcTransaction *RPCTransaction) (*externa
 		}
 	}
 
-	subnetworkIDBytes, err := hex.DecodeString(rpcTransaction.SubnetworkID)
+	subnetworkID, err := subnetworks.FromString(rpcTransaction.SubnetworkID)
 	if err != nil {
 		return nil, err
 	}
-	subnetworkID, err := subnetworks.FromBytes(subnetworkIDBytes)
-	if err != nil {
-		return nil, err
-	}
-	payloadHashBytes, err := hex.DecodeString(rpcTransaction.PayloadHash)
-	if err != nil {
-		return nil, err
-	}
-	payloadHash, err := externalapi.NewDomainHashFromByteSlice(payloadHashBytes)
+	payloadHash, err := externalapi.NewDomainHashFromString(rpcTransaction.PayloadHash)
 	if err != nil {
 		return nil, err
 	}
@@ -255,7 +243,7 @@ func DomainTransactionToRPCTransaction(transaction *externalapi.DomainTransactio
 			ScriptPublicKey: &RPCScriptPublicKey{Script: scriptPublicKey, Version: output.ScriptPublicKey.Version},
 		}
 	}
-	subnetworkID := hex.EncodeToString(transaction.SubnetworkID[:])
+	subnetworkID := transaction.SubnetworkID.String()
 	payloadHash := transaction.PayloadHash.String()
 	payload := hex.EncodeToString(transaction.Payload)
 	return &RPCTransaction{

app/appmessage/message.go

@@ -132,6 +132,11 @@ const (
 	CmdUnbanResponseMessage
 	CmdGetInfoRequestMessage
 	CmdGetInfoResponseMessage
+	CmdNotifyPruningPointUTXOSetOverrideRequestMessage
+	CmdNotifyPruningPointUTXOSetOverrideResponseMessage
+	CmdPruningPointUTXOSetOverrideNotificationMessage
+	CmdStopNotifyingPruningPointUTXOSetOverrideRequestMessage
+	CmdStopNotifyingPruningPointUTXOSetOverrideResponseMessage
 )
 
 // ProtocolMessageCommandToString maps all MessageCommands to their string representation
@@ -236,8 +241,13 @@ var RPCMessageCommandToString = map[MessageCommand]string{
 	CmdBanResponseMessage:                                         "BanResponse",
 	CmdUnbanRequestMessage:                                        "UnbanRequest",
 	CmdUnbanResponseMessage:                                       "UnbanResponse",
-	CmdGetInfoRequestMessage:                                      "GetInfoRequestMessage",
-	CmdGetInfoResponseMessage:                                     "GeInfoResponseMessage",
+	CmdGetInfoRequestMessage:                                      "GetInfoRequest",
+	CmdGetInfoResponseMessage:                                     "GeInfoResponse",
+	CmdNotifyPruningPointUTXOSetOverrideRequestMessage:            "NotifyPruningPointUTXOSetOverrideRequest",
+	CmdNotifyPruningPointUTXOSetOverrideResponseMessage:           "NotifyPruningPointUTXOSetOverrideResponse",
+	CmdPruningPointUTXOSetOverrideNotificationMessage:             "PruningPointUTXOSetOverrideNotification",
+	CmdStopNotifyingPruningPointUTXOSetOverrideRequestMessage:     "StopNotifyingPruningPointUTXOSetOverrideRequest",
+	CmdStopNotifyingPruningPointUTXOSetOverrideResponseMessage:    "StopNotifyingPruningPointUTXOSetOverrideResponse",
 }
 
 // Message is an interface that describes a kaspa message. A type that

app/appmessage/rpc_get_block.go

@@ -55,6 +55,7 @@ type BlockVerboseData struct {
 	Bits                   string
 	Difficulty             float64
 	ParentHashes           []string
+	ChildrenHashes         []string
 	SelectedParentHash     string
 	BlueScore              uint64
 	IsHeaderOnly           bool
@@ -104,4 +105,5 @@ type ScriptPubKeyResult struct {
 	Hex     string
 	Type    string
 	Address string
+	Version uint16
 }

app/appmessage/rpc_get_block_dag_info.go

@@ -27,6 +27,7 @@ type GetBlockDAGInfoResponseMessage struct {
 	VirtualParentHashes []string
 	Difficulty          float64
 	PastMedianTime      int64
+	PruningPointHash    string
 
 	Error *RPCError
 }

app/appmessage/rpc_notify_pruning_point_utxo_set_override.go

@@ -0,0 +1,83 @@
+package appmessage
+
+// NotifyPruningPointUTXOSetOverrideRequestMessage is an appmessage corresponding to
+// its respective RPC message
+type NotifyPruningPointUTXOSetOverrideRequestMessage struct {
+	baseMessage
+}
+
+// Command returns the protocol command string for the message
+func (msg *NotifyPruningPointUTXOSetOverrideRequestMessage) Command() MessageCommand {
+	return CmdNotifyPruningPointUTXOSetOverrideRequestMessage
+}
+
+// NewNotifyPruningPointUTXOSetOverrideRequestMessage returns a instance of the message
+func NewNotifyPruningPointUTXOSetOverrideRequestMessage() *NotifyPruningPointUTXOSetOverrideRequestMessage {
+	return &NotifyPruningPointUTXOSetOverrideRequestMessage{}
+}
+
+// NotifyPruningPointUTXOSetOverrideResponseMessage is an appmessage corresponding to
+// its respective RPC message
+type NotifyPruningPointUTXOSetOverrideResponseMessage struct {
+	baseMessage
+	Error *RPCError
+}
+
+// Command returns the protocol command string for the message
+func (msg *NotifyPruningPointUTXOSetOverrideResponseMessage) Command() MessageCommand {
+	return CmdNotifyPruningPointUTXOSetOverrideResponseMessage
+}
+
+// NewNotifyPruningPointUTXOSetOverrideResponseMessage returns a instance of the message
+func NewNotifyPruningPointUTXOSetOverrideResponseMessage() *NotifyPruningPointUTXOSetOverrideResponseMessage {
+	return &NotifyPruningPointUTXOSetOverrideResponseMessage{}
+}
+
+// PruningPointUTXOSetOverrideNotificationMessage is an appmessage corresponding to
+// its respective RPC message
+type PruningPointUTXOSetOverrideNotificationMessage struct {
+	baseMessage
+}
+
+// Command returns the protocol command string for the message
+func (msg *PruningPointUTXOSetOverrideNotificationMessage) Command() MessageCommand {
+	return CmdPruningPointUTXOSetOverrideNotificationMessage
+}
+
+// NewPruningPointUTXOSetOverrideNotificationMessage returns a instance of the message
+func NewPruningPointUTXOSetOverrideNotificationMessage() *PruningPointUTXOSetOverrideNotificationMessage {
+	return &PruningPointUTXOSetOverrideNotificationMessage{}
+}
+
+// StopNotifyingPruningPointUTXOSetOverrideRequestMessage is an appmessage corresponding to
+// its respective RPC message
+type StopNotifyingPruningPointUTXOSetOverrideRequestMessage struct {
+	baseMessage
+}
+
+// Command returns the protocol command string for the message
+func (msg *StopNotifyingPruningPointUTXOSetOverrideRequestMessage) Command() MessageCommand {
+	return CmdNotifyPruningPointUTXOSetOverrideRequestMessage
+}
+
+// NewStopNotifyingPruningPointUTXOSetOverrideRequestMessage returns a instance of the message
+func NewStopNotifyingPruningPointUTXOSetOverrideRequestMessage() *StopNotifyingPruningPointUTXOSetOverrideRequestMessage {
+	return &StopNotifyingPruningPointUTXOSetOverrideRequestMessage{}
+}
+
+// StopNotifyingPruningPointUTXOSetOverrideResponseMessage is an appmessage corresponding to
+// its respective RPC message
+type StopNotifyingPruningPointUTXOSetOverrideResponseMessage struct {
+	baseMessage
+	Error *RPCError
+}
+
+// Command returns the protocol command string for the message
+func (msg *StopNotifyingPruningPointUTXOSetOverrideResponseMessage) Command() MessageCommand {
+	return CmdNotifyPruningPointUTXOSetOverrideResponseMessage
+}
+
+// NewStopNotifyingPruningPointUTXOSetOverrideResponseMessage returns a instance of the message
+func NewStopNotifyingPruningPointUTXOSetOverrideResponseMessage() *StopNotifyingPruningPointUTXOSetOverrideResponseMessage {
+	return &StopNotifyingPruningPointUTXOSetOverrideResponseMessage{}
+}

app/component_manager.go

@@ -97,7 +97,11 @@ func NewComponentManager(cfg *config.Config, db infrastructuredatabase.Database,
 
 	var utxoIndex *utxoindex.UTXOIndex
 	if cfg.UTXOIndex {
-		utxoIndex = utxoindex.New(domain.Consensus(), db)
+		utxoIndex, err = utxoindex.New(domain.Consensus(), db)
+		if err != nil {
+			return nil, err
+		}
+
 		log.Infof("UTXO index started")
 	}
 
@@ -144,6 +148,7 @@ func setupRPC(
 		shutDownChan,
 	)
 	protocolManager.SetOnBlockAddedToDAGHandler(rpcManager.NotifyBlockAddedToDAG)
+	protocolManager.SetOnPruningPointUTXOSetOverrideHandler(rpcManager.NotifyPruningPointUTXOSetOverride)
 
 	return rpcManager
 }

app/log.go

@@ -7,8 +7,6 @@ package app
 
 import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
-	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.KASD)
-var spawn = panics.GoroutineWrapperFunc(log)
+var log = logger.RegisterSubSystem("KASD")

app/protocol/flowcontext/blocks.go

@@ -2,6 +2,7 @@ package flowcontext
 
 import (
 	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
 	"github.com/pkg/errors"
 
@@ -56,6 +57,15 @@ func (f *FlowContext) OnNewBlock(block *externalapi.DomainBlock,
 	return nil
 }
 
+// OnPruningPointUTXOSetOverride calls the handler function whenever the UTXO set
+// resets due to pruning point change via IBD.
+func (f *FlowContext) OnPruningPointUTXOSetOverride() error {
+	if f.onPruningPointUTXOSetOverrideHandler != nil {
+		return f.onPruningPointUTXOSetOverrideHandler()
+	}
+	return nil
+}
+
 func (f *FlowContext) broadcastTransactionsAfterBlockAdded(
 	block *externalapi.DomainBlock, transactionsAcceptedToMempool []*externalapi.DomainTransaction) error {
 
@@ -98,6 +108,10 @@ func (f *FlowContext) SharedRequestedBlocks() *blockrelay.SharedRequestedBlocks
 
 // AddBlock adds the given block to the DAG and propagates it.
 func (f *FlowContext) AddBlock(block *externalapi.DomainBlock) error {
+	if len(block.Transactions) == 0 {
+		return protocolerrors.Errorf(false, "cannot add header only block")
+	}
+
 	blockInsertionResult, err := f.Domain().Consensus().ValidateAndInsertBlock(block)
 	if err != nil {
 		if errors.As(err, &ruleerrors.RuleError{}) {

app/protocol/flowcontext/errors.go

@@ -18,7 +18,7 @@ import (
 func (*FlowContext) HandleError(err error, flowName string, isStopping *uint32, errChan chan<- error) {
 	isErrRouteClosed := errors.Is(err, router.ErrRouteClosed)
 	if !isErrRouteClosed {
-		if protocolErr := &(protocolerrors.ProtocolError{}); !errors.As(err, &protocolErr) {
+		if protocolErr := (protocolerrors.ProtocolError{}); !errors.As(err, &protocolErr) {
 			panic(err)
 		}
 

app/protocol/flowcontext/flow_context.go

@@ -23,6 +23,10 @@ import (
 // when a block is added to the DAG
 type OnBlockAddedToDAGHandler func(block *externalapi.DomainBlock, blockInsertionResult *externalapi.BlockInsertionResult) error
 
+// OnPruningPointUTXOSetOverrideHandler is a handle function that's triggered whenever the UTXO set
+// resets due to pruning point change via IBD.
+type OnPruningPointUTXOSetOverrideHandler func() error
+
 // OnTransactionAddedToMempoolHandler is a handler function that's triggered
 // when a transaction is added to the mempool
 type OnTransactionAddedToMempoolHandler func()
@@ -38,8 +42,9 @@ type FlowContext struct {
 
 	timeStarted int64
 
-	onBlockAddedToDAGHandler           OnBlockAddedToDAGHandler
-	onTransactionAddedToMempoolHandler OnTransactionAddedToMempoolHandler
+	onBlockAddedToDAGHandler             OnBlockAddedToDAGHandler
+	onPruningPointUTXOSetOverrideHandler OnPruningPointUTXOSetOverrideHandler
+	onTransactionAddedToMempoolHandler   OnTransactionAddedToMempoolHandler
 
 	transactionsToRebroadcastLock sync.Mutex
 	transactionsToRebroadcast     map[externalapi.DomainTransactionID]*externalapi.DomainTransaction
@@ -82,6 +87,11 @@ func (f *FlowContext) SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler OnBlo
 	f.onBlockAddedToDAGHandler = onBlockAddedToDAGHandler
 }
 
+// SetOnPruningPointUTXOSetOverrideHandler sets the onPruningPointUTXOSetOverrideHandler handler
+func (f *FlowContext) SetOnPruningPointUTXOSetOverrideHandler(onPruningPointUTXOSetOverrideHandler OnPruningPointUTXOSetOverrideHandler) {
+	f.onPruningPointUTXOSetOverrideHandler = onPruningPointUTXOSetOverrideHandler
+}
+
 // SetOnTransactionAddedToMempoolHandler sets the onTransactionAddedToMempool handler
 func (f *FlowContext) SetOnTransactionAddedToMempoolHandler(onTransactionAddedToMempoolHandler OnTransactionAddedToMempoolHandler) {
 	f.onTransactionAddedToMempoolHandler = onTransactionAddedToMempoolHandler

app/protocol/flowcontext/log.go

@@ -2,8 +2,6 @@ package flowcontext
 
 import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
-	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.PROT)
-var spawn = panics.GoroutineWrapperFunc(log)
+var log = logger.RegisterSubSystem("PROT")

app/protocol/flows/blockrelay/handle_relay_invs.go

@@ -24,6 +24,7 @@ type RelayInvsContext interface {
 	Domain() domain.Domain
 	Config() *config.Config
 	OnNewBlock(block *externalapi.DomainBlock, blockInsertionResult *externalapi.BlockInsertionResult) error
+	OnPruningPointUTXOSetOverride() error
 	SharedRequestedBlocks() *SharedRequestedBlocks
 	Broadcast(message appmessage.Message) error
 	AddOrphan(orphanBlock *externalapi.DomainBlock)
@@ -104,6 +105,11 @@ func (flow *handleRelayInvsFlow) start() error {
 			continue
 		}
 
+		err = flow.banIfBlockIsHeaderOnly(block)
+		if err != nil {
+			return err
+		}
+
 		log.Debugf("Processing block %s", inv.Hash)
 		missingParents, blockInsertionResult, err := flow.processBlock(block)
 		if err != nil {
@@ -140,6 +146,15 @@ func (flow *handleRelayInvsFlow) start() error {
 	}
 }
 
+func (flow *handleRelayInvsFlow) banIfBlockIsHeaderOnly(block *externalapi.DomainBlock) error {
+	if len(block.Transactions) == 0 {
+		return protocolerrors.Errorf(true, "sent header of %s block where expected block with body",
+			consensushashing.BlockHash(block))
+	}
+
+	return nil
+}
+
 func (flow *handleRelayInvsFlow) readInv() (*appmessage.MsgInvRelayBlock, error) {
 	if len(flow.invsQueue) > 0 {
 		var inv *appmessage.MsgInvRelayBlock

app/protocol/flows/blockrelay/handle_request_headers.go

@@ -17,7 +17,7 @@ type RequestIBDBlocksContext interface {
 	Domain() domain.Domain
 }
 
-type handleRequestBlocksFlow struct {
+type handleRequestHeadersFlow struct {
 	RequestIBDBlocksContext
 	incomingRoute, outgoingRoute *router.Route
 	peer                         *peer.Peer
@@ -27,7 +27,7 @@ type handleRequestBlocksFlow struct {
 func HandleRequestHeaders(context RequestIBDBlocksContext, incomingRoute *router.Route,
 	outgoingRoute *router.Route, peer *peer.Peer) error {
 
-	flow := &handleRequestBlocksFlow{
+	flow := &handleRequestHeadersFlow{
 		RequestIBDBlocksContext: context,
 		incomingRoute:           incomingRoute,
 		outgoingRoute:           outgoingRoute,
@@ -36,7 +36,7 @@ func HandleRequestHeaders(context RequestIBDBlocksContext, incomingRoute *router
 	return flow.start()
 }
 
-func (flow *handleRequestBlocksFlow) start() error {
+func (flow *handleRequestHeadersFlow) start() error {
 	for {
 		lowHash, highHash, err := receiveRequestHeaders(flow.incomingRoute)
 		if err != nil {

app/protocol/flows/blockrelay/ibd.go

@@ -410,6 +410,11 @@ func (flow *handleRelayInvsFlow) fetchMissingUTXOSet(pruningPointHash *externala
 		return false, protocolerrors.ConvertToBanningProtocolErrorIfRuleError(err, "error with pruning point UTXO set")
 	}
 
+	err = flow.OnPruningPointUTXOSetOverride()
+	if err != nil {
+		return false, err
+	}
+
 	return true, nil
 }
 
@@ -533,6 +538,11 @@ func (flow *handleRelayInvsFlow) syncMissingBlockBodies(highHash *externalapi.Do
 				return protocolerrors.Errorf(true, "expected block %s but got %s", expectedHash, blockHash)
 			}
 
+			err = flow.banIfBlockIsHeaderOnly(block)
+			if err != nil {
+				return err
+			}
+
 			blockInsertionResult, err := flow.Domain().Consensus().ValidateAndInsertBlock(block)
 			if err != nil {
 				if errors.Is(err, ruleerrors.ErrDuplicateBlock) {

app/protocol/flows/blockrelay/log.go

@@ -5,5 +5,5 @@ import (
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.PROT)
+var log = logger.RegisterSubSystem("PROT")
 var spawn = panics.GoroutineWrapperFunc(log)

app/protocol/flows/handshake/handshake.go

@@ -107,7 +107,7 @@ func handleError(err error, flowName string, isStopping *uint32, errChan chan er
 		return
 	}
 
-	if protocolErr := &(protocolerrors.ProtocolError{}); errors.As(err, &protocolErr) {
+	if protocolErr := (protocolerrors.ProtocolError{}); errors.As(err, &protocolErr) {
 		log.Errorf("Handshake protocol error from %s: %s", flowName, err)
 		if atomic.AddUint32(isStopping, 1) == 1 {
 			errChan <- err

app/protocol/flows/handshake/log.go

@@ -5,5 +5,5 @@ import (
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.PROT)
+var log = logger.RegisterSubSystem("PROT")
 var spawn = panics.GoroutineWrapperFunc(log)

app/protocol/flows/testing/common_test.go

@@ -1,14 +1,15 @@
 package testing
 
 import (
-	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	"github.com/pkg/errors"
 	"strings"
 	"testing"
+
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
+	"github.com/pkg/errors"
 )
 
 func checkFlowError(t *testing.T, err error, isProtocolError bool, shouldBan bool, contains string) {
-	pErr := &protocolerrors.ProtocolError{}
+	pErr := protocolerrors.ProtocolError{}
 	if errors.As(err, &pErr) != isProtocolError {
 		t.Fatalf("Unexepcted error %+v", err)
 	}

app/protocol/flows/testing/handle_relay_invs_test.go

@@ -24,6 +24,19 @@ import (
 	"github.com/pkg/errors"
 )
 
+var headerOnlyBlock = &externalapi.DomainBlock{
+	Header: blockheader.NewImmutableBlockHeader(
+		constants.MaxBlockVersion,
+		[]*externalapi.DomainHash{externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{1})},
+		&externalapi.DomainHash{},
+		&externalapi.DomainHash{},
+		&externalapi.DomainHash{},
+		0,
+		0,
+		0,
+	),
+}
+
 var orphanBlock = &externalapi.DomainBlock{
 	Header: blockheader.NewImmutableBlockHeader(
 		constants.MaxBlockVersion,
@@ -35,6 +48,7 @@ var orphanBlock = &externalapi.DomainBlock{
 		0,
 		0,
 	),
+	Transactions: []*externalapi.DomainTransaction{{}},
 }
 
 var validPruningPointBlock = &externalapi.DomainBlock{
@@ -48,6 +62,7 @@ var validPruningPointBlock = &externalapi.DomainBlock{
 		0,
 		0,
 	),
+	Transactions: []*externalapi.DomainTransaction{{}},
 }
 
 var invalidPruningPointBlock = &externalapi.DomainBlock{
@@ -61,6 +76,7 @@ var invalidPruningPointBlock = &externalapi.DomainBlock{
 		0,
 		0,
 	),
+	Transactions: []*externalapi.DomainTransaction{{}},
 }
 
 var unexpectedIBDBlock = &externalapi.DomainBlock{
@@ -74,6 +90,7 @@ var unexpectedIBDBlock = &externalapi.DomainBlock{
 		0,
 		0,
 	),
+	Transactions: []*externalapi.DomainTransaction{{}},
 }
 
 var invalidBlock = &externalapi.DomainBlock{
@@ -87,6 +104,7 @@ var invalidBlock = &externalapi.DomainBlock{
 		0,
 		0,
 	),
+	Transactions: []*externalapi.DomainTransaction{{}},
 }
 
 var unknownBlockHash = externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{1})
@@ -95,6 +113,7 @@ var validPruningPointHash = consensushashing.BlockHash(validPruningPointBlock)
 var invalidBlockHash = consensushashing.BlockHash(invalidBlock)
 var invalidPruningPointHash = consensushashing.BlockHash(invalidPruningPointBlock)
 var orphanBlockHash = consensushashing.BlockHash(orphanBlock)
+var headerOnlyBlockHash = consensushashing.BlockHash(headerOnlyBlock)
 
 type fakeRelayInvsContext struct {
 	testName             string
@@ -110,6 +129,18 @@ type fakeRelayInvsContext struct {
 	rwLock                                        sync.RWMutex
 }
 
+func (f *fakeRelayInvsContext) GetBlockChildren(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
+	panic(errors.Errorf("called unimplemented function from test '%s'", f.testName))
+}
+
+func (f *fakeRelayInvsContext) OnPruningPointUTXOSetOverride() error {
+	return nil
+}
+
+func (f *fakeRelayInvsContext) GetVirtualUTXOs(expectedVirtualParents []*externalapi.DomainHash, fromOutpoint *externalapi.DomainOutpoint, limit int) ([]*externalapi.OutpointAndUTXOEntryPair, error) {
+	panic(errors.Errorf("called unimplemented function from test '%s'", f.testName))
+}
+
 func (f *fakeRelayInvsContext) Anticone(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
 	panic(errors.Errorf("called unimplemented function from test '%s'", f.testName))
 }
@@ -450,6 +481,29 @@ func TestHandleRelayInvs(t *testing.T) {
 			expectsBan:           true,
 			expectsErrToContain:  "got unrequested block",
 		},
+		{
+			name: "sending header only block on relay",
+			funcToExecute: func(t *testing.T, incomingRoute, outgoingRoute *router.Route, context *fakeRelayInvsContext) {
+				err := incomingRoute.Enqueue(appmessage.NewMsgInvBlock(headerOnlyBlockHash))
+				if err != nil {
+					t.Fatalf("Enqueue: %+v", err)
+				}
+
+				msg, err := outgoingRoute.DequeueWithTimeout(time.Second)
+				if err != nil {
+					t.Fatalf("DequeueWithTimeout: %+v", err)
+				}
+				_ = msg.(*appmessage.MsgRequestRelayBlocks)
+
+				err = incomingRoute.Enqueue(appmessage.DomainBlockToMsgBlock(headerOnlyBlock))
+				if err != nil {
+					t.Fatalf("Enqueue: %+v", err)
+				}
+			},
+			expectsProtocolError: true,
+			expectsBan:           true,
+			expectsErrToContain:  "block where expected block with body",
+		},
 		{
 			name: "sending invalid block",
 			funcToExecute: func(t *testing.T, incomingRoute, outgoingRoute *router.Route, context *fakeRelayInvsContext) {

app/protocol/flows/transactionrelay/handle_relayed_transactions.go

@@ -191,7 +191,7 @@ func (flow *handleRelayedTransactionsFlow) receiveTransactions(requestedTransact
 				continue
 			}
 
-			return protocolerrors.Errorf(true, "rejected transaction %s", txID)
+			return protocolerrors.Errorf(true, "rejected transaction %s: %s", txID, ruleErr)
 		}
 		err = flow.broadcastAcceptedTransactions([]*externalapi.DomainTransactionID{txID})
 		if err != nil {

app/protocol/log.go

@@ -5,5 +5,5 @@ import (
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.PROT)
+var log = logger.RegisterSubSystem("PROT")
 var spawn = panics.GoroutineWrapperFunc(log)

app/protocol/manager.go

@@ -69,6 +69,11 @@ func (m *Manager) SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler flowconte
 	m.context.SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler)
 }
 
+// SetOnPruningPointUTXOSetOverrideHandler sets the OnPruningPointUTXOSetOverride handler
+func (m *Manager) SetOnPruningPointUTXOSetOverrideHandler(onPruningPointUTXOSetOverrideHandler flowcontext.OnPruningPointUTXOSetOverrideHandler) {
+	m.context.SetOnPruningPointUTXOSetOverrideHandler(onPruningPointUTXOSetOverrideHandler)
+}
+
 // SetOnTransactionAddedToMempoolHandler sets the onTransactionAddedToMempool handler
 func (m *Manager) SetOnTransactionAddedToMempoolHandler(onTransactionAddedToMempoolHandler flowcontext.OnTransactionAddedToMempoolHandler) {
 	m.context.SetOnTransactionAddedToMempoolHandler(onTransactionAddedToMempoolHandler)

app/protocol/peer/log.go

@@ -2,8 +2,6 @@ package peer
 
 import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
-	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.PROT)
-var spawn = panics.GoroutineWrapperFunc(log)
+var log = logger.RegisterSubSystem("PROT")

app/protocol/protocol.go

@@ -1,9 +1,10 @@
 package protocol
 
 import (
+	"sync/atomic"
+
 	"github.com/kaspanet/kaspad/app/protocol/flows/rejects"
 	"github.com/kaspanet/kaspad/infrastructure/network/connmanager"
-	"sync/atomic"
 
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/protocol/flows/addressexchange"
@@ -58,8 +59,20 @@ func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *net
 
 		peer, err := handshake.HandleHandshake(m.context, netConnection, receiveVersionRoute,
 			sendVersionRoute, router.OutgoingRoute())
+
 		if err != nil {
-			m.handleError(err, netConnection, router.OutgoingRoute())
+			// non-blocking read from channel
+			select {
+			case innerError := <-errChan:
+				if errors.Is(err, routerpkg.ErrRouteClosed) {
+					m.handleError(innerError, netConnection, router.OutgoingRoute())
+				} else {
+					log.Errorf("Peer %s sent invalid message: %s", netConnection, innerError)
+					m.handleError(err, netConnection, router.OutgoingRoute())
+				}
+			default:
+				m.handleError(err, netConnection, router.OutgoingRoute())
+			}
 			return
 		}
 		defer m.context.RemoveFromPeers(peer)
@@ -75,7 +88,7 @@ func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *net
 }
 
 func (m *Manager) handleError(err error, netConnection *netadapter.NetConnection, outgoingRoute *routerpkg.Route) {
-	if protocolErr := &(protocolerrors.ProtocolError{}); errors.As(err, &protocolErr) {
+	if protocolErr := (protocolerrors.ProtocolError{}); errors.As(err, &protocolErr) {
 		if !m.context.Config().DisableBanning && protocolErr.ShouldBan {
 			log.Warnf("Banning %s (reason: %s)", netConnection, protocolErr.Cause)
 
@@ -89,7 +102,7 @@ func (m *Manager) handleError(err error, netConnection *netadapter.NetConnection
 				panic(err)
 			}
 		}
-		log.Debugf("Disconnecting from %s (reason: %s)", netConnection, protocolErr.Cause)
+		log.Infof("Disconnecting from %s (reason: %s)", netConnection, protocolErr.Cause)
 		netConnection.Disconnect()
 		return
 	}

app/protocol/protocolerrors/protocolerrors.go

@@ -12,19 +12,19 @@ type ProtocolError struct {
 	Cause     error
 }
 
-func (e *ProtocolError) Error() string {
+func (e ProtocolError) Error() string {
 	return e.Cause.Error()
 }
 
 // Unwrap returns the cause of ProtocolError, to be used with `errors.Unwrap()`
-func (e *ProtocolError) Unwrap() error {
+func (e ProtocolError) Unwrap() error {
 	return e.Cause
 }
 
 // Errorf formats according to a format specifier and returns the string
 // as a ProtocolError.
 func Errorf(shouldBan bool, format string, args ...interface{}) error {
-	return &ProtocolError{
+	return ProtocolError{
 		ShouldBan: shouldBan,
 		Cause:     errors.Errorf(format, args...),
 	}
@@ -33,7 +33,7 @@ func Errorf(shouldBan bool, format string, args ...interface{}) error {
 // New returns a ProtocolError with the supplied message.
 // New also records the stack trace at the point it was called.
 func New(shouldBan bool, message string) error {
-	return &ProtocolError{
+	return ProtocolError{
 		ShouldBan: shouldBan,
 		Cause:     errors.New(message),
 	}
@@ -41,7 +41,7 @@ func New(shouldBan bool, message string) error {
 
 // Wrap wraps the given error and returns it as a ProtocolError.
 func Wrap(shouldBan bool, err error, message string) error {
-	return &ProtocolError{
+	return ProtocolError{
 		ShouldBan: shouldBan,
 		Cause:     errors.Wrap(err, message),
 	}
@@ -49,7 +49,7 @@ func Wrap(shouldBan bool, err error, message string) error {
 
 // Wrapf wraps the given error with the given format and returns it as a ProtocolError.
 func Wrapf(shouldBan bool, err error, format string, args ...interface{}) error {
-	return &ProtocolError{
+	return ProtocolError{
 		ShouldBan: shouldBan,
 		Cause:     errors.Wrapf(err, format, args...),
 	}

app/rpc/log.go

@@ -5,5 +5,5 @@ import (
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.RPCS)
+var log = logger.RegisterSubSystem("RPCS")
 var spawn = panics.GoroutineWrapperFunc(log)

app/rpc/manager.go

@@ -78,6 +78,22 @@ func (m *Manager) NotifyBlockAddedToDAG(block *externalapi.DomainBlock, blockIns
 	return m.context.NotificationManager.NotifyBlockAdded(blockAddedNotification)
 }
 
+// NotifyPruningPointUTXOSetOverride notifies the manager whenever the UTXO index
+// resets due to pruning point change via IBD.
+func (m *Manager) NotifyPruningPointUTXOSetOverride() error {
+	onEnd := logger.LogAndMeasureExecutionTime(log, "RPCManager.NotifyPruningPointUTXOSetOverride")
+	defer onEnd()
+
+	if m.context.Config.UTXOIndex {
+		err := m.notifyPruningPointUTXOSetOverride()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // NotifyFinalityConflict notifies the manager that there's a finality conflict in the DAG
 func (m *Manager) NotifyFinalityConflict(violatingBlockHash string) error {
 	onEnd := logger.LogAndMeasureExecutionTime(log, "RPCManager.NotifyFinalityConflict")
@@ -100,13 +116,25 @@ func (m *Manager) notifyUTXOsChanged(blockInsertionResult *externalapi.BlockInse
 	onEnd := logger.LogAndMeasureExecutionTime(log, "RPCManager.NotifyUTXOsChanged")
 	defer onEnd()
 
-	utxoIndexChanges, err := m.context.UTXOIndex.Update(blockInsertionResult.VirtualSelectedParentChainChanges)
+	utxoIndexChanges, err := m.context.UTXOIndex.Update(blockInsertionResult)
 	if err != nil {
 		return err
 	}
 	return m.context.NotificationManager.NotifyUTXOsChanged(utxoIndexChanges)
 }
 
+func (m *Manager) notifyPruningPointUTXOSetOverride() error {
+	onEnd := logger.LogAndMeasureExecutionTime(log, "RPCManager.notifyPruningPointUTXOSetOverride")
+	defer onEnd()
+
+	err := m.context.UTXOIndex.Reset()
+	if err != nil {
+		return err
+	}
+
+	return m.context.NotificationManager.NotifyPruningPointUTXOSetOverride()
+}
+
 func (m *Manager) notifyVirtualSelectedParentBlueScoreChanged() error {
 	onEnd := logger.LogAndMeasureExecutionTime(log, "RPCManager.NotifyVirtualSelectedParentBlueScoreChanged")
 	defer onEnd()

app/rpc/rpc.go

@@ -42,6 +42,8 @@ var handlers = map[appmessage.MessageCommand]handler{
 	appmessage.CmdBanRequestMessage:                                         rpchandlers.HandleBan,
 	appmessage.CmdUnbanRequestMessage:                                       rpchandlers.HandleUnban,
 	appmessage.CmdGetInfoRequestMessage:                                     rpchandlers.HandleGetInfo,
+	appmessage.CmdNotifyPruningPointUTXOSetOverrideRequestMessage:           rpchandlers.HandleNotifyPruningPointUTXOSetOverrideRequest,
+	appmessage.CmdStopNotifyingPruningPointUTXOSetOverrideRequestMessage:    rpchandlers.HandleStopNotifyingPruningPointUTXOSetOverrideRequest,
 }
 
 func (m *Manager) routerInitializer(router *router.Router, netConnection *netadapter.NetConnection) {

app/rpc/rpccontext/log.go

@@ -2,8 +2,6 @@ package rpccontext
 
 import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
-	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.RPCS)
-var spawn = panics.GoroutineWrapperFunc(log)
+var log = logger.RegisterSubSystem("RPCS")

app/rpc/rpccontext/notificationmanager.go

@@ -30,6 +30,7 @@ type NotificationListener struct {
 	propagateFinalityConflictResolvedNotifications              bool
 	propagateUTXOsChangedNotifications                          bool
 	propagateVirtualSelectedParentBlueScoreChangedNotifications bool
+	propagatePruningPointUTXOSetOverrideNotifications           bool
 
 	propagateUTXOsChangedNotificationAddresses map[utxoindex.ScriptPublicKeyString]*UTXOsChangedNotificationAddress
 }
@@ -180,6 +181,23 @@ func (nm *NotificationManager) NotifyVirtualSelectedParentBlueScoreChanged(
 	return nil
 }
 
+// NotifyPruningPointUTXOSetOverride notifies the notification manager that the UTXO index
+// reset due to pruning point change via IBD.
+func (nm *NotificationManager) NotifyPruningPointUTXOSetOverride() error {
+	nm.RLock()
+	defer nm.RUnlock()
+
+	for router, listener := range nm.listeners {
+		if listener.propagatePruningPointUTXOSetOverrideNotifications {
+			err := router.OutgoingRoute().Enqueue(appmessage.NewPruningPointUTXOSetOverrideNotificationMessage())
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 func newNotificationListener() *NotificationListener {
 	return &NotificationListener{
 		propagateBlockAddedNotifications:                            false,
@@ -188,6 +206,7 @@ func newNotificationListener() *NotificationListener {
 		propagateFinalityConflictResolvedNotifications:              false,
 		propagateUTXOsChangedNotifications:                          false,
 		propagateVirtualSelectedParentBlueScoreChangedNotifications: false,
+		propagatePruningPointUTXOSetOverrideNotifications:           false,
 	}
 }
 
@@ -288,3 +307,15 @@ func (nl *NotificationListener) convertUTXOChangesToUTXOsChangedNotification(
 func (nl *NotificationListener) PropagateVirtualSelectedParentBlueScoreChangedNotifications() {
 	nl.propagateVirtualSelectedParentBlueScoreChangedNotifications = true
 }
+
+// PropagatePruningPointUTXOSetOverrideNotifications instructs the listener to send pruning point UTXO set override notifications
+// to the remote listener.
+func (nl *NotificationListener) PropagatePruningPointUTXOSetOverrideNotifications() {
+	nl.propagatePruningPointUTXOSetOverrideNotifications = true
+}
+
+// StopPropagatingPruningPointUTXOSetOverrideNotifications instructs the listener to stop sending pruning
+// point UTXO set override notifications to the remote listener.
+func (nl *NotificationListener) StopPropagatingPruningPointUTXOSetOverrideNotifications() {
+	nl.propagatePruningPointUTXOSetOverrideNotifications = false
+}

app/rpc/rpccontext/verbosedata.go

@@ -3,13 +3,14 @@ package rpccontext
 import (
 	"encoding/hex"
 	"fmt"
+	"math"
+	"math/big"
+	"strconv"
+
 	"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/util/difficulty"
 	"github.com/pkg/errors"
-	"math"
-	"math/big"
-	"strconv"
 
 	"github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
 
@@ -47,6 +48,11 @@ func (ctx *Context) BuildBlockVerboseData(blockHeader externalapi.BlockHeader, b
 			"invalid block")
 	}
 
+	childrenHashes, err := ctx.Domain.Consensus().GetBlockChildren(hash)
+	if err != nil {
+		return nil, err
+	}
+
 	result := &appmessage.BlockVerboseData{
 		Hash:                 hash.String(),
 		Version:              blockHeader.Version(),
@@ -55,6 +61,7 @@ func (ctx *Context) BuildBlockVerboseData(blockHeader externalapi.BlockHeader, b
 		AcceptedIDMerkleRoot: blockHeader.AcceptedIDMerkleRoot().String(),
 		UTXOCommitment:       blockHeader.UTXOCommitment().String(),
 		ParentHashes:         hashes.ToStrings(blockHeader.ParentHashes()),
+		ChildrenHashes:       hashes.ToStrings(childrenHashes),
 		Nonce:                blockHeader.Nonce(),
 		Time:                 blockHeader.TimeInMilliseconds(),
 		Bits:                 strconv.FormatInt(int64(blockHeader.Bits()), 16),
@@ -205,6 +212,7 @@ func (ctx *Context) buildTransactionVerboseOutputs(tx *externalapi.DomainTransac
 		output.Index = uint32(i)
 		output.Value = transactionOutput.Value
 		output.ScriptPubKey = &appmessage.ScriptPubKeyResult{
+			Version: transactionOutput.ScriptPublicKey.Version,
 			Address: encodedAddr,
 			Hex:     hex.EncodeToString(transactionOutput.ScriptPublicKey.Script),
 			Type:    scriptClass.String(),

app/rpc/rpchandlers/get_block_dag_info.go

@@ -36,5 +36,11 @@ func HandleGetBlockDAGInfo(context *rpccontext.Context, _ *router.Router, _ appm
 	response.Difficulty = context.GetDifficultyRatio(virtualInfo.Bits, context.Config.ActiveNetParams)
 	response.PastMedianTime = virtualInfo.PastMedianTime
 
+	pruningPoint, err := context.Domain.Consensus().PruningPoint()
+	if err != nil {
+		return nil, err
+	}
+	response.PruningPointHash = pruningPoint.String()
+
 	return response, nil
 }

app/rpc/rpchandlers/get_blocks.go

@@ -11,7 +11,7 @@ import (
 const (
 	// maxBlocksInGetBlocksResponse is the max amount of blocks that are
 	// allowed in a GetBlocksResult.
-	maxBlocksInGetBlocksResponse = 100
+	maxBlocksInGetBlocksResponse = 1000
 )
 
 // HandleGetBlocks handles the respectively named RPC command
@@ -37,6 +37,17 @@ func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appm
 				Error: appmessage.RPCErrorf("Could not decode lowHash %s: %s", getBlocksRequest.LowHash, err),
 			}, nil
 		}
+
+		blockInfo, err := context.Domain.Consensus().GetBlockInfo(lowHash)
+		if err != nil {
+			return nil, err
+		}
+
+		if !blockInfo.Exists {
+			return &appmessage.GetBlocksResponseMessage{
+				Error: appmessage.RPCErrorf("Could not find lowHash %s", getBlocksRequest.LowHash),
+			}, nil
+		}
 	}
 
 	// Get hashes between lowHash and virtualSelectedParent

app/rpc/rpchandlers/log.go

@@ -5,5 +5,5 @@ import (
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.RPCS)
+var log = logger.RegisterSubSystem("RPCS")
 var spawn = panics.GoroutineWrapperFunc(log)

app/rpc/rpchandlers/notify_pruning_point_utxo_set_overrides.go

@@ -0,0 +1,19 @@
+package rpchandlers
+
+import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/rpc/rpccontext"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+)
+
+// HandleNotifyPruningPointUTXOSetOverrideRequest handles the respectively named RPC command
+func HandleNotifyPruningPointUTXOSetOverrideRequest(context *rpccontext.Context, router *router.Router, _ appmessage.Message) (appmessage.Message, error) {
+	listener, err := context.NotificationManager.Listener(router)
+	if err != nil {
+		return nil, err
+	}
+	listener.PropagatePruningPointUTXOSetOverrideNotifications()
+
+	response := appmessage.NewNotifyPruningPointUTXOSetOverrideResponseMessage()
+	return response, nil
+}

app/rpc/rpchandlers/stop_notifying_pruning_point_utxo_set_overrides.go

@@ -0,0 +1,19 @@
+package rpchandlers
+
+import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/rpc/rpccontext"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+)
+
+// HandleStopNotifyingPruningPointUTXOSetOverrideRequest handles the respectively named RPC command
+func HandleStopNotifyingPruningPointUTXOSetOverrideRequest(context *rpccontext.Context, router *router.Router, _ appmessage.Message) (appmessage.Message, error) {
+	listener, err := context.NotificationManager.Listener(router)
+	if err != nil {
+		return nil, err
+	}
+	listener.StopPropagatingPruningPointUTXOSetOverrideNotifications()
+
+	response := appmessage.NewStopNotifyingPruningPointUTXOSetOverrideResponseMessage()
+	return response, nil
+}

app/rpc/rpchandlers/submit_block.go

@@ -2,6 +2,7 @@ package rpchandlers
 
 import (
 	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/app/rpc/rpccontext"
 	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
@@ -25,9 +26,11 @@ func HandleSubmitBlock(context *rpccontext.Context, _ *router.Router, request ap
 
 	err := context.ProtocolManager.AddBlock(domainBlock)
 	if err != nil {
-		if !errors.As(err, &ruleerrors.RuleError{}) {
+		isProtocolOrRuleError := errors.As(err, &ruleerrors.RuleError{}) || errors.As(err, &protocolerrors.ProtocolError{})
+		if !isProtocolOrRuleError {
 			return nil, err
 		}
+
 		return &appmessage.SubmitBlockResponseMessage{
 			Error:        appmessage.RPCErrorf("Block rejected. Reason: %s", err),
 			RejectReason: appmessage.RejectReasonBlockInvalid,

changelog.txt

@@ -0,0 +1,31 @@
+
+Kaspad v0.9.0 - 2021-03-04
+===========================
+
+* Merge big subdags in pick virtual parents (#1574)
+* Write in the reject message the tx rejection reason (#1573)
+* Add nil checks for protowire (#1570)
+* Increase getBlocks limit to 1000 (#1572)
+* Return RPC error if getBlock's lowHash doesn't exist (#1569)
+* Add default dns-seeder to testnet (#1568)
+* Fix utxoindex deserialization (#1566)
+* Add pruning point hash to GetBlockDagInfo response (#1565)
+* Use EmitUnpopulated so that kaspactl prints all fields, even the default ones (#1561)
+* Stop logging an error whenever an RPC/P2P connection is canceled  (#1562)
+* Cleanup the logger and make it asynchronous (#1524)
+* Close all iterators (#1542)
+* Add childrenHashes to GetBlock/s RPC commands (#1560)
+* Add ScriptPublicKey.Version to RPC (#1559)
+* Fix the target block rate to create less bursty mining (#1554)
+
+Kaspad v0.8.10 - 2021-02-25
+===========================
+
+* Fix bug where invalid mempool transactions were not removed (#1551)
+* Add RPC reconnection to the miner (#1552)
+* Remove virtual diff parents - only selectedTip is virtualDiffParent now (#1550)
+* Fix UTXO index (#1548)
+* Prevent fast failing (#1545)
+* Increase the sleep time in kaspaminer when the node is not synced (#1544)
+* Disallow header only blocks on RPC, relay and when requesting IBD full blocks (#1537)
+* Make templateManager hold a DomainBlock and isSynced bool instead of a GetBlockTemplateResponseMessage (#1538)

cmd/kaspactl/README.md

@@ -4,7 +4,7 @@ kaspactl is an RPC client for kaspad
 
 ## Requirements
 
-Go 1.15 or later.
+Go 1.16 or later.
 
 ## Installation
 

cmd/kaspactl/docker/Dockerfile

@@ -1,5 +1,5 @@
 # -- multistage docker build: stage #1: build stage
-FROM golang:1.15-alpine AS build
+FROM golang:1.16-alpine AS build
 
 RUN mkdir -p /go/src/github.com/kaspanet/kaspad
 

cmd/kaspactl/main.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/server/grpcserver/protowire"
 	"os"
 	"time"
 
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/server/grpcserver/protowire"
+
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/encoding/protojson"
 
@@ -67,7 +68,7 @@ func postCommand(cfg *configFlags, client *grpcclient.GRPCClient, responseChan c
 	if err != nil {
 		printErrorAndExit(fmt.Sprintf("error posting the request to the RPC server: %s", err))
 	}
-	responseBytes, err := protojson.Marshal(response)
+	responseBytes, err := protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(response)
 	if err != nil {
 		printErrorAndExit(errors.Wrapf(err, "error parsing the response from the RPC server").Error())
 	}
@@ -92,6 +93,7 @@ func prettifyResponse(response string) string {
 
 	marshalOptions := &protojson.MarshalOptions{}
 	marshalOptions.Indent = "    "
+	marshalOptions.EmitUnpopulated = true
 	return marshalOptions.Format(kaspadMessage)
 }
 

cmd/kaspaminer/README.md

@@ -4,7 +4,7 @@ Kaspaminer is a CPU-based miner for kaspad
 
 ## Requirements
 
-Go 1.15 or later.
+Go 1.16 or later.
 
 ## Installation
 

cmd/kaspaminer/client.go

@@ -5,42 +5,95 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/infrastructure/network/rpcclient"
 	"github.com/pkg/errors"
+	"sync"
+	"sync/atomic"
 	"time"
 )
 
 const minerTimeout = 10 * time.Second
 
 type minerClient struct {
-	*rpcclient.RPCClient
+	isReconnecting uint32
+	clientLock     sync.RWMutex
+	rpcClient      *rpcclient.RPCClient
 
+	cfg                        *configFlags
 	blockAddedNotificationChan chan struct{}
 }
 
-func newMinerClient(cfg *configFlags) (*minerClient, error) {
-	rpcAddress, err := cfg.NetParams().NormalizeRPCServerAddress(cfg.RPCServer)
-	if err != nil {
-		return nil, err
-	}
-	rpcClient, err := rpcclient.NewRPCClient(rpcAddress)
-	if err != nil {
-		return nil, err
-	}
-	rpcClient.SetTimeout(minerTimeout)
-	rpcClient.SetLogger(backendLog, logger.LevelTrace)
+func (mc *minerClient) safeRPCClient() *rpcclient.RPCClient {
+	mc.clientLock.RLock()
+	defer mc.clientLock.RUnlock()
+	return mc.rpcClient
+}
 
-	minerClient := &minerClient{
-		RPCClient:                  rpcClient,
-		blockAddedNotificationChan: make(chan struct{}),
+func (mc *minerClient) reconnect() {
+	swapped := atomic.CompareAndSwapUint32(&mc.isReconnecting, 0, 1)
+	if !swapped {
+		return
 	}
 
-	err = rpcClient.RegisterForBlockAddedNotifications(func(_ *appmessage.BlockAddedNotificationMessage) {
+	defer atomic.StoreUint32(&mc.isReconnecting, 0)
+
+	mc.clientLock.Lock()
+	defer mc.clientLock.Unlock()
+
+	retryDuration := time.Second
+	const maxRetryDuration = time.Minute
+	log.Infof("Reconnecting RPC connection")
+	for {
+		err := mc.connect()
+		if err == nil {
+			return
+		}
+
+		if retryDuration < time.Minute {
+			retryDuration *= 2
+		} else {
+			retryDuration = maxRetryDuration
+		}
+
+		log.Errorf("Got error '%s' while reconnecting. Trying again in %s", err, retryDuration)
+		time.Sleep(retryDuration)
+	}
+}
+
+func (mc *minerClient) connect() error {
+	rpcAddress, err := mc.cfg.NetParams().NormalizeRPCServerAddress(mc.cfg.RPCServer)
+	if err != nil {
+		return err
+	}
+	mc.rpcClient, err = rpcclient.NewRPCClient(rpcAddress)
+	if err != nil {
+		return err
+	}
+	mc.rpcClient.SetTimeout(minerTimeout)
+	mc.rpcClient.SetLogger(backendLog, logger.LevelTrace)
+
+	err = mc.rpcClient.RegisterForBlockAddedNotifications(func(_ *appmessage.BlockAddedNotificationMessage) {
 		select {
-		case minerClient.blockAddedNotificationChan <- struct{}{}:
+		case mc.blockAddedNotificationChan <- struct{}{}:
 		default:
 		}
 	})
 	if err != nil {
-		return nil, errors.Wrapf(err, "error requesting block-added notifications")
+		return errors.Wrapf(err, "error requesting block-added notifications")
+	}
+
+	log.Infof("Connected to %s", rpcAddress)
+
+	return nil
+}
+
+func newMinerClient(cfg *configFlags) (*minerClient, error) {
+	minerClient := &minerClient{
+		cfg:                        cfg,
+		blockAddedNotificationChan: make(chan struct{}),
+	}
+
+	err := minerClient.connect()
+	if err != nil {
+		return nil, err
 	}
 
 	return minerClient, nil

cmd/kaspaminer/docker/Dockerfile

@@ -1,5 +1,5 @@
 # -- multistage docker build: stage #1: build stage
-FROM golang:1.15-alpine AS build
+FROM golang:1.16-alpine AS build
 
 RUN mkdir -p /go/src/github.com/kaspanet/kaspad
 

cmd/kaspaminer/log.go

@@ -14,6 +14,7 @@ var (
 )
 
 func initLog(logFile, errLogFile string) {
+	log.SetLevel(logger.LevelDebug)
 	err := backendLog.AddLogFile(logFile, logger.LevelTrace)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error adding log file %s as log rotator for level %s: %s", logFile, logger.LevelTrace, err)
@@ -24,4 +25,15 @@ func initLog(logFile, errLogFile string) {
 		fmt.Fprintf(os.Stderr, "Error adding log file %s as log rotator for level %s: %s", errLogFile, logger.LevelWarn, err)
 		os.Exit(1)
 	}
+	err = backendLog.AddLogWriter(os.Stdout, logger.LevelInfo)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error adding stdout to the loggerfor level %s: %s", logger.LevelWarn, err)
+		os.Exit(1)
+	}
+	err = backendLog.Run()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error starting the logger: %s ", err)
+		os.Exit(1)
+	}
+
 }

cmd/kaspaminer/main.go

@@ -26,6 +26,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "Error parsing command-line arguments: %s\n", err)
 		os.Exit(1)
 	}
+	defer backendLog.Close()
 
 	// Show version at startup.
 	log.Infof("Version %s", version.Version())
@@ -39,7 +40,7 @@ func main() {
 	if err != nil {
 		panic(errors.Wrap(err, "error connecting to the RPC server"))
 	}
-	defer client.Disconnect()
+	defer client.safeRPCClient().Disconnect()
 
 	miningAddr, err := util.DecodeAddress(cfg.MiningAddr, cfg.ActiveNetParams.Prefix)
 	if err != nil {

cmd/kaspaminer/mineloop.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	nativeerrors "errors"
-	"github.com/kaspanet/kaspad/cmd/kaspaminer/templatemanager"
-	"github.com/kaspanet/kaspad/domain/consensus/model/pow"
-	"github.com/kaspanet/kaspad/util/difficulty"
 	"math/rand"
 	"sync/atomic"
 	"time"
 
+	"github.com/kaspanet/kaspad/cmd/kaspaminer/templatemanager"
+	"github.com/kaspanet/kaspad/domain/consensus/model/pow"
+	"github.com/kaspanet/kaspad/util/difficulty"
+
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
 
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
@@ -52,6 +53,8 @@ func mineLoop(client *minerClient, numberOfBlocks uint64, targetBlocksPerSecond
 		}
 		blockInWindowIndex := 0
 
+		sleepTime := 0 * time.Second
+
 		for {
 			foundBlockChan <- mineNextBlock(mineWhenNotSynced)
 
@@ -60,15 +63,16 @@ func mineLoop(client *minerClient, numberOfBlocks uint64, targetBlocksPerSecond
 				if blockInWindowIndex == windowSize-1 {
 					deviation := windowExpectedEndTime.Sub(time.Now())
 					if deviation > 0 {
-						log.Infof("Finished to mine %d blocks %s earlier than expected. Sleeping %s to compensate",
-							windowSize, deviation, deviation)
-						time.Sleep(deviation)
+						sleepTime = deviation / windowSize
+						log.Infof("Finished to mine %d blocks %s earlier than expected. Setting the miner "+
+							"to sleep %s between blocks to compensate",
+							windowSize, deviation, sleepTime)
 					}
 					blockInWindowIndex = 0
 					windowExpectedEndTime = time.Now().Add(expectedDurationForWindow)
 				}
+				time.Sleep(sleepTime)
 			}
-
 		}
 	})
 
@@ -112,12 +116,13 @@ func logHashRate() {
 
 func handleFoundBlock(client *minerClient, block *externalapi.DomainBlock) error {
 	blockHash := consensushashing.BlockHash(block)
-	log.Infof("Submitting block %s to %s", blockHash, client.Address())
+	log.Infof("Submitting block %s to %s", blockHash, client.safeRPCClient().Address())
 
-	rejectReason, err := client.SubmitBlock(block)
+	rejectReason, err := client.safeRPCClient().SubmitBlock(block)
 	if err != nil {
 		if nativeerrors.Is(err, router.ErrTimeout) {
-			log.Warnf("Got timeout while submitting block %s to %s: %s", blockHash, client.Address(), err)
+			log.Warnf("Got timeout while submitting block %s to %s: %s", blockHash, client.safeRPCClient().Address(), err)
+			client.reconnect()
 			return nil
 		}
 		if rejectReason == appmessage.RejectReasonIsInIBD {
@@ -126,7 +131,7 @@ func handleFoundBlock(client *minerClient, block *externalapi.DomainBlock) error
 			time.Sleep(waitTime)
 			return nil
 		}
-		return errors.Errorf("Error submitting block %s to %s: %s", blockHash, client.Address(), err)
+		return errors.Wrapf(err, "Error submitting block %s to %s", blockHash, client.safeRPCClient().Address())
 	}
 	return nil
 }
@@ -155,11 +160,15 @@ func mineNextBlock(mineWhenNotSynced bool) *externalapi.DomainBlock {
 
 func getBlockForMining(mineWhenNotSynced bool) *externalapi.DomainBlock {
 	tryCount := 0
+
+	const sleepTime = 500 * time.Millisecond
+	const sleepTimeWhenNotSynced = 5 * time.Second
+
 	for {
 		tryCount++
-		const sleepTime = 500 * time.Millisecond
+
 		shouldLog := (tryCount-1)%10 == 0
-		template := templatemanager.Get()
+		template, isSynced := templatemanager.Get()
 		if template == nil {
 			if shouldLog {
 				log.Info("Waiting for the initial template")
@@ -167,27 +176,28 @@ func getBlockForMining(mineWhenNotSynced bool) *externalapi.DomainBlock {
 			time.Sleep(sleepTime)
 			continue
 		}
-		if !template.IsSynced && !mineWhenNotSynced {
+		if !isSynced && !mineWhenNotSynced {
 			if shouldLog {
 				log.Warnf("Kaspad is not synced. Skipping current block template")
 			}
-			time.Sleep(sleepTime)
+			time.Sleep(sleepTimeWhenNotSynced)
 			continue
 		}
 
-		return appmessage.MsgBlockToDomainBlock(template.MsgBlock)
+		return template
 	}
 }
 
 func templatesLoop(client *minerClient, miningAddr util.Address, errChan chan error) {
 	getBlockTemplate := func() {
-		template, err := client.GetBlockTemplate(miningAddr.String())
+		template, err := client.safeRPCClient().GetBlockTemplate(miningAddr.String())
 		if nativeerrors.Is(err, router.ErrTimeout) {
-			log.Warnf("Got timeout while requesting block template from %s: %s", client.Address(), err)
+			log.Warnf("Got timeout while requesting block template from %s: %s", client.safeRPCClient().Address(), err)
+			client.reconnect()
 			return
 		}
 		if err != nil {
-			errChan <- errors.Errorf("Error getting block template from %s: %s", client.Address(), err)
+			errChan <- errors.Wrapf(err, "Error getting block template from %s", client.safeRPCClient().Address())
 			return
 		}
 		templatemanager.Set(template)

cmd/kaspaminer/templatemanager/templatemanager.go

@@ -2,22 +2,31 @@ package templatemanager
 
 import (
 	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"sync"
 )
 
-var currentTemplate *appmessage.GetBlockTemplateResponseMessage
+var currentTemplate *externalapi.DomainBlock
+var isSynced bool
 var lock = &sync.Mutex{}
 
 // Get returns the template to work on
-func Get() *appmessage.GetBlockTemplateResponseMessage {
+func Get() (*externalapi.DomainBlock, bool) {
 	lock.Lock()
 	defer lock.Unlock()
-	return currentTemplate
+	// Shallow copy the block so when the user replaces the header it won't affect the template here.
+	if currentTemplate == nil {
+		return nil, false
+	}
+	block := *currentTemplate
+	return &block, isSynced
 }
 
 // Set sets the current template to work on
 func Set(template *appmessage.GetBlockTemplateResponseMessage) {
+	block := appmessage.MsgBlockToDomainBlock(template.MsgBlock)
 	lock.Lock()
 	defer lock.Unlock()
-	currentTemplate = template
+	currentTemplate = block
+	isSynced = template.IsSynced
 }

cmd/wallet/README.md

@@ -10,7 +10,7 @@ It is capable of generating wallet key-pairs, printing a wallet's current balanc
 
 ## Requirements
 
-Go 1.15 or later.
+Go 1.16 or later.
 
 ## Installation
 

docker/Dockerfile

@@ -1,5 +1,5 @@
 # -- multistage docker build: stage #1: build stage
-FROM golang:1.15-alpine AS build
+FROM golang:1.16-alpine AS build
 
 RUN mkdir -p /go/src/github.com/kaspanet/kaspad
 
@@ -16,9 +16,12 @@ RUN go get -u golang.org/x/lint/golint \
 COPY go.mod .
 COPY go.sum .
 
+# Cache kaspad dependencies
+RUN go mod download
+
 COPY . .
 
-RUN NO_PARALLEL=1 ./build_and_test.sh
+RUN ./build_and_test.sh
 
 # --- multistage docker build: stage #2: runtime image
 FROM alpine

domain/consensus/consensus.go

@@ -157,6 +157,15 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
 	return blockInfo, nil
 }
 
+func (s *consensus) GetBlockChildren(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
+	blockRelation, err := s.blockRelationStore.BlockRelation(s.databaseContext, blockHash)
+	if err != nil {
+		return nil, err
+	}
+
+	return blockRelation.Children, nil
+}
+
 func (s *consensus) GetBlockAcceptanceData(blockHash *externalapi.DomainHash) (externalapi.AcceptanceData, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
@@ -223,6 +232,30 @@ func (s *consensus) GetPruningPointUTXOs(expectedPruningPointHash *externalapi.D
 	return pruningPointUTXOs, nil
 }
 
+func (s *consensus) GetVirtualUTXOs(expectedVirtualParents []*externalapi.DomainHash,
+	fromOutpoint *externalapi.DomainOutpoint, limit int) ([]*externalapi.OutpointAndUTXOEntryPair, error) {
+
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	virtualParents, err := s.dagTopologyManager.Parents(model.VirtualBlockHash)
+	if err != nil {
+		return nil, err
+	}
+
+	if !externalapi.HashesEqual(expectedVirtualParents, virtualParents) {
+		return nil, errors.Wrapf(ruleerrors.ErrGetVirtualUTXOsWrongVirtualParents, "expected virtual parents %s but got %s",
+			expectedVirtualParents,
+			virtualParents)
+	}
+
+	virtualUTXOs, err := s.consensusStateStore.VirtualUTXOs(s.databaseContext, fromOutpoint, limit)
+	if err != nil {
+		return nil, err
+	}
+	return virtualUTXOs, nil
+}
+
 func (s *consensus) PruningPoint() (*externalapi.DomainHash, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()

domain/consensus/constructors.go

@@ -1,6 +1,21 @@
 package consensus
 
-import "github.com/kaspanet/kaspad/domain/consensus/model"
+import (
+	"github.com/kaspanet/kaspad/domain/consensus/model"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"math/big"
+	"time"
+)
 
 // GHOSTDAGManagerConstructor is the function signature for a constructor of a type implementing model.GHOSTDAGManager
-type GHOSTDAGManagerConstructor func(model.DBReader, model.DAGTopologyManager, model.GHOSTDAGDataStore, model.BlockHeaderStore, model.KType) model.GHOSTDAGManager
+type GHOSTDAGManagerConstructor func(model.DBReader, model.DAGTopologyManager,
+	model.GHOSTDAGDataStore, model.BlockHeaderStore, model.KType) model.GHOSTDAGManager
+
+// DifficultyManagerConstructor is the function signature for a constructor of a type implementing model.DifficultyManager
+type DifficultyManagerConstructor func(model.DBReader, model.GHOSTDAGManager, model.GHOSTDAGDataStore,
+	model.BlockHeaderStore, model.DAGTopologyManager, model.DAGTraversalManager, *big.Int, int, bool, time.Duration,
+	*externalapi.DomainHash) model.DifficultyManager
+
+// PastMedianTimeManagerConstructor is the function signature for a constructor of a type implementing model.PastMedianTimeManager
+type PastMedianTimeManagerConstructor func(int, model.DBReader, model.DAGTraversalManager, model.BlockHeaderStore,
+	model.GHOSTDAGDataStore) model.PastMedianTimeManager

domain/consensus/database/cursor.go

@@ -3,25 +3,40 @@ package database
 import (
 	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/infrastructure/db/database"
+	"github.com/pkg/errors"
 )
 
 type dbCursor struct {
-	cursor database.Cursor
+	cursor   database.Cursor
+	isClosed bool
 }
 
 func (d dbCursor) Next() bool {
+	if d.isClosed {
+		panic("Tried using a closed DBCursor")
+	}
+
 	return d.cursor.Next()
 }
 
 func (d dbCursor) First() bool {
+	if d.isClosed {
+		panic("Tried using a closed DBCursor")
+	}
 	return d.cursor.First()
 }
 
 func (d dbCursor) Seek(key model.DBKey) error {
+	if d.isClosed {
+		return errors.New("Tried using a closed DBCursor")
+	}
 	return d.cursor.Seek(dbKeyToDatabaseKey(key))
 }
 
 func (d dbCursor) Key() (model.DBKey, error) {
+	if d.isClosed {
+		return nil, errors.New("Tried using a closed DBCursor")
+	}
 	key, err := d.cursor.Key()
 	if err != nil {
 		return nil, err
@@ -31,11 +46,23 @@ func (d dbCursor) Key() (model.DBKey, error) {
 }
 
 func (d dbCursor) Value() ([]byte, error) {
+	if d.isClosed {
+		return nil, errors.New("Tried using a closed DBCursor")
+	}
 	return d.cursor.Value()
 }
 
 func (d dbCursor) Close() error {
-	return d.cursor.Close()
+	if d.isClosed {
+		return errors.New("Tried using a closed DBCursor")
+	}
+	d.isClosed = true
+	err := d.cursor.Close()
+	if err != nil {
+		return err
+	}
+	d.cursor = nil
+	return nil
 }
 
 func newDBCursor(cursor database.Cursor) model.DBCursor {

domain/consensus/database/serialization/dbobjects.pb.go

@@ -1520,53 +1520,6 @@ func (x *DbTips) GetTips() []*DbHash {
 	return nil
 }
 
-type DbVirtualDiffParents struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	VirtualDiffParents []*DbHash `protobuf:"bytes,1,rep,name=virtualDiffParents,proto3" json:"virtualDiffParents,omitempty"`
-}
-
-func (x *DbVirtualDiffParents) Reset() {
-	*x = DbVirtualDiffParents{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_dbobjects_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DbVirtualDiffParents) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DbVirtualDiffParents) ProtoMessage() {}
-
-func (x *DbVirtualDiffParents) ProtoReflect() protoreflect.Message {
-	mi := &file_dbobjects_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DbVirtualDiffParents.ProtoReflect.Descriptor instead.
-func (*DbVirtualDiffParents) Descriptor() ([]byte, []int) {
-	return file_dbobjects_proto_rawDescGZIP(), []int{25}
-}
-
-func (x *DbVirtualDiffParents) GetVirtualDiffParents() []*DbHash {
-	if x != nil {
-		return x.VirtualDiffParents
-	}
-	return nil
-}
-
 type DbBlockCount struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1578,7 +1531,7 @@ type DbBlockCount struct {
 func (x *DbBlockCount) Reset() {
 	*x = DbBlockCount{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_dbobjects_proto_msgTypes[26]
+		mi := &file_dbobjects_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1591,7 +1544,7 @@ func (x *DbBlockCount) String() string {
 func (*DbBlockCount) ProtoMessage() {}
 
 func (x *DbBlockCount) ProtoReflect() protoreflect.Message {
-	mi := &file_dbobjects_proto_msgTypes[26]
+	mi := &file_dbobjects_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1604,7 +1557,7 @@ func (x *DbBlockCount) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DbBlockCount.ProtoReflect.Descriptor instead.
 func (*DbBlockCount) Descriptor() ([]byte, []int) {
-	return file_dbobjects_proto_rawDescGZIP(), []int{26}
+	return file_dbobjects_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *DbBlockCount) GetCount() uint64 {
@@ -1625,7 +1578,7 @@ type DbBlockHeaderCount struct {
 func (x *DbBlockHeaderCount) Reset() {
 	*x = DbBlockHeaderCount{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_dbobjects_proto_msgTypes[27]
+		mi := &file_dbobjects_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1638,7 +1591,7 @@ func (x *DbBlockHeaderCount) String() string {
 func (*DbBlockHeaderCount) ProtoMessage() {}
 
 func (x *DbBlockHeaderCount) ProtoReflect() protoreflect.Message {
-	mi := &file_dbobjects_proto_msgTypes[27]
+	mi := &file_dbobjects_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1651,7 +1604,7 @@ func (x *DbBlockHeaderCount) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DbBlockHeaderCount.ProtoReflect.Descriptor instead.
 func (*DbBlockHeaderCount) Descriptor() ([]byte, []int) {
-	return file_dbobjects_proto_rawDescGZIP(), []int{27}
+	return file_dbobjects_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *DbBlockHeaderCount) GetCount() uint64 {
@@ -1891,21 +1844,15 @@ var file_dbobjects_proto_rawDesc = []byte{
 	0x62, 0x54, 0x69, 0x70, 0x73, 0x12, 0x29, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x01, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73,
-	0x22, 0x5d, 0x0a, 0x14, 0x44, 0x62, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x44, 0x69, 0x66,
-	0x66, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x12, 0x76, 0x69, 0x72, 0x74,
-	0x75, 0x61, 0x6c, 0x44, 0x69, 0x66, 0x66, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x48, 0x61, 0x73, 0x68, 0x52, 0x12, 0x76, 0x69, 0x72,
-	0x74, 0x75, 0x61, 0x6c, 0x44, 0x69, 0x66, 0x66, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x22,
-	0x24, 0x0a, 0x0c, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x6b, 0x61, 0x73, 0x70, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x64, 0x2f,
-	0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x22, 0x24, 0x0a, 0x0c, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63,
+	0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x42, 0x2a, 0x5a, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x6e, 0x65, 0x74, 0x2f, 0x6b, 0x61, 0x73, 0x70, 0x61, 0x64,
+	0x2f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1920,7 +1867,7 @@ func file_dbobjects_proto_rawDescGZIP() []byte {
 	return file_dbobjects_proto_rawDescData
 }
 
-var file_dbobjects_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
+var file_dbobjects_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
 var file_dbobjects_proto_goTypes = []interface{}{
 	(*DbBlock)(nil),                     // 0: serialization.DbBlock
 	(*DbBlockHeader)(nil),               // 1: serialization.DbBlockHeader
@@ -1947,9 +1894,8 @@ var file_dbobjects_proto_goTypes = []interface{}{
 	(*DbReachabilityInterval)(nil),      // 22: serialization.DbReachabilityInterval
 	(*DbUtxoDiff)(nil),                  // 23: serialization.DbUtxoDiff
 	(*DbTips)(nil),                      // 24: serialization.DbTips
-	(*DbVirtualDiffParents)(nil),        // 25: serialization.DbVirtualDiffParents
-	(*DbBlockCount)(nil),                // 26: serialization.DbBlockCount
-	(*DbBlockHeaderCount)(nil),          // 27: serialization.DbBlockHeaderCount
+	(*DbBlockCount)(nil),                // 25: serialization.DbBlockCount
+	(*DbBlockHeaderCount)(nil),          // 26: serialization.DbBlockHeaderCount
 }
 var file_dbobjects_proto_depIdxs = []int32{
 	1,  // 0: serialization.DbBlock.header:type_name -> serialization.DbBlockHeader
@@ -1988,12 +1934,11 @@ var file_dbobjects_proto_depIdxs = []int32{
 	18, // 33: serialization.DbUtxoDiff.toAdd:type_name -> serialization.DbUtxoCollectionItem
 	18, // 34: serialization.DbUtxoDiff.toRemove:type_name -> serialization.DbUtxoCollectionItem
 	2,  // 35: serialization.DbTips.tips:type_name -> serialization.DbHash
-	2,  // 36: serialization.DbVirtualDiffParents.virtualDiffParents:type_name -> serialization.DbHash
-	37, // [37:37] is the sub-list for method output_type
-	37, // [37:37] is the sub-list for method input_type
-	37, // [37:37] is the sub-list for extension type_name
-	37, // [37:37] is the sub-list for extension extendee
-	0,  // [0:37] is the sub-list for field type_name
+	36, // [36:36] is the sub-list for method output_type
+	36, // [36:36] is the sub-list for method input_type
+	36, // [36:36] is the sub-list for extension type_name
+	36, // [36:36] is the sub-list for extension extendee
+	0,  // [0:36] is the sub-list for field type_name
 }
 
 func init() { file_dbobjects_proto_init() }
@@ -2303,18 +2248,6 @@ func file_dbobjects_proto_init() {
 			}
 		}
 		file_dbobjects_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DbVirtualDiffParents); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_dbobjects_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DbBlockCount); i {
 			case 0:
 				return &v.state
@@ -2326,7 +2259,7 @@ func file_dbobjects_proto_init() {
 				return nil
 			}
 		}
-		file_dbobjects_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_dbobjects_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DbBlockHeaderCount); i {
 			case 0:
 				return &v.state
@@ -2345,7 +2278,7 @@ func file_dbobjects_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_dbobjects_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   28,
+			NumMessages:   27,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

domain/consensus/database/serialization/dbobjects.proto

@@ -143,10 +143,6 @@ message DbTips {
   repeated DbHash tips = 1;
 }
 
-message DbVirtualDiffParents {
-  repeated DbHash virtualDiffParents = 1;
-}
-
 message DbBlockCount {
   uint64 count = 1;
 }

domain/consensus/database/serialization/utxo_collection.go

@@ -1,15 +1,15 @@
 package serialization
 
 import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 )
 
-func utxoCollectionToDBUTXOCollection(utxoCollection model.UTXOCollection) ([]*DbUtxoCollectionItem, error) {
+func utxoCollectionToDBUTXOCollection(utxoCollection externalapi.UTXOCollection) ([]*DbUtxoCollectionItem, error) {
 	items := make([]*DbUtxoCollectionItem, utxoCollection.Len())
 	i := 0
 	utxoIterator := utxoCollection.Iterator()
+	defer utxoIterator.Close()
 	for ok := utxoIterator.First(); ok; ok = utxoIterator.Next() {
 		outpoint, entry, err := utxoIterator.Get()
 		if err != nil {
@@ -26,7 +26,7 @@ func utxoCollectionToDBUTXOCollection(utxoCollection model.UTXOCollection) ([]*D
 	return items, nil
 }
 
-func dbUTXOCollectionToUTXOCollection(items []*DbUtxoCollectionItem) (model.UTXOCollection, error) {
+func dbUTXOCollectionToUTXOCollection(items []*DbUtxoCollectionItem) (externalapi.UTXOCollection, error) {
 	utxoMap := make(map[externalapi.DomainOutpoint]externalapi.UTXOEntry, len(items))
 	for _, item := range items {
 		outpoint, err := DbOutpointToDomainOutpoint(item.Outpoint)

domain/consensus/database/serialization/utxo_diff.go

@@ -1,12 +1,12 @@
 package serialization
 
 import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 )
 
 // UTXODiffToDBUTXODiff converts UTXODiff to DbUtxoDiff
-func UTXODiffToDBUTXODiff(diff model.UTXODiff) (*DbUtxoDiff, error) {
+func UTXODiffToDBUTXODiff(diff externalapi.UTXODiff) (*DbUtxoDiff, error) {
 	toAdd, err := utxoCollectionToDBUTXOCollection(diff.ToAdd())
 	if err != nil {
 		return nil, err
@@ -24,7 +24,7 @@ func UTXODiffToDBUTXODiff(diff model.UTXODiff) (*DbUtxoDiff, error) {
 }
 
 // DBUTXODiffToUTXODiff converts DbUtxoDiff to UTXODiff
-func DBUTXODiffToUTXODiff(diff *DbUtxoDiff) (model.UTXODiff, error) {
+func DBUTXODiffToUTXODiff(diff *DbUtxoDiff) (externalapi.UTXODiff, error) {
 	toAdd, err := dbUTXOCollectionToUTXOCollection(diff.ToAdd)
 	if err != nil {
 		return nil, err

domain/consensus/database/serialization/virtual_diff_parents.go

@@ -1,17 +0,0 @@
-package serialization
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-// VirtualDiffParentsToDBHeaderVirtualDiffParents converts a slice of hashes to DbVirtualDiffParents
-func VirtualDiffParentsToDBHeaderVirtualDiffParents(tips []*externalapi.DomainHash) *DbVirtualDiffParents {
-	return &DbVirtualDiffParents{
-		VirtualDiffParents: DomainHashesToDbHashes(tips),
-	}
-}
-
-// DBVirtualDiffParentsToVirtualDiffParents converts DbHeaderTips to a slice of hashes
-func DBVirtualDiffParentsToVirtualDiffParents(dbVirtualDiffParents *DbVirtualDiffParents) ([]*externalapi.DomainHash, error) {
-	return DbHashesToDomainHashes(dbVirtualDiffParents.VirtualDiffParents)
-}

domain/consensus/datastructures/blockstore/blockstore.go

@@ -7,6 +7,7 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/lrucache"
+	"github.com/pkg/errors"
 )
 
 var bucket = database.MakeBucket([]byte("blocks"))
@@ -214,18 +215,28 @@ func (bs *blockStore) serializeBlockCount(count uint64) ([]byte, error) {
 }
 
 type allBlockHashesIterator struct {
-	cursor model.DBCursor
+	cursor   model.DBCursor
+	isClosed bool
 }
 
 func (a allBlockHashesIterator) First() bool {
+	if a.isClosed {
+		panic("Tried using a closed AllBlockHashesIterator")
+	}
 	return a.cursor.First()
 }
 
 func (a allBlockHashesIterator) Next() bool {
+	if a.isClosed {
+		panic("Tried using a closed AllBlockHashesIterator")
+	}
 	return a.cursor.Next()
 }
 
 func (a allBlockHashesIterator) Get() (*externalapi.DomainHash, error) {
+	if a.isClosed {
+		return nil, errors.New("Tried using a closed AllBlockHashesIterator")
+	}
 	key, err := a.cursor.Key()
 	if err != nil {
 		return nil, err
@@ -235,6 +246,19 @@ func (a allBlockHashesIterator) Get() (*externalapi.DomainHash, error) {
 	return externalapi.NewDomainHashFromByteSlice(blockHashBytes)
 }
 
+func (a allBlockHashesIterator) Close() error {
+	if a.isClosed {
+		return errors.New("Tried using a closed AllBlockHashesIterator")
+	}
+	a.isClosed = true
+	err := a.cursor.Close()
+	if err != nil {
+		return err
+	}
+	a.cursor = nil
+	return nil
+}
+
 func (bs *blockStore) AllBlockHashesIterator(dbContext model.DBReader) (model.BlockIterator, error) {
 	cursor, err := dbContext.Cursor(bucket)
 	if err != nil {

domain/consensus/datastructures/consensusstatestore/consensusstatestore.go

@@ -8,14 +8,12 @@ import (
 
 // consensusStateStore represents a store for the current consensus state
 type consensusStateStore struct {
-	tipsStaging               []*externalapi.DomainHash
-	virtualDiffParentsStaging []*externalapi.DomainHash
-	virtualUTXODiffStaging    model.UTXODiff
+	tipsStaging            []*externalapi.DomainHash
+	virtualUTXODiffStaging externalapi.UTXODiff
 
 	virtualUTXOSetCache *utxolrucache.LRUCache
 
-	tipsCache               []*externalapi.DomainHash
-	virtualDiffParentsCache []*externalapi.DomainHash
+	tipsCache []*externalapi.DomainHash
 }
 
 // New instantiates a new ConsensusStateStore
@@ -28,7 +26,6 @@ func New(utxoSetCacheSize int, preallocate bool) model.ConsensusStateStore {
 func (css *consensusStateStore) Discard() {
 	css.tipsStaging = nil
 	css.virtualUTXODiffStaging = nil
-	css.virtualDiffParentsStaging = nil
 }
 
 func (css *consensusStateStore) Commit(dbTx model.DBTransaction) error {
@@ -36,10 +33,6 @@ func (css *consensusStateStore) Commit(dbTx model.DBTransaction) error {
 	if err != nil {
 		return err
 	}
-	err = css.commitVirtualDiffParents(dbTx)
-	if err != nil {
-		return err
-	}
 
 	err = css.commitVirtualUTXODiff(dbTx)
 	if err != nil {
@@ -53,6 +46,5 @@ func (css *consensusStateStore) Commit(dbTx model.DBTransaction) error {
 
 func (css *consensusStateStore) IsStaged() bool {
 	return css.tipsStaging != nil ||
-		css.virtualDiffParentsStaging != nil ||
 		css.virtualUTXODiffStaging != nil
 }

domain/consensus/datastructures/consensusstatestore/utxo.go

@@ -19,7 +19,7 @@ func utxoKey(outpoint *externalapi.DomainOutpoint) (model.DBKey, error) {
 	return utxoSetBucket.Key(serializedOutpoint), nil
 }
 
-func (css *consensusStateStore) StageVirtualUTXODiff(virtualUTXODiff model.UTXODiff) {
+func (css *consensusStateStore) StageVirtualUTXODiff(virtualUTXODiff externalapi.UTXODiff) {
 	css.virtualUTXODiffStaging = virtualUTXODiff
 }
 
@@ -37,6 +37,7 @@ func (css *consensusStateStore) commitVirtualUTXODiff(dbTx model.DBTransaction)
 	}
 
 	toRemoveIterator := css.virtualUTXODiffStaging.ToRemove().Iterator()
+	defer toRemoveIterator.Close()
 	for ok := toRemoveIterator.First(); ok; ok = toRemoveIterator.Next() {
 		toRemoveOutpoint, _, err := toRemoveIterator.Get()
 		if err != nil {
@@ -56,6 +57,7 @@ func (css *consensusStateStore) commitVirtualUTXODiff(dbTx model.DBTransaction)
 	}
 
 	toAddIterator := css.virtualUTXODiffStaging.ToAdd().Iterator()
+	defer toAddIterator.Close()
 	for ok := toAddIterator.First(); ok; ok = toAddIterator.Next() {
 		toAddOutpoint, toAddEntry, err := toAddIterator.Get()
 		if err != nil {
@@ -149,7 +151,45 @@ func (css *consensusStateStore) hasUTXOByOutpointFromStagedVirtualUTXODiff(dbCon
 	return dbContext.Has(key)
 }
 
-func (css *consensusStateStore) VirtualUTXOSetIterator(dbContext model.DBReader) (model.ReadOnlyUTXOSetIterator, error) {
+func (css *consensusStateStore) VirtualUTXOs(dbContext model.DBReader,
+	fromOutpoint *externalapi.DomainOutpoint, limit int) ([]*externalapi.OutpointAndUTXOEntryPair, error) {
+
+	cursor, err := dbContext.Cursor(utxoSetBucket)
+	if err != nil {
+		return nil, err
+	}
+	defer cursor.Close()
+
+	if fromOutpoint != nil {
+		serializedFromOutpoint, err := serializeOutpoint(fromOutpoint)
+		if err != nil {
+			return nil, err
+		}
+		seekKey := utxoSetBucket.Key(serializedFromOutpoint)
+		err = cursor.Seek(seekKey)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	iterator := newCursorUTXOSetIterator(cursor)
+	defer iterator.Close()
+
+	outpointAndUTXOEntryPairs := make([]*externalapi.OutpointAndUTXOEntryPair, 0, limit)
+	for len(outpointAndUTXOEntryPairs) < limit && iterator.Next() {
+		outpoint, utxoEntry, err := iterator.Get()
+		if err != nil {
+			return nil, err
+		}
+		outpointAndUTXOEntryPairs = append(outpointAndUTXOEntryPairs, &externalapi.OutpointAndUTXOEntryPair{
+			Outpoint:  outpoint,
+			UTXOEntry: utxoEntry,
+		})
+	}
+	return outpointAndUTXOEntryPairs, nil
+}
+
+func (css *consensusStateStore) VirtualUTXOSetIterator(dbContext model.DBReader) (externalapi.ReadOnlyUTXOSetIterator, error) {
 	cursor, err := dbContext.Cursor(utxoSetBucket)
 	if err != nil {
 		return nil, err
@@ -164,22 +204,32 @@ func (css *consensusStateStore) VirtualUTXOSetIterator(dbContext model.DBReader)
 }
 
 type utxoSetIterator struct {
-	cursor model.DBCursor
+	cursor   model.DBCursor
+	isClosed bool
 }
 
-func newCursorUTXOSetIterator(cursor model.DBCursor) model.ReadOnlyUTXOSetIterator {
+func newCursorUTXOSetIterator(cursor model.DBCursor) externalapi.ReadOnlyUTXOSetIterator {
 	return &utxoSetIterator{cursor: cursor}
 }
 
 func (u utxoSetIterator) First() bool {
+	if u.isClosed {
+		panic("Tried using a closed utxoSetIterator")
+	}
 	return u.cursor.First()
 }
 
 func (u utxoSetIterator) Next() bool {
+	if u.isClosed {
+		panic("Tried using a closed utxoSetIterator")
+	}
 	return u.cursor.Next()
 }
 
 func (u utxoSetIterator) Get() (outpoint *externalapi.DomainOutpoint, utxoEntry externalapi.UTXOEntry, err error) {
+	if u.isClosed {
+		return nil, nil, errors.New("Tried using a closed utxoSetIterator")
+	}
 	key, err := u.cursor.Key()
 	if err != nil {
 		panic(err)
@@ -202,3 +252,16 @@ func (u utxoSetIterator) Get() (outpoint *externalapi.DomainOutpoint, utxoEntry
 
 	return outpoint, utxoEntry, nil
 }
+
+func (u utxoSetIterator) Close() error {
+	if u.isClosed {
+		return errors.New("Tried using a closed utxoSetIterator")
+	}
+	u.isClosed = true
+	err := u.cursor.Close()
+	if err != nil {
+		return err
+	}
+	u.cursor = nil
+	return nil
+}

domain/consensus/datastructures/consensusstatestore/virtual_diff_parents.go

@@ -1,74 +0,0 @@
-package consensusstatestore
-
-import (
-	"github.com/golang/protobuf/proto"
-	"github.com/kaspanet/kaspad/domain/consensus/database"
-	"github.com/kaspanet/kaspad/domain/consensus/database/serialization"
-	"github.com/kaspanet/kaspad/domain/consensus/model"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-var virtualDiffParentsKey = database.MakeBucket(nil).Key([]byte("virtual-diff-parents"))
-
-func (css *consensusStateStore) VirtualDiffParents(dbContext model.DBReader) ([]*externalapi.DomainHash, error) {
-	if css.virtualDiffParentsStaging != nil {
-		return externalapi.CloneHashes(css.virtualDiffParentsStaging), nil
-	}
-
-	if css.virtualDiffParentsCache != nil {
-		return externalapi.CloneHashes(css.virtualDiffParentsCache), nil
-	}
-
-	virtualDiffParentsBytes, err := dbContext.Get(virtualDiffParentsKey)
-	if err != nil {
-		return nil, err
-	}
-
-	virtualDiffParents, err := css.deserializeVirtualDiffParents(virtualDiffParentsBytes)
-	if err != nil {
-		return nil, err
-	}
-	css.virtualDiffParentsCache = virtualDiffParents
-	return externalapi.CloneHashes(virtualDiffParents), nil
-}
-
-func (css *consensusStateStore) StageVirtualDiffParents(tipHashes []*externalapi.DomainHash) {
-	css.virtualDiffParentsStaging = externalapi.CloneHashes(tipHashes)
-}
-
-func (css *consensusStateStore) commitVirtualDiffParents(dbTx model.DBTransaction) error {
-	if css.virtualDiffParentsStaging == nil {
-		return nil
-	}
-
-	virtualDiffParentsBytes, err := css.serializeVirtualDiffParents(css.virtualDiffParentsStaging)
-	if err != nil {
-		return err
-	}
-	err = dbTx.Put(virtualDiffParentsKey, virtualDiffParentsBytes)
-	if err != nil {
-		return err
-	}
-	css.virtualDiffParentsCache = css.virtualDiffParentsStaging
-
-	// Note: we don't discard the staging here since that's
-	// being done at the end of Commit()
-	return nil
-}
-
-func (css *consensusStateStore) serializeVirtualDiffParents(virtualDiffParentsBytes []*externalapi.DomainHash) ([]byte, error) {
-	virtualDiffParents := serialization.VirtualDiffParentsToDBHeaderVirtualDiffParents(virtualDiffParentsBytes)
-	return proto.Marshal(virtualDiffParents)
-}
-
-func (css *consensusStateStore) deserializeVirtualDiffParents(virtualDiffParentsBytes []byte) ([]*externalapi.DomainHash,
-	error) {
-
-	dbVirtualDiffParents := &serialization.DbVirtualDiffParents{}
-	err := proto.Unmarshal(virtualDiffParentsBytes, dbVirtualDiffParents)
-	if err != nil {
-		return nil, err
-	}
-
-	return serialization.DBVirtualDiffParentsToVirtualDiffParents(dbVirtualDiffParents)
-}

domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go

@@ -3,6 +3,7 @@ package consensusstatestore
 import (
 	"github.com/kaspanet/kaspad/domain/consensus/database"
 	"github.com/kaspanet/kaspad/domain/consensus/model"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/pkg/errors"
 )
 
@@ -21,7 +22,7 @@ func (css *consensusStateStore) FinishImportingPruningPointUTXOSet(dbContext mod
 }
 
 func (css *consensusStateStore) ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbContext model.DBWriter,
-	pruningPointUTXOSetIterator model.ReadOnlyUTXOSetIterator) error {
+	pruningPointUTXOSetIterator externalapi.ReadOnlyUTXOSetIterator) error {
 
 	if css.virtualUTXODiffStaging != nil {
 		return errors.New("cannot import virtual UTXO set while virtual UTXO diff is staged")
@@ -44,6 +45,7 @@ func (css *consensusStateStore) ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbCo
 	if err != nil {
 		return err
 	}
+	defer deleteCursor.Close()
 	for ok := deleteCursor.First(); ok; ok = deleteCursor.Next() {
 		key, err := deleteCursor.Key()
 		if err != nil {

domain/consensus/datastructures/pruningstore/imported_pruning_point.go

@@ -6,6 +6,7 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/database/serialization"
 	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"github.com/pkg/errors"
 )
 
 var importedPruningPointUTXOsBucket = database.MakeBucket([]byte("imported-pruning-point-utxos"))
@@ -16,6 +17,7 @@ func (ps *pruningStore) ClearImportedPruningPointUTXOs(dbContext model.DBWriter)
 	if err != nil {
 		return err
 	}
+	defer cursor.Close()
 
 	for ok := cursor.First(); ok; ok = cursor.Next() {
 		key, err := cursor.Key()
@@ -51,7 +53,7 @@ func (ps *pruningStore) AppendImportedPruningPointUTXOs(dbTx model.DBTransaction
 	return nil
 }
 
-func (ps *pruningStore) ImportedPruningPointUTXOIterator(dbContext model.DBReader) (model.ReadOnlyUTXOSetIterator, error) {
+func (ps *pruningStore) ImportedPruningPointUTXOIterator(dbContext model.DBReader) (externalapi.ReadOnlyUTXOSetIterator, error) {
 	cursor, err := dbContext.Cursor(importedPruningPointUTXOsBucket)
 	if err != nil {
 		return nil, err
@@ -60,22 +62,32 @@ func (ps *pruningStore) ImportedPruningPointUTXOIterator(dbContext model.DBReade
 }
 
 type utxoSetIterator struct {
-	cursor model.DBCursor
+	cursor   model.DBCursor
+	isClosed bool
 }
 
-func (ps *pruningStore) newCursorUTXOSetIterator(cursor model.DBCursor) model.ReadOnlyUTXOSetIterator {
+func (ps *pruningStore) newCursorUTXOSetIterator(cursor model.DBCursor) externalapi.ReadOnlyUTXOSetIterator {
 	return &utxoSetIterator{cursor: cursor}
 }
 
 func (u *utxoSetIterator) First() bool {
+	if u.isClosed {
+		panic("Tried using a closed utxoSetIterator")
+	}
 	return u.cursor.First()
 }
 
 func (u *utxoSetIterator) Next() bool {
+	if u.isClosed {
+		panic("Tried using a closed utxoSetIterator")
+	}
 	return u.cursor.Next()
 }
 
 func (u *utxoSetIterator) Get() (outpoint *externalapi.DomainOutpoint, utxoEntry externalapi.UTXOEntry, err error) {
+	if u.isClosed {
+		return nil, nil, errors.New("Tried using a closed utxoSetIterator")
+	}
 	key, err := u.cursor.Key()
 	if err != nil {
 		panic(err)
@@ -99,6 +111,19 @@ func (u *utxoSetIterator) Get() (outpoint *externalapi.DomainOutpoint, utxoEntry
 	return outpoint, utxoEntry, nil
 }
 
+func (u *utxoSetIterator) Close() error {
+	if u.isClosed {
+		return errors.New("Tried using a closed utxoSetIterator")
+	}
+	u.isClosed = true
+	err := u.cursor.Close()
+	if err != nil {
+		return err
+	}
+	u.cursor = nil
+	return nil
+}
+
 func (ps *pruningStore) importedPruningPointUTXOKey(outpoint *externalapi.DomainOutpoint) (model.DBKey, error) {
 	serializedOutpoint, err := serializeOutpoint(outpoint)
 	if err != nil {
@@ -175,6 +200,7 @@ func (ps *pruningStore) CommitImportedPruningPointUTXOSet(dbContext model.DBWrit
 	if err != nil {
 		return err
 	}
+	defer deleteCursor.Close()
 	for ok := deleteCursor.First(); ok; ok = deleteCursor.Next() {
 		key, err := deleteCursor.Key()
 		if err != nil {
@@ -191,6 +217,7 @@ func (ps *pruningStore) CommitImportedPruningPointUTXOSet(dbContext model.DBWrit
 	if err != nil {
 		return err
 	}
+	defer insertCursor.Close()
 	for ok := insertCursor.First(); ok; ok = insertCursor.Next() {
 		importedPruningPointUTXOSetKey, err := insertCursor.Key()
 		if err != nil {

domain/consensus/datastructures/pruningstore/pruningstore.go

@@ -117,13 +117,14 @@ func (ps *pruningStore) Commit(dbTx model.DBTransaction) error {
 }
 
 func (ps *pruningStore) UpdatePruningPointUTXOSet(dbContext model.DBWriter,
-	utxoSetIterator model.ReadOnlyUTXOSetIterator) error {
+	utxoSetIterator externalapi.ReadOnlyUTXOSetIterator) error {
 
 	// Delete all the old UTXOs from the database
 	deleteCursor, err := dbContext.Cursor(pruningPointUTXOSetBucket)
 	if err != nil {
 		return err
 	}
+	defer deleteCursor.Close()
 	for ok := deleteCursor.First(); ok; ok = deleteCursor.Next() {
 		key, err := deleteCursor.Key()
 		if err != nil {
@@ -215,6 +216,7 @@ func (ps *pruningStore) PruningPointUTXOs(dbContext model.DBReader,
 	if err != nil {
 		return nil, err
 	}
+	defer cursor.Close()
 
 	if fromOutpoint != nil {
 		serializedFromOutpoint, err := serializeOutpoint(fromOutpoint)
@@ -229,6 +231,7 @@ func (ps *pruningStore) PruningPointUTXOs(dbContext model.DBReader,
 	}
 
 	pruningPointUTXOIterator := ps.newCursorUTXOSetIterator(cursor)
+	defer pruningPointUTXOIterator.Close()
 
 	outpointAndUTXOEntryPairs := make([]*externalapi.OutpointAndUTXOEntryPair, 0, limit)
 	for len(outpointAndUTXOEntryPairs) < limit && pruningPointUTXOIterator.Next() {

domain/consensus/datastructures/utxodiffstore/utxodiffstore.go

@@ -15,7 +15,7 @@ var utxoDiffChildBucket = database.MakeBucket([]byte("utxo-diff-children"))
 
 // utxoDiffStore represents a store of UTXODiffs
 type utxoDiffStore struct {
-	utxoDiffStaging      map[externalapi.DomainHash]model.UTXODiff
+	utxoDiffStaging      map[externalapi.DomainHash]externalapi.UTXODiff
 	utxoDiffChildStaging map[externalapi.DomainHash]*externalapi.DomainHash
 	toDelete             map[externalapi.DomainHash]struct{}
 	utxoDiffCache        *lrucache.LRUCache
@@ -25,7 +25,7 @@ type utxoDiffStore struct {
 // New instantiates a new UTXODiffStore
 func New(cacheSize int, preallocate bool) model.UTXODiffStore {
 	return &utxoDiffStore{
-		utxoDiffStaging:      make(map[externalapi.DomainHash]model.UTXODiff),
+		utxoDiffStaging:      make(map[externalapi.DomainHash]externalapi.UTXODiff),
 		utxoDiffChildStaging: make(map[externalapi.DomainHash]*externalapi.DomainHash),
 		toDelete:             make(map[externalapi.DomainHash]struct{}),
 		utxoDiffCache:        lrucache.New(cacheSize, preallocate),
@@ -34,7 +34,7 @@ func New(cacheSize int, preallocate bool) model.UTXODiffStore {
 }
 
 // Stage stages the given utxoDiff for the given blockHash
-func (uds *utxoDiffStore) Stage(blockHash *externalapi.DomainHash, utxoDiff model.UTXODiff, utxoDiffChild *externalapi.DomainHash) {
+func (uds *utxoDiffStore) Stage(blockHash *externalapi.DomainHash, utxoDiff externalapi.UTXODiff, utxoDiffChild *externalapi.DomainHash) {
 	uds.utxoDiffStaging[*blockHash] = utxoDiff
 
 	if utxoDiffChild != nil {
@@ -55,7 +55,7 @@ func (uds *utxoDiffStore) IsBlockHashStaged(blockHash *externalapi.DomainHash) b
 }
 
 func (uds *utxoDiffStore) Discard() {
-	uds.utxoDiffStaging = make(map[externalapi.DomainHash]model.UTXODiff)
+	uds.utxoDiffStaging = make(map[externalapi.DomainHash]externalapi.UTXODiff)
 	uds.utxoDiffChildStaging = make(map[externalapi.DomainHash]*externalapi.DomainHash)
 	uds.toDelete = make(map[externalapi.DomainHash]struct{})
 }
@@ -107,13 +107,13 @@ func (uds *utxoDiffStore) Commit(dbTx model.DBTransaction) error {
 }
 
 // UTXODiff gets the utxoDiff associated with the given blockHash
-func (uds *utxoDiffStore) UTXODiff(dbContext model.DBReader, blockHash *externalapi.DomainHash) (model.UTXODiff, error) {
+func (uds *utxoDiffStore) UTXODiff(dbContext model.DBReader, blockHash *externalapi.DomainHash) (externalapi.UTXODiff, error) {
 	if utxoDiff, ok := uds.utxoDiffStaging[*blockHash]; ok {
 		return utxoDiff, nil
 	}
 
 	if utxoDiff, ok := uds.utxoDiffCache.Get(blockHash); ok {
-		return utxoDiff.(model.UTXODiff), nil
+		return utxoDiff.(externalapi.UTXODiff), nil
 	}
 
 	utxoDiffBytes, err := dbContext.Get(uds.utxoDiffHashAsKey(blockHash))
@@ -187,7 +187,7 @@ func (uds *utxoDiffStore) utxoDiffChildHashAsKey(hash *externalapi.DomainHash) m
 	return utxoDiffChildBucket.Key(hash.ByteSlice())
 }
 
-func (uds *utxoDiffStore) serializeUTXODiff(utxoDiff model.UTXODiff) ([]byte, error) {
+func (uds *utxoDiffStore) serializeUTXODiff(utxoDiff externalapi.UTXODiff) ([]byte, error) {
 	dbUtxoDiff, err := serialization.UTXODiffToDBUTXODiff(utxoDiff)
 	if err != nil {
 		return nil, err
@@ -201,7 +201,7 @@ func (uds *utxoDiffStore) serializeUTXODiff(utxoDiff model.UTXODiff) ([]byte, er
 	return bytes, nil
 }
 
-func (uds *utxoDiffStore) deserializeUTXODiff(utxoDiffBytes []byte) (model.UTXODiff, error) {
+func (uds *utxoDiffStore) deserializeUTXODiff(utxoDiffBytes []byte) (externalapi.UTXODiff, error) {
 	dbUTXODiff := &serialization.DbUtxoDiff{}
 	err := proto.Unmarshal(utxoDiffBytes, dbUTXODiff)
 	if err != nil {

domain/consensus/factory.go

@@ -63,19 +63,25 @@ type Factory interface {
 	SetTestGHOSTDAGManager(ghostdagConstructor GHOSTDAGManagerConstructor)
 	SetTestLevelDBCacheSize(cacheSizeMiB int)
 	SetTestPreAllocateCache(preallocateCaches bool)
+	SetTestPastMedianTimeManager(medianTimeConstructor PastMedianTimeManagerConstructor)
+	SetTestDifficultyManager(difficultyConstructor DifficultyManagerConstructor)
 }
 
 type factory struct {
-	dataDir             string
-	ghostdagConstructor GHOSTDAGManagerConstructor
-	cacheSizeMiB        *int
-	preallocateCaches   *bool
+	dataDir                  string
+	ghostdagConstructor      GHOSTDAGManagerConstructor
+	pastMedianTimeConsructor PastMedianTimeManagerConstructor
+	difficultyConstructor    DifficultyManagerConstructor
+	cacheSizeMiB             *int
+	preallocateCaches        *bool
 }
 
 // NewFactory creates a new Consensus factory
 func NewFactory() Factory {
 	return &factory{
-		ghostdagConstructor: ghostdagmanager.New,
+		ghostdagConstructor:      ghostdagmanager.New,
+		pastMedianTimeConsructor: pastmediantimemanager.New,
+		difficultyConstructor:    difficultymanager.New,
 	}
 }
 
@@ -144,7 +150,7 @@ func (f *factory) NewConsensus(dagParams *dagconfig.Params, db infrastructuredat
 		reachabilityDataStore,
 		ghostdagManager,
 		consensusStateStore)
-	pastMedianTimeManager := pastmediantimemanager.New(
+	pastMedianTimeManager := f.pastMedianTimeConsructor(
 		dagParams.TimestampDeviationTolerance,
 		dbManager,
 		dagTraversalManager,
@@ -159,7 +165,7 @@ func (f *factory) NewConsensus(dagParams *dagconfig.Params, db infrastructuredat
 		dbManager,
 		pastMedianTimeManager,
 		ghostdagDataStore)
-	difficultyManager := difficultymanager.New(
+	difficultyManager := f.difficultyConstructor(
 		dbManager,
 		ghostdagManager,
 		ghostdagDataStore,
@@ -466,6 +472,15 @@ func (f *factory) SetTestGHOSTDAGManager(ghostdagConstructor GHOSTDAGManagerCons
 	f.ghostdagConstructor = ghostdagConstructor
 }
 
+func (f *factory) SetTestPastMedianTimeManager(medianTimeConstructor PastMedianTimeManagerConstructor) {
+	f.pastMedianTimeConsructor = medianTimeConstructor
+}
+
+// SetTestDifficultyManager is a setter for the difficultyManager field on the factory.
+func (f *factory) SetTestDifficultyManager(difficultyConstructor DifficultyManagerConstructor) {
+	f.difficultyConstructor = difficultyConstructor
+}
+
 func (f *factory) SetTestLevelDBCacheSize(cacheSizeMiB int) {
 	f.cacheSizeMiB = &cacheSizeMiB
 }

domain/consensus/log.go

@@ -5,5 +5,5 @@ import (
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.BDAG)
+var log = logger.RegisterSubSystem("BDAG")
 var spawn = panics.GoroutineWrapperFunc(log)

domain/consensus/model/blockiterator.go

@@ -7,4 +7,5 @@ type BlockIterator interface {
 	First() bool
 	Next() bool
 	Get() (*externalapi.DomainHash, error)
+	Close() error
 }

domain/consensus/model/externalapi/consensus.go

@@ -9,11 +9,13 @@ type Consensus interface {
 	GetBlock(blockHash *DomainHash) (*DomainBlock, error)
 	GetBlockHeader(blockHash *DomainHash) (BlockHeader, error)
 	GetBlockInfo(blockHash *DomainHash) (*BlockInfo, error)
+	GetBlockChildren(blockHash *DomainHash) ([]*DomainHash, error)
 	GetBlockAcceptanceData(blockHash *DomainHash) (AcceptanceData, error)
 
 	GetHashesBetween(lowHash, highHash *DomainHash, maxBlueScoreDifference uint64) ([]*DomainHash, error)
 	GetMissingBlockBodyHashes(highHash *DomainHash) ([]*DomainHash, error)
 	GetPruningPointUTXOs(expectedPruningPointHash *DomainHash, fromOutpoint *DomainOutpoint, limit int) ([]*OutpointAndUTXOEntryPair, error)
+	GetVirtualUTXOs(expectedVirtualParents []*DomainHash, fromOutpoint *DomainOutpoint, limit int) ([]*OutpointAndUTXOEntryPair, error)
 	PruningPoint() (*DomainHash, error)
 	ClearImportedPruningPointData() error
 	AppendImportedPruningPointUTXOs(outpointAndUTXOEntryPairs []*OutpointAndUTXOEntryPair) error

domain/consensus/model/externalapi/insertblockresult.go

@@ -3,6 +3,8 @@ package externalapi
 // BlockInsertionResult is auxiliary data returned from ValidateAndInsertBlock
 type BlockInsertionResult struct {
 	VirtualSelectedParentChainChanges *SelectedChainPath
+	VirtualUTXODiff                   UTXODiff
+	VirtualParents                    []*DomainHash
 }
 
 // SelectedChainPath is a path the of the selected chains between two blocks.

domain/consensus/model/externalapi/readonlyutxoset.go

@@ -0,0 +1,10 @@
+package externalapi
+
+// ReadOnlyUTXOSetIterator is an iterator over all entries in a
+// ReadOnlyUTXOSet
+type ReadOnlyUTXOSetIterator interface {
+	First() bool
+	Next() bool
+	Get() (outpoint *DomainOutpoint, utxoEntry UTXOEntry, err error)
+	Close() error
+}

domain/consensus/model/externalapi/subnetworkid.go

@@ -10,9 +10,6 @@ type DomainSubnetworkID [DomainSubnetworkIDSize]byte
 
 // String stringifies a subnetwork ID.
 func (id DomainSubnetworkID) String() string {
-	for i := 0; i < DomainSubnetworkIDSize/2; i++ {
-		id[i], id[DomainSubnetworkIDSize-1-i] = id[DomainSubnetworkIDSize-1-i], id[i]
-	}
 	return hex.EncodeToString(id[:])
 }
 

domain/consensus/model/externalapi/utxodiff.go

@@ -1,12 +1,10 @@
-package model
-
-import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+package externalapi
 
 // UTXOCollection represents a collection of UTXO entries, indexed by their outpoint
 type UTXOCollection interface {
 	Iterator() ReadOnlyUTXOSetIterator
-	Get(outpoint *externalapi.DomainOutpoint) (externalapi.UTXOEntry, bool)
-	Contains(outpoint *externalapi.DomainOutpoint) bool
+	Get(outpoint *DomainOutpoint) (UTXOEntry, bool)
+	Contains(outpoint *DomainOutpoint) bool
 	Len() int
 }
 
@@ -29,5 +27,5 @@ type MutableUTXODiff interface {
 	ToRemove() UTXOCollection
 
 	WithDiffInPlace(other UTXODiff) error
-	AddTransaction(transaction *externalapi.DomainTransaction, blockBlueScore uint64) error
+	AddTransaction(transaction *DomainTransaction, blockBlueScore uint64) error
 }

domain/consensus/model/interface_datastructures_consensusstatestore.go

@@ -7,19 +7,18 @@ type ConsensusStateStore interface {
 	Store
 	IsStaged() bool
 
-	StageVirtualUTXODiff(virtualUTXODiff UTXODiff)
+	StageVirtualUTXODiff(virtualUTXODiff externalapi.UTXODiff)
 	UTXOByOutpoint(dbContext DBReader, outpoint *externalapi.DomainOutpoint) (externalapi.UTXOEntry, error)
 	HasUTXOByOutpoint(dbContext DBReader, outpoint *externalapi.DomainOutpoint) (bool, error)
-	VirtualUTXOSetIterator(dbContext DBReader) (ReadOnlyUTXOSetIterator, error)
-
-	StageVirtualDiffParents(virtualDiffParents []*externalapi.DomainHash)
-	VirtualDiffParents(dbContext DBReader) ([]*externalapi.DomainHash, error)
+	VirtualUTXOSetIterator(dbContext DBReader) (externalapi.ReadOnlyUTXOSetIterator, error)
+	VirtualUTXOs(dbContext DBReader,
+		fromOutpoint *externalapi.DomainOutpoint, limit int) ([]*externalapi.OutpointAndUTXOEntryPair, error)
 
 	StageTips(tipHashes []*externalapi.DomainHash)
 	Tips(dbContext DBReader) ([]*externalapi.DomainHash, error)
 
 	StartImportingPruningPointUTXOSet(dbContext DBWriter) error
 	HadStartedImportingPruningPointUTXOSet(dbContext DBWriter) (bool, error)
-	ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbContext DBWriter, pruningPointUTXOSetIterator ReadOnlyUTXOSetIterator) error
+	ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbContext DBWriter, pruningPointUTXOSetIterator externalapi.ReadOnlyUTXOSetIterator) error
 	FinishImportingPruningPointUTXOSet(dbContext DBWriter) error
 }

domain/consensus/model/interface_datastructures_pruningstore.go

@@ -16,11 +16,11 @@ type PruningStore interface {
 	StageStartUpdatingPruningPointUTXOSet()
 	HadStartedUpdatingPruningPointUTXOSet(dbContext DBWriter) (bool, error)
 	FinishUpdatingPruningPointUTXOSet(dbContext DBWriter) error
-	UpdatePruningPointUTXOSet(dbContext DBWriter, utxoSetIterator ReadOnlyUTXOSetIterator) error
+	UpdatePruningPointUTXOSet(dbContext DBWriter, utxoSetIterator externalapi.ReadOnlyUTXOSetIterator) error
 
 	ClearImportedPruningPointUTXOs(dbContext DBWriter) error
 	AppendImportedPruningPointUTXOs(dbTx DBTransaction, outpointAndUTXOEntryPairs []*externalapi.OutpointAndUTXOEntryPair) error
-	ImportedPruningPointUTXOIterator(dbContext DBReader) (ReadOnlyUTXOSetIterator, error)
+	ImportedPruningPointUTXOIterator(dbContext DBReader) (externalapi.ReadOnlyUTXOSetIterator, error)
 	ClearImportedPruningPointMultiset(dbContext DBWriter) error
 	ImportedPruningPointMultiset(dbContext DBReader) (Multiset, error)
 	UpdateImportedPruningPointMultiset(dbTx DBTransaction, multiset Multiset) error

domain/consensus/model/interface_datastructures_utxodiffstore.go

@@ -5,9 +5,9 @@ import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 // UTXODiffStore represents a store of UTXODiffs
 type UTXODiffStore interface {
 	Store
-	Stage(blockHash *externalapi.DomainHash, utxoDiff UTXODiff, utxoDiffChild *externalapi.DomainHash)
+	Stage(blockHash *externalapi.DomainHash, utxoDiff externalapi.UTXODiff, utxoDiffChild *externalapi.DomainHash)
 	IsStaged() bool
-	UTXODiff(dbContext DBReader, blockHash *externalapi.DomainHash) (UTXODiff, error)
+	UTXODiff(dbContext DBReader, blockHash *externalapi.DomainHash) (externalapi.UTXODiff, error)
 	UTXODiffChild(dbContext DBReader, blockHash *externalapi.DomainHash) (*externalapi.DomainHash, error)
 	HasUTXODiffChild(dbContext DBReader, blockHash *externalapi.DomainHash) (bool, error)
 	Delete(blockHash *externalapi.DomainHash)

domain/consensus/model/interface_processes_consensusstatemanager.go

@@ -4,11 +4,11 @@ import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 
 // ConsensusStateManager manages the node's consensus state
 type ConsensusStateManager interface {
-	AddBlock(blockHash *externalapi.DomainHash) (*externalapi.SelectedChainPath, error)
+	AddBlock(blockHash *externalapi.DomainHash) (*externalapi.SelectedChainPath, externalapi.UTXODiff, error)
 	PopulateTransactionWithUTXOEntries(transaction *externalapi.DomainTransaction) error
 	ImportPruningPoint(newPruningPoint *externalapi.DomainBlock) error
-	RestorePastUTXOSetIterator(blockHash *externalapi.DomainHash) (ReadOnlyUTXOSetIterator, error)
-	CalculatePastUTXOAndAcceptanceData(blockHash *externalapi.DomainHash) (UTXODiff, externalapi.AcceptanceData, Multiset, error)
+	RestorePastUTXOSetIterator(blockHash *externalapi.DomainHash) (externalapi.ReadOnlyUTXOSetIterator, error)
+	CalculatePastUTXOAndAcceptanceData(blockHash *externalapi.DomainHash) (externalapi.UTXODiff, externalapi.AcceptanceData, Multiset, error)
 	GetVirtualSelectedParentChainFromBlock(blockHash *externalapi.DomainHash) (*externalapi.SelectedChainPath, error)
 	RecoverUTXOIfRequired() error
 }

domain/consensus/model/interface_processes_dagtopologymanager.go

@@ -11,6 +11,7 @@ type DAGTopologyManager interface {
 	IsChildOf(blockHashA *externalapi.DomainHash, blockHashB *externalapi.DomainHash) (bool, error)
 	IsAncestorOf(blockHashA *externalapi.DomainHash, blockHashB *externalapi.DomainHash) (bool, error)
 	IsAncestorOfAny(blockHash *externalapi.DomainHash, potentialDescendants []*externalapi.DomainHash) (bool, error)
+	IsAnyAncestorOf(potentialAncestors []*externalapi.DomainHash, blockHash *externalapi.DomainHash) (bool, error)
 	IsInSelectedParentChainOf(blockHashA *externalapi.DomainHash, blockHashB *externalapi.DomainHash) (bool, error)
 	ChildInSelectedParentChainOf(context, highHash *externalapi.DomainHash) (*externalapi.DomainHash, error)
 

domain/consensus/model/interface_processes_dagtraversalmanager.go

@@ -11,7 +11,7 @@ type DAGTraversalManager interface {
 	// from lowHash (exclusive) to highHash (inclusive) over highHash's selected parent chain
 	SelectedChildIterator(highHash, lowHash *externalapi.DomainHash) (BlockIterator, error)
 	Anticone(blockHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error)
-	BlueWindow(highHash *externalapi.DomainHash, windowSize int) ([]*externalapi.DomainHash, error)
+	BlockWindow(highHash *externalapi.DomainHash, windowSize int) ([]*externalapi.DomainHash, error)
 	NewDownHeap() BlockHeap
 	NewUpHeap() BlockHeap
 	CalculateChainPath(

domain/consensus/model/readonlyutxoset.go

@@ -1,17 +0,0 @@
-package model
-
-import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-
-// ReadOnlyUTXOSet represents a UTXOSet that can only be read from
-type ReadOnlyUTXOSet interface {
-	Iterator() ReadOnlyUTXOSetIterator
-	Entry(outpoint *externalapi.DomainOutpoint) externalapi.UTXOEntry
-}
-
-// ReadOnlyUTXOSetIterator is an iterator over all entries in a
-// ReadOnlyUTXOSet
-type ReadOnlyUTXOSetIterator interface {
-	First() bool
-	Next() bool
-	Get() (outpoint *externalapi.DomainOutpoint, utxoEntry externalapi.UTXOEntry, err error)
-}

domain/consensus/model/testapi/test_block_builder.go

@@ -12,7 +12,7 @@ type TestBlockBuilder interface {
 	// BuildBlockWithParents builds a block with provided parents, coinbaseData and transactions,
 	// and returns the block together with its past UTXO-diff from the virtual.
 	BuildBlockWithParents(parentHashes []*externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData,
-		transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, model.UTXODiff, error)
+		transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, externalapi.UTXODiff, error)
 
 	BuildUTXOInvalidHeader(parentHashes []*externalapi.DomainHash) (externalapi.BlockHeader, error)
 

domain/consensus/model/testapi/test_consensus.go

@@ -32,7 +32,7 @@ type TestConsensus interface {
 	Database() database.Database
 
 	BuildBlockWithParents(parentHashes []*externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData,
-		transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, model.UTXODiff, error)
+		transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, externalapi.UTXODiff, error)
 
 	BuildHeaderWithParents(parentHashes []*externalapi.DomainHash) (externalapi.BlockHeader, error)
 

domain/consensus/processes/blockbuilder/log.go

@@ -4,4 +4,4 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.BDAG)
+var log = logger.RegisterSubSystem("BDAG")

domain/consensus/processes/blockbuilder/test_block_builder.go

@@ -44,7 +44,7 @@ func cleanBlockPrefilledFields(block *externalapi.DomainBlock) {
 // and returns the block together with its past UTXO-diff from the virtual.
 func (bb *testBlockBuilder) BuildBlockWithParents(parentHashes []*externalapi.DomainHash,
 	coinbaseData *externalapi.DomainCoinbaseData, transactions []*externalapi.DomainTransaction) (
-	*externalapi.DomainBlock, model.UTXODiff, error) {
+	*externalapi.DomainBlock, externalapi.UTXODiff, error) {
 
 	onEnd := logger.LogAndMeasureExecutionTime(log, "BuildBlockWithParents")
 	defer onEnd()
@@ -117,7 +117,7 @@ func (bb *testBlockBuilder) buildHeaderWithParents(parentHashes []*externalapi.D
 	), nil
 }
 
-func (bb *testBlockBuilder) buildBlockWithParents(parentHashes []*externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData, transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, model.UTXODiff, error) {
+func (bb *testBlockBuilder) buildBlockWithParents(parentHashes []*externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData, transactions []*externalapi.DomainTransaction) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
 
 	defer bb.testConsensus.DiscardAllStores()
 

domain/consensus/processes/blockprocessor/blocklogger/log.go

@@ -8,4 +8,4 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.BDAG)
+var log = logger.RegisterSubSystem("BDAG")

domain/consensus/processes/blockprocessor/log.go

@@ -4,4 +4,4 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.BDAG)
+var log = logger.RegisterSubSystem("BDAG")

domain/consensus/processes/blockprocessor/validateandinsertblock.go

@@ -83,6 +83,7 @@ func (bp *blockProcessor) validateAndInsertBlock(block *externalapi.DomainBlock,
 	}
 
 	var selectedParentChainChanges *externalapi.SelectedChainPath
+	var virtualUTXODiff externalapi.UTXODiff
 	isHeaderOnlyBlock := isHeaderOnlyBlock(block)
 	if !isHeaderOnlyBlock {
 		// There's no need to update the consensus state manager when
@@ -90,7 +91,7 @@ func (bp *blockProcessor) validateAndInsertBlock(block *externalapi.DomainBlock,
 		// in consensusStateManager.ImportPruningPoint
 		if !isPruningPoint {
 			// Attempt to add the block to the virtual
-			selectedParentChainChanges, err = bp.consensusStateManager.AddBlock(blockHash)
+			selectedParentChainChanges, virtualUTXODiff, err = bp.consensusStateManager.AddBlock(blockHash)
 			if err != nil {
 				return nil, err
 			}
@@ -143,10 +144,17 @@ func (bp *blockProcessor) validateAndInsertBlock(block *externalapi.DomainBlock,
 		return nil, logClosureErr
 	}
 
+	virtualParents, err := bp.dagTopologyManager.Parents(model.VirtualBlockHash)
+	if err != nil {
+		return nil, err
+	}
+
 	bp.blockLogger.LogBlock(block)
 
 	return &externalapi.BlockInsertionResult{
 		VirtualSelectedParentChainChanges: selectedParentChainChanges,
+		VirtualUTXODiff:                   virtualUTXODiff,
+		VirtualParents:                    virtualParents,
 	}, nil
 }
 

domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go

@@ -1,6 +1,11 @@
 package blockvalidator_test
 
 import (
+	"bytes"
+	"github.com/kaspanet/kaspad/domain/consensus/model/testapi"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/merkle"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
 	"math"
 	"testing"
 
@@ -84,7 +89,7 @@ func TestChainedTransactions(t *testing.T) {
 func TestCheckBlockSanity(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
 		factory := consensus.NewFactory()
-		consensus, teardown, err := factory.NewTestConsensus(params, false, "TestCheckBlockSanity")
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestCheckBlockSanity")
 		if err != nil {
 			t.Fatalf("Error setting up consensus: %+v", err)
 		}
@@ -94,17 +99,17 @@ func TestCheckBlockSanity(t *testing.T) {
 			t.Fatalf("Too few transactions in block, expect at least 3, got %v", len(exampleValidBlock.Transactions))
 		}
 
-		consensus.BlockStore().Stage(blockHash, &exampleValidBlock)
+		tc.BlockStore().Stage(blockHash, &exampleValidBlock)
 
-		err = consensus.BlockValidator().ValidateBodyInIsolation(blockHash)
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
 		if err != nil {
 			t.Fatalf("Failed validating block in isolation: %v", err)
 		}
 
 		// Test with block with wrong transactions sorting order
 		blockHash = consensushashing.BlockHash(&blockWithWrongTxOrder)
-		consensus.BlockStore().Stage(blockHash, &blockWithWrongTxOrder)
-		err = consensus.BlockValidator().ValidateBodyInIsolation(blockHash)
+		tc.BlockStore().Stage(blockHash, &blockWithWrongTxOrder)
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
 		if !errors.Is(err, ruleerrors.ErrTransactionsNotSorted) {
 			t.Errorf("CheckBlockSanity: Expected ErrTransactionsNotSorted error, instead got %v", err)
 		}
@@ -112,8 +117,8 @@ func TestCheckBlockSanity(t *testing.T) {
 		// Test a block with invalid parents order
 		// We no longer require blocks to have ordered parents
 		blockHash = consensushashing.BlockHash(&unOrderedParentsBlock)
-		consensus.BlockStore().Stage(blockHash, &unOrderedParentsBlock)
-		err = consensus.BlockValidator().ValidateBodyInIsolation(blockHash)
+		tc.BlockStore().Stage(blockHash, &unOrderedParentsBlock)
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
 		if err != nil {
 			t.Errorf("CheckBlockSanity: Expected block to be be body in isolation valid, got error instead: %v", err)
 		}
@@ -1034,3 +1039,309 @@ func TestCheckBlockHashMerkleRoot(t *testing.T) {
 		}
 	})
 }
+
+func TestBlockSize(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestBlockSize")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithInvalidBlockSize(params, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		tc.BlockStore().Stage(blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrBlockSizeTooHigh) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestBlockSize:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrBlockSizeTooHigh, err)
+		}
+	})
+}
+
+func initBlockWithInvalidBlockSize(params *dagconfig.Params, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
+	emptyCoinbase := externalapi.DomainCoinbaseData{
+		ScriptPublicKey: &externalapi.ScriptPublicKey{
+			Script:  nil,
+			Version: 0,
+		},
+	}
+	prevOutTxID := &externalapi.DomainTransactionID{}
+	prevOutPoint := externalapi.DomainOutpoint{TransactionID: *prevOutTxID, Index: 1}
+	bigSignatureScript := bytes.Repeat([]byte("01"), 25000)
+	txInput := externalapi.DomainTransactionInput{
+		PreviousOutpoint: prevOutPoint,
+		SignatureScript:  bigSignatureScript,
+		Sequence:         constants.MaxTxInSequenceNum,
+		UTXOEntry: utxo.NewUTXOEntry(
+			100_000_000,
+			&externalapi.ScriptPublicKey{},
+			true,
+			uint64(5)),
+	}
+	tx := &externalapi.DomainTransaction{
+		Version: constants.MaxTransactionVersion,
+		Inputs:  []*externalapi.DomainTransactionInput{&txInput},
+		Outputs: []*externalapi.DomainTransactionOutput{{uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 2}, Version: 0}}, {uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 3}, Version: 0}}},
+		PayloadHash: *externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}),
+		Payload: []byte{0x01},
+	}
+
+	return tc.BuildBlockWithParents([]*externalapi.DomainHash{params.GenesisHash}, &emptyCoinbase, []*externalapi.DomainTransaction{tx})
+}
+
+func TestCheckBlockDuplicateTransactions(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestCheckBlockDuplicateTransactions")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithDuplicateTransaction(params, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		tc.BlockStore().Stage(blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrDuplicateTx) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockDuplicateTransactions:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrDuplicateTx, err)
+		}
+	})
+}
+
+func initBlockWithDuplicateTransaction(params *dagconfig.Params, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
+	emptyCoinbase := externalapi.DomainCoinbaseData{
+		ScriptPublicKey: &externalapi.ScriptPublicKey{
+			Script:  nil,
+			Version: 0,
+		},
+	}
+	prevOutTxID := &externalapi.DomainTransactionID{}
+	prevOutPoint := externalapi.DomainOutpoint{TransactionID: *prevOutTxID, Index: 1}
+	txInput := externalapi.DomainTransactionInput{
+		PreviousOutpoint: prevOutPoint,
+		SignatureScript:  bytes.Repeat([]byte("01"), 10),
+		Sequence:         constants.MaxTxInSequenceNum,
+		UTXOEntry: utxo.NewUTXOEntry(
+			100_000_000,
+			&externalapi.ScriptPublicKey{},
+			true,
+			uint64(5)),
+	}
+	tx := &externalapi.DomainTransaction{
+		Version: 0,
+		Inputs:  []*externalapi.DomainTransactionInput{&txInput},
+		Outputs: []*externalapi.DomainTransactionOutput{{uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 2}, Version: 0}}, {uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 3}, Version: 0}}},
+		SubnetworkID: subnetworks.SubnetworkIDNative,
+	}
+
+	return tc.BuildBlockWithParents([]*externalapi.DomainHash{params.GenesisHash}, &emptyCoinbase, []*externalapi.DomainTransaction{tx, tx})
+}
+
+func TestCheckBlockContainsOnlyOneCoinbase(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestCheckBlockContainsOnlyOneCoinbase")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithMoreThanOneCoinbase(params, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		tc.BlockStore().Stage(blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrMultipleCoinbases) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockContainsOnlyOneCoinbase:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrMultipleCoinbases, err)
+		}
+	})
+}
+
+func initBlockWithMoreThanOneCoinbase(params *dagconfig.Params, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
+	emptyCoinbase := externalapi.DomainCoinbaseData{
+		ScriptPublicKey: &externalapi.ScriptPublicKey{
+			Script:  nil,
+			Version: 0,
+		},
+	}
+	prevOutTxID := &externalapi.DomainTransactionID{}
+	prevOutPoint := externalapi.DomainOutpoint{TransactionID: *prevOutTxID, Index: 1}
+	txInput := externalapi.DomainTransactionInput{
+		PreviousOutpoint: prevOutPoint,
+		SignatureScript:  bytes.Repeat([]byte("01"), 10),
+		Sequence:         constants.MaxTxInSequenceNum,
+		UTXOEntry: utxo.NewUTXOEntry(
+			100_000_000,
+			&externalapi.ScriptPublicKey{},
+			true,
+			uint64(5)),
+	}
+	tx := &externalapi.DomainTransaction{
+		Version: 0,
+		Inputs:  []*externalapi.DomainTransactionInput{&txInput},
+		Outputs: []*externalapi.DomainTransactionOutput{{uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 2}, Version: 0}}, {uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 3}, Version: 0}}},
+		SubnetworkID: subnetworks.SubnetworkIDCoinbase,
+	}
+
+	return tc.BuildBlockWithParents([]*externalapi.DomainHash{params.GenesisHash}, &emptyCoinbase, []*externalapi.DomainTransaction{tx})
+}
+
+func TestCheckBlockDoubleSpends(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestCheckBlockDoubleSpends")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block, _, err := initBlockWithDoubleSpends(params, tc)
+		if err != nil {
+			t.Fatalf("Error BuildBlockWithParents : %+v", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		tc.BlockStore().Stage(blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrDoubleSpendInSameBlock) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckBlockDoubleSpends:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrDoubleSpendInSameBlock, err)
+		}
+	})
+}
+
+func initBlockWithDoubleSpends(params *dagconfig.Params, tc testapi.TestConsensus) (*externalapi.DomainBlock, externalapi.UTXODiff, error) {
+	emptyCoinbase := externalapi.DomainCoinbaseData{
+		ScriptPublicKey: &externalapi.ScriptPublicKey{
+			Script:  nil,
+			Version: 0,
+		},
+	}
+	prevOutTxID := &externalapi.DomainTransactionID{}
+	prevOutPoint := externalapi.DomainOutpoint{TransactionID: *prevOutTxID, Index: 1}
+	txInput := externalapi.DomainTransactionInput{
+		PreviousOutpoint: prevOutPoint,
+		SignatureScript:  bytes.Repeat([]byte("01"), 10),
+		Sequence:         constants.MaxTxInSequenceNum,
+		UTXOEntry: utxo.NewUTXOEntry(
+			100_000_000,
+			&externalapi.ScriptPublicKey{},
+			true,
+			uint64(5)),
+	}
+	tx := &externalapi.DomainTransaction{
+		Version: 0,
+		Inputs:  []*externalapi.DomainTransactionInput{&txInput},
+		Outputs: []*externalapi.DomainTransactionOutput{{uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 2}, Version: 0}}, {uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 3}, Version: 0}}},
+		SubnetworkID: subnetworks.SubnetworkIDNative,
+	}
+	txInputSameOutpoint := externalapi.DomainTransactionInput{
+		PreviousOutpoint: prevOutPoint,
+		SignatureScript:  bytes.Repeat([]byte("02"), 10),
+		Sequence:         constants.MaxTxInSequenceNum,
+		UTXOEntry: utxo.NewUTXOEntry(
+			100_000_000,
+			&externalapi.ScriptPublicKey{},
+			true,
+			uint64(4)),
+	}
+	txSameOutpoint := &externalapi.DomainTransaction{
+		Version: 0,
+		Inputs:  []*externalapi.DomainTransactionInput{&txInputSameOutpoint},
+		Outputs: []*externalapi.DomainTransactionOutput{{uint64(0xFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 2}, Version: 0}}, {uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 3}, Version: 0}}},
+		SubnetworkID: subnetworks.SubnetworkIDNative,
+	}
+
+	return tc.BuildBlockWithParents([]*externalapi.DomainHash{params.GenesisHash},
+		&emptyCoinbase, []*externalapi.DomainTransaction{tx, txSameOutpoint})
+}
+
+func TestCheckFirstBlockTransactionIsCoinbase(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestCheckFirstBlockTransactionIsCoinbase")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		block := initBlockWithFirstTransactionDifferentThanCoinbase(params)
+		blockHash := consensushashing.BlockHash(block)
+		tc.BlockStore().Stage(blockHash, block)
+
+		err = tc.BlockValidator().ValidateBodyInIsolation(blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrFirstTxNotCoinbase) {
+			t.Fatalf("ValidateBodyInIsolationTest: TestCheckFirstBlockTransactionIsCoinbase:"+
+				" Unexpected error: Expected to: %v, but got : %v", ruleerrors.ErrFirstTxNotCoinbase, err)
+		}
+	})
+}
+
+func initBlockWithFirstTransactionDifferentThanCoinbase(params *dagconfig.Params) *externalapi.DomainBlock {
+	prevOutTxID := &externalapi.DomainTransactionID{}
+	prevOutPoint := externalapi.DomainOutpoint{TransactionID: *prevOutTxID, Index: 1}
+	txInput := externalapi.DomainTransactionInput{
+		PreviousOutpoint: prevOutPoint,
+		SignatureScript:  bytes.Repeat([]byte("01"), 10),
+		Sequence:         constants.MaxTxInSequenceNum,
+	}
+	tx := &externalapi.DomainTransaction{
+		Version: 0,
+		Inputs:  []*externalapi.DomainTransactionInput{&txInput},
+		Outputs: []*externalapi.DomainTransactionOutput{{uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 2}, Version: 0}}, {uint64(0xFFFF),
+			&externalapi.ScriptPublicKey{Script: []byte{1, 3}, Version: 0}}},
+		SubnetworkID: subnetworks.SubnetworkIDNative,
+	}
+
+	return &externalapi.DomainBlock{
+		Header: blockheader.NewImmutableBlockHeader(
+			constants.MaxBlockVersion,
+			[]*externalapi.DomainHash{params.GenesisHash},
+			merkle.CalculateHashMerkleRoot([]*externalapi.DomainTransaction{tx}),
+			&externalapi.DomainHash{},
+			externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{
+				0x80, 0xf7, 0x00, 0xe3, 0x16, 0x3d, 0x04, 0x95,
+				0x5b, 0x7e, 0xaf, 0x84, 0x7e, 0x1b, 0x6b, 0x06,
+				0x4e, 0x06, 0xba, 0x64, 0xd7, 0x61, 0xda, 0x25,
+				0x1a, 0x0e, 0x21, 0xd4, 0x64, 0x49, 0x02, 0xa2,
+			}),
+			0x5cd18053000,
+			0x207fffff,
+			0x1),
+		Transactions: []*externalapi.DomainTransaction{tx},
+	}
+}

domain/consensus/processes/blockvalidator/log.go

@@ -4,4 +4,4 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 )
 
-var log, _ = logger.Get(logger.SubsystemTags.BLVL)
+var log = logger.RegisterSubSystem("BLVA")

domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go

@@ -1,6 +1,7 @@
 package blockvalidator_test
 
 import (
+	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/pow"
 	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/blockheader"
@@ -12,8 +13,8 @@ import (
 	"math"
 	"math/big"
 	"math/rand"
-
 	"testing"
+	"time"
 
 	"github.com/kaspanet/kaspad/domain/consensus"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
@@ -241,3 +242,60 @@ func TestCheckPruningPointViolation(t *testing.T) {
 		}
 	})
 }
+
+// TestValidateDifficulty verifies that in case of a block with an unexpected difficulty,
+// an appropriate error message (ErrUnexpectedDifficulty) will be returned on the
+// function ValidatePruningPointViolationAndProofOfWorkAndDifficulty. The required difficulty is
+// "calculated" by the function (dm *mocDifficultyManager) RequiredDifficulty ,
+// where mocDifficultyManager is special implementation of the type DifficultyManager for this test (defined below).
+func TestValidateDifficulty(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+
+		factory := consensus.NewFactory()
+		mocDifficulty := &mocDifficultyManager{}
+		factory.SetTestDifficultyManager(func(model.DBReader, model.GHOSTDAGManager, model.GHOSTDAGDataStore,
+			model.BlockHeaderStore, model.DAGTopologyManager, model.DAGTraversalManager, *big.Int, int, bool, time.Duration,
+			*externalapi.DomainHash) model.DifficultyManager {
+			return mocDifficulty
+		})
+		genesisDifficulty := params.GenesisBlock.Header.Bits()
+		mocDifficulty.testDifficulty = genesisDifficulty
+		mocDifficulty.testGenesisBits = genesisDifficulty
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestValidateDifficulty")
+		if err != nil {
+			t.Fatalf("Error setting up consensus: %+v", err)
+		}
+		defer teardown(false)
+
+		emptyCoinbase := externalapi.DomainCoinbaseData{
+			ScriptPublicKey: &externalapi.ScriptPublicKey{
+				Script:  nil,
+				Version: 0,
+			},
+		}
+		block, _, err := tc.BuildBlockWithParents([]*externalapi.DomainHash{params.GenesisHash}, &emptyCoinbase, nil)
+		if err != nil {
+			t.Fatalf("TestValidateDifficulty: Failed build block with parents: %v.", err)
+		}
+		blockHash := consensushashing.BlockHash(block)
+		tc.BlockStore().Stage(blockHash, block)
+		tc.BlockHeaderStore().Stage(blockHash, block.Header)
+		wrongTestDifficulty := mocDifficulty.testDifficulty + uint32(5)
+		mocDifficulty.testDifficulty = wrongTestDifficulty
+
+		err = tc.BlockValidator().ValidatePruningPointViolationAndProofOfWorkAndDifficulty(blockHash)
+		if err == nil || !errors.Is(err, ruleerrors.ErrUnexpectedDifficulty) {
+			t.Fatalf("Expected block to be invalid with err: %v, instead found: %v", ruleerrors.ErrUnexpectedDifficulty, err)
+		}
+	})
+}
+
+type mocDifficultyManager struct {
+	testDifficulty  uint32
+	testGenesisBits uint32
+}
+
+// RequiredDifficulty returns the difficulty required for the test
+func (dm *mocDifficultyManager) RequiredDifficulty(*externalapi.DomainHash) (uint32, error) {
+	return dm.testDifficulty, nil
+}

domain/consensus/processes/consensusstatemanager/add_block_to_virtual.go

@@ -9,14 +9,14 @@ import (
 // AddBlock submits the given block to be added to the
 // current virtual. This process may result in a new virtual block
 // getting created
-func (csm *consensusStateManager) AddBlock(blockHash *externalapi.DomainHash) (*externalapi.SelectedChainPath, error) {
+func (csm *consensusStateManager) AddBlock(blockHash *externalapi.DomainHash) (*externalapi.SelectedChainPath, externalapi.UTXODiff, error) {
 	onEnd := logger.LogAndMeasureExecutionTime(log, "csm.AddBlock")
 	defer onEnd()
 
 	log.Debugf("Resolving whether the block %s is the next virtual selected parent", blockHash)
 	isCandidateToBeNextVirtualSelectedParent, err := csm.isCandidateToBeNextVirtualSelectedParent(blockHash)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	if isCandidateToBeNextVirtualSelectedParent {
@@ -27,7 +27,7 @@ func (csm *consensusStateManager) AddBlock(blockHash *externalapi.DomainHash) (*
 			"finality", blockHash)
 		isViolatingFinality, shouldNotify, err := csm.isViolatingFinality(blockHash)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 
 		if shouldNotify {
@@ -39,7 +39,7 @@ func (csm *consensusStateManager) AddBlock(blockHash *externalapi.DomainHash) (*
 			log.Debugf("Block %s doesn't violate finality. Resolving its block status", blockHash)
 			blockStatus, err := csm.resolveBlockStatus(blockHash)
 			if err != nil {
-				return nil, err
+				return nil, nil, err
 			}
 
 			log.Debugf("Block %s resolved to status `%s`", blockHash, blockStatus)
@@ -52,17 +52,17 @@ func (csm *consensusStateManager) AddBlock(blockHash *externalapi.DomainHash) (*
 	log.Debugf("Adding block %s to the DAG tips", blockHash)
 	newTips, err := csm.addTip(blockHash)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	log.Debugf("After adding %s, the amount of new tips are %d", blockHash, len(newTips))
 
 	log.Debugf("Updating the virtual with the new tips")
-	selectedParentChainChanges, err := csm.updateVirtual(blockHash, newTips)
+	selectedParentChainChanges, virtualUTXODiff, err := csm.updateVirtual(blockHash, newTips)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return selectedParentChainChanges, nil
+	return selectedParentChainChanges, virtualUTXODiff, nil
 }
 
 func (csm *consensusStateManager) isCandidateToBeNextVirtualSelectedParent(blockHash *externalapi.DomainHash) (bool, error) {

domain/consensus/processes/consensusstatemanager/add_block_to_virtual_test.go

@@ -0,0 +1,67 @@
+package consensusstatemanager_test
+
+import (
+	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
+	"testing"
+
+	"github.com/kaspanet/kaspad/domain/consensus"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/testutils"
+	"github.com/kaspanet/kaspad/domain/dagconfig"
+)
+
+func TestVirtualDiff(t *testing.T) {
+	testutils.ForAllNets(t, true, func(t *testing.T, params *dagconfig.Params) {
+		factory := consensus.NewFactory()
+		tc, teardown, err := factory.NewTestConsensus(params, false, "TestVirtualDiff")
+		if err != nil {
+			t.Fatalf("Error setting up tc: %+v", err)
+		}
+		defer teardown(false)
+
+		// Add block A over the genesis
+		blockHash, blockInsertionResult, err := tc.AddBlock([]*externalapi.DomainHash{params.GenesisHash}, nil, nil)
+		if err != nil {
+			t.Fatalf("Error adding block A: %+v", err)
+		}
+
+		block, err := tc.BlockStore().Block(tc.DatabaseContext(), blockHash)
+		if err != nil {
+			t.Fatalf("Block: %+v", err)
+		}
+
+		virtualUTXODiff := blockInsertionResult.VirtualUTXODiff
+		if virtualUTXODiff.ToRemove().Len() != 0 {
+			t.Fatalf("Unexpected length %d for virtualUTXODiff.ToRemove()", virtualUTXODiff.ToRemove().Len())
+		}
+
+		if virtualUTXODiff.ToAdd().Len() != 1 {
+			t.Fatalf("Unexpected length %d for virtualUTXODiff.ToAdd()", virtualUTXODiff.ToAdd().Len())
+		}
+
+		iterator := virtualUTXODiff.ToAdd().Iterator()
+		iterator.First()
+
+		outpoint, entry, err := iterator.Get()
+		if err != nil {
+			t.Fatalf("TestVirtualDiff: %+v", err)
+		}
+
+		if !outpoint.Equal(&externalapi.DomainOutpoint{
+			TransactionID: *consensushashing.TransactionID(block.Transactions[0]),
+			Index:         0,
+		}) {
+			t.Fatalf("Unexpected outpoint %s", outpoint)
+		}
+
+		if !entry.Equal(utxo.NewUTXOEntry(
+			block.Transactions[0].Outputs[0].Value,
+			block.Transactions[0].Outputs[0].ScriptPublicKey,
+			true,
+			2, //Expected virtual blue score
+		)) {
+			t.Fatalf("Unexpected entry %s", entry)
+		}
+	})
+}

domain/consensus/processes/consensusstatemanager/calculate_past_utxo.go

@@ -14,7 +14,7 @@ import (
 )
 
 func (csm *consensusStateManager) CalculatePastUTXOAndAcceptanceData(blockHash *externalapi.DomainHash) (
-	model.UTXODiff, externalapi.AcceptanceData, model.Multiset, error) {
+	externalapi.UTXODiff, externalapi.AcceptanceData, model.Multiset, error) {
 
 	onEnd := logger.LogAndMeasureExecutionTime(log, "CalculatePastUTXOAndAcceptanceData")
 	defer onEnd()
@@ -58,7 +58,7 @@ func (csm *consensusStateManager) CalculatePastUTXOAndAcceptanceData(blockHash *
 	return utxoDiff.ToImmutable(), acceptanceData, multiset, nil
 }
 
-func (csm *consensusStateManager) restorePastUTXO(blockHash *externalapi.DomainHash) (model.MutableUTXODiff, error) {
+func (csm *consensusStateManager) restorePastUTXO(blockHash *externalapi.DomainHash) (externalapi.MutableUTXODiff, error) {
 	onEnd := logger.LogAndMeasureExecutionTime(log, "restorePastUTXO")
 	defer onEnd()
 
@@ -67,7 +67,7 @@ func (csm *consensusStateManager) restorePastUTXO(blockHash *externalapi.DomainH
 	var err error
 
 	log.Debugf("Collecting UTXO diffs for block %s", blockHash)
-	var utxoDiffs []model.UTXODiff
+	var utxoDiffs []externalapi.UTXODiff
 	nextBlockHash := blockHash
 	for {
 		log.Debugf("Collecting UTXO diff for block %s", nextBlockHash)
@@ -115,8 +115,8 @@ func (csm *consensusStateManager) restorePastUTXO(blockHash *externalapi.DomainH
 }
 
 func (csm *consensusStateManager) applyMergeSetBlocks(blockHash *externalapi.DomainHash,
-	selectedParentPastUTXODiff model.MutableUTXODiff, ghostdagData *model.BlockGHOSTDAGData) (
-	externalapi.AcceptanceData, model.MutableUTXODiff, error) {
+	selectedParentPastUTXODiff externalapi.MutableUTXODiff, ghostdagData *model.BlockGHOSTDAGData) (
+	externalapi.AcceptanceData, externalapi.MutableUTXODiff, error) {
 
 	log.Debugf("applyMergeSetBlocks start for block %s", blockHash)
 	defer log.Debugf("applyMergeSetBlocks end for block %s", blockHash)
@@ -185,7 +185,7 @@ func (csm *consensusStateManager) applyMergeSetBlocks(blockHash *externalapi.Dom
 }
 
 func (csm *consensusStateManager) maybeAcceptTransaction(transaction *externalapi.DomainTransaction,
-	blockHash *externalapi.DomainHash, isSelectedParent bool, accumulatedUTXODiff model.MutableUTXODiff,
+	blockHash *externalapi.DomainHash, isSelectedParent bool, accumulatedUTXODiff externalapi.MutableUTXODiff,
 	accumulatedMassBefore uint64, selectedParentPastMedianTime int64, blockBlueScore uint64) (
 	isAccepted bool, accumulatedMassAfter uint64, err error) {
 
@@ -267,9 +267,9 @@ func (csm *consensusStateManager) checkTransactionMass(
 	return true, accumulatedMassAfter
 }
 
-// RestorePastUTXOSetIterator restores the given block's UTXOSet iterator, and returns it as a model.ReadOnlyUTXOSetIterator
+// RestorePastUTXOSetIterator restores the given block's UTXOSet iterator, and returns it as a externalapi.ReadOnlyUTXOSetIterator
 func (csm *consensusStateManager) RestorePastUTXOSetIterator(blockHash *externalapi.DomainHash) (
-	model.ReadOnlyUTXOSetIterator, error) {
+	externalapi.ReadOnlyUTXOSetIterator, error) {
 
 	onEnd := logger.LogAndMeasureExecutionTime(log, "RestorePastUTXOSetIterator")
 	defer onEnd()

domain/consensus/processes/consensusstatemanager/calculate_past_utxo_test.go

@@ -86,6 +86,7 @@ func checkBlockUTXOCommitment(t *testing.T, consensus testapi.TestConsensus, blo
 	if err != nil {
 		t.Fatalf("Error restoring past UTXO of block %s: %+v", blockName, err)
 	}
+	defer utxoSetIterator.Close()
 
 	// Build a Multiset
 	ms := multiset.New()