Increase the mass limit 100x

* Return headers first

* Delete TestHandleRelayInvs

* resolve virtual only after IBD

* Fix ResolveVirtual

* Fix comments and variable names

.github/workflows/SetPageFileSize.ps1

@@ -11,8 +11,8 @@
 #>
 
 param(
-    [System.UInt64] $MinimumSize = 8gb ,
-    [System.UInt64] $MaximumSize = 8gb ,
+    [System.UInt64] $MinimumSize = 16gb ,
+    [System.UInt64] $MaximumSize = 16gb ,
     [System.String] $DiskRoot = "D:"
 )
 

.github/workflows/deploy.yaml

@@ -1,4 +1,4 @@
-name: Build and Upload assets
+name: Build and upload assets
 on:
   release:
     types: [published]
@@ -10,31 +10,30 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-    name: Building For ${{ matrix.os }}
+    name: Building, ${{ matrix.os }}
     steps:
-      - name: Fix windows CRLF
+      - name: Fix CRLF on Windows
+        if: runner.os == 'Windows'
         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
+      # Increase the pagefile size on Windows to aviod running out of memory
+      - name: Increase pagefile size on Windows
         if: runner.os == 'Windows'
-        shell: powershell
-        run: powershell -command .\.github\workflows\SetPageFileSize.ps1
+        run: powershell -command .github\workflows\SetPageFileSize.ps1
 
 
-      - name: Set up Go 1.x
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.16
 
-      - name: Build on linux
+      - 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"
+        # `-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: |
           go build -v -ldflags="-s -w -extldflags=-static" -tags netgo,osusergo -o ./bin/ ./...
@@ -66,7 +65,7 @@ jobs:
           echo "asset_name=${asset_name}" >> $GITHUB_ENV
 
 
-      - name: Upload Release Asset
+      - name: Upload release asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/race.yaml

@@ -1,4 +1,4 @@
-name: Go-Race
+name: Race
 
 on:
   schedule:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   race_test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -19,10 +19,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Go 1.x
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Set scheduled branch name
         shell: bash

.github/workflows/tests.yaml

@@ -1,38 +1,36 @@
-name: Go
+name: Tests
 
 on:
   push:
   pull_request:
-    # edtited - "title, body, or the base branch of the PR is modified"
-    # synchronize - "commit(s) pushed to the pull request"
-    types: [opened, synchronize, edited, reopened]
+    # edtited - because base branch can be modified
+    # synchronize - update commits on PR
+    types: [opened, synchronize, edited]
 
 jobs:
+
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-16.04, macos-10.15, windows-2019 ]
-    name: Testing on on ${{ matrix.os }}
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+    name: Tests, ${{ matrix.os }}
     steps:
 
-      - name: Fix windows CRLF
+      - name: Fix CRLF on Windows
+        if: runner.os == 'Windows'
         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
+      # Increase the pagefile size on Windows to aviod running out of memory
+      - name: Increase pagefile size on Windows
         if: runner.os == 'Windows'
-        shell: powershell
-        run: powershell -command .\.github\workflows\SetPageFileSize.ps1
+        run: powershell -command .github\workflows\SetPageFileSize.ps1
 
-
-      - name: Set up Go 1.x
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.16
@@ -51,14 +49,41 @@ jobs:
         shell: bash
         run: ./build_and_test.sh -v
 
+
+  stability-test-fast:
+    runs-on: ubuntu-latest
+    name: Fast stability tests, ${{ github.head_ref }}
+    steps:
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install kaspad
+        run: go install ./...
+
+      - name: Install golint
+        run: go get -u golang.org/x/lint/golint
+
+      - name: Run fast stability tests
+        working-directory: stability-tests
+        run: ./install_and_test.sh
+
+
   coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Produce code coverage
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.x
+      - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.16
@@ -70,4 +95,4 @@ jobs:
         run: go test -v -covermode=atomic -coverpkg=./... -coverprofile coverage.txt ./...
 
       - name: Upload coverage file
-        run: bash <(curl -s https://codecov.io/bash)
+        run: bash <(curl -s https://codecov.io/bash)

app/app.go

@@ -101,7 +101,7 @@ func (app *kaspadApp) main(startedChan chan<- struct{}) error {
 	// Open the database
 	databaseContext, err := openDB(app.cfg)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("Loading database failed: %+v", err)
 		return err
 	}
 

app/appmessage/domainconverters.go

@@ -2,6 +2,7 @@ package appmessage
 
 import (
 	"encoding/hex"
+
 	"github.com/kaspanet/kaspad/domain/consensus/utils/blockheader"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/utxo"
@@ -100,6 +101,7 @@ func domainTransactionInputToTxIn(domainTransactionInput *externalapi.DomainTran
 		PreviousOutpoint: *domainOutpointToOutpoint(domainTransactionInput.PreviousOutpoint),
 		SignatureScript:  domainTransactionInput.SignatureScript,
 		Sequence:         domainTransactionInput.Sequence,
+		SigOpCount:       domainTransactionInput.SigOpCount,
 	}
 }
 
@@ -148,6 +150,7 @@ func txInToDomainTransactionInput(txIn *TxIn) *externalapi.DomainTransactionInpu
 	return &externalapi.DomainTransactionInput{
 		PreviousOutpoint: *outpointToDomainOutpoint(&txIn.PreviousOutpoint), //TODO
 		SignatureScript:  txIn.SignatureScript,
+		SigOpCount:       txIn.SigOpCount,
 		Sequence:         txIn.Sequence,
 	}
 }
@@ -175,6 +178,7 @@ func RPCTransactionToDomainTransaction(rpcTransaction *RPCTransaction) (*externa
 			PreviousOutpoint: *previousOutpoint,
 			SignatureScript:  signatureScript,
 			Sequence:         input.Sequence,
+			SigOpCount:       input.SigOpCount,
 		}
 	}
 	outputs := make([]*externalapi.DomainTransactionOutput, len(rpcTransaction.Outputs))
@@ -253,6 +257,7 @@ func DomainTransactionToRPCTransaction(transaction *externalapi.DomainTransactio
 			PreviousOutpoint: previousOutpoint,
 			SignatureScript:  signatureScript,
 			Sequence:         input.Sequence,
+			SigOpCount:       input.SigOpCount,
 		}
 	}
 	outputs := make([]*RPCTransactionOutput, len(transaction.Outputs))
@@ -393,3 +398,90 @@ func RPCBlockToDomainBlock(block *RPCBlock) (*externalapi.DomainBlock, error) {
 		Transactions: transactions,
 	}, nil
 }
+
+// BlockWithTrustedDataToDomainBlockWithTrustedData converts *MsgBlockWithTrustedData to *externalapi.BlockWithTrustedData
+func BlockWithTrustedDataToDomainBlockWithTrustedData(block *MsgBlockWithTrustedData) *externalapi.BlockWithTrustedData {
+	daaWindow := make([]*externalapi.TrustedDataDataDAABlock, len(block.DAAWindow))
+	for i, daaBlock := range block.DAAWindow {
+		daaWindow[i] = &externalapi.TrustedDataDataDAABlock{
+			Header:       BlockHeaderToDomainBlockHeader(daaBlock.Header),
+			GHOSTDAGData: ghostdagDataToDomainGHOSTDAGData(daaBlock.GHOSTDAGData),
+		}
+	}
+
+	ghostdagData := make([]*externalapi.BlockGHOSTDAGDataHashPair, len(block.GHOSTDAGData))
+	for i, datum := range block.GHOSTDAGData {
+		ghostdagData[i] = &externalapi.BlockGHOSTDAGDataHashPair{
+			Hash:         datum.Hash,
+			GHOSTDAGData: ghostdagDataToDomainGHOSTDAGData(datum.GHOSTDAGData),
+		}
+	}
+
+	return &externalapi.BlockWithTrustedData{
+		Block:        MsgBlockToDomainBlock(block.Block),
+		DAAScore:     block.DAAScore,
+		DAAWindow:    daaWindow,
+		GHOSTDAGData: ghostdagData,
+	}
+}
+
+func ghostdagDataToDomainGHOSTDAGData(data *BlockGHOSTDAGData) *externalapi.BlockGHOSTDAGData {
+	bluesAnticoneSizes := make(map[externalapi.DomainHash]externalapi.KType, len(data.BluesAnticoneSizes))
+	for _, pair := range data.BluesAnticoneSizes {
+		bluesAnticoneSizes[*pair.BlueHash] = pair.AnticoneSize
+	}
+	return externalapi.NewBlockGHOSTDAGData(
+		data.BlueScore,
+		data.BlueWork,
+		data.SelectedParent,
+		data.MergeSetBlues,
+		data.MergeSetReds,
+		bluesAnticoneSizes,
+	)
+}
+
+func domainGHOSTDAGDataGHOSTDAGData(data *externalapi.BlockGHOSTDAGData) *BlockGHOSTDAGData {
+	bluesAnticoneSizes := make([]*BluesAnticoneSizes, 0, len(data.BluesAnticoneSizes()))
+	for blueHash, anticoneSize := range data.BluesAnticoneSizes() {
+		blueHashCopy := blueHash
+		bluesAnticoneSizes = append(bluesAnticoneSizes, &BluesAnticoneSizes{
+			BlueHash:     &blueHashCopy,
+			AnticoneSize: anticoneSize,
+		})
+	}
+
+	return &BlockGHOSTDAGData{
+		BlueScore:          data.BlueScore(),
+		BlueWork:           data.BlueWork(),
+		SelectedParent:     data.SelectedParent(),
+		MergeSetBlues:      data.MergeSetBlues(),
+		MergeSetReds:       data.MergeSetReds(),
+		BluesAnticoneSizes: bluesAnticoneSizes,
+	}
+}
+
+// DomainBlockWithTrustedDataToBlockWithTrustedData converts *externalapi.BlockWithTrustedData to *MsgBlockWithTrustedData
+func DomainBlockWithTrustedDataToBlockWithTrustedData(block *externalapi.BlockWithTrustedData) *MsgBlockWithTrustedData {
+	daaWindow := make([]*TrustedDataDataDAABlock, len(block.DAAWindow))
+	for i, daaBlock := range block.DAAWindow {
+		daaWindow[i] = &TrustedDataDataDAABlock{
+			Header:       DomainBlockHeaderToBlockHeader(daaBlock.Header),
+			GHOSTDAGData: domainGHOSTDAGDataGHOSTDAGData(daaBlock.GHOSTDAGData),
+		}
+	}
+
+	ghostdagData := make([]*BlockGHOSTDAGDataHashPair, len(block.GHOSTDAGData))
+	for i, datum := range block.GHOSTDAGData {
+		ghostdagData[i] = &BlockGHOSTDAGDataHashPair{
+			Hash:         datum.Hash,
+			GHOSTDAGData: domainGHOSTDAGDataGHOSTDAGData(datum.GHOSTDAGData),
+		}
+	}
+
+	return &MsgBlockWithTrustedData{
+		Block:        DomainBlockToMsgBlock(block.Block),
+		DAAScore:     block.DAAScore,
+		DAAWindow:    daaWindow,
+		GHOSTDAGData: ghostdagData,
+	}
+}

app/appmessage/message.go

@@ -45,24 +45,26 @@ const (
 	CmdRequestRelayBlocks
 	CmdInvTransaction
 	CmdRequestTransactions
-	CmdIBDBlock
 	CmdDoneHeaders
 	CmdTransactionNotFound
 	CmdReject
-	CmdHeader
 	CmdRequestNextHeaders
-	CmdRequestPruningPointUTXOSetAndBlock
+	CmdRequestPruningPointUTXOSet
 	CmdPruningPointUTXOSetChunk
-	CmdRequestIBDBlocks
 	CmdUnexpectedPruningPoint
-	CmdRequestPruningPointHash
-	CmdPruningPointHash
 	CmdIBDBlockLocator
 	CmdIBDBlockLocatorHighestHash
 	CmdIBDBlockLocatorHighestHashNotFound
 	CmdBlockHeaders
 	CmdRequestNextPruningPointUTXOSetChunk
 	CmdDonePruningPointUTXOSetChunks
+	CmdBlockBlueWork
+	CmdBlockWithTrustedData
+	CmdDoneBlocksWithTrustedData
+	CmdRequestPruningPointAndItsAnticone
+	CmdRequestBlockBlueWork
+	CmdIBDBlock
+	CmdRequestIBDBlocks
 
 	// rpc
 	CmdGetCurrentNetworkRequestMessage
@@ -150,7 +152,7 @@ var ProtocolMessageCommandToString = map[MessageCommand]string{
 	CmdVerAck:                              "VerAck",
 	CmdRequestAddresses:                    "RequestAddresses",
 	CmdAddresses:                           "Addresses",
-	CmdRequestHeaders:                      "RequestHeaders",
+	CmdRequestHeaders:                      "CmdRequestHeaders",
 	CmdBlock:                               "Block",
 	CmdTx:                                  "Tx",
 	CmdPing:                                "Ping",
@@ -161,24 +163,26 @@ var ProtocolMessageCommandToString = map[MessageCommand]string{
 	CmdRequestRelayBlocks:                  "RequestRelayBlocks",
 	CmdInvTransaction:                      "InvTransaction",
 	CmdRequestTransactions:                 "RequestTransactions",
-	CmdIBDBlock:                            "IBDBlock",
 	CmdDoneHeaders:                         "DoneHeaders",
 	CmdTransactionNotFound:                 "TransactionNotFound",
 	CmdReject:                              "Reject",
-	CmdHeader:                              "Header",
 	CmdRequestNextHeaders:                  "RequestNextHeaders",
-	CmdRequestPruningPointUTXOSetAndBlock:  "RequestPruningPointUTXOSetAndBlock",
+	CmdRequestPruningPointUTXOSet:          "RequestPruningPointUTXOSet",
 	CmdPruningPointUTXOSetChunk:            "PruningPointUTXOSetChunk",
-	CmdRequestIBDBlocks:                    "RequestIBDBlocks",
 	CmdUnexpectedPruningPoint:              "UnexpectedPruningPoint",
-	CmdRequestPruningPointHash:             "RequestPruningPointHashHash",
-	CmdPruningPointHash:                    "PruningPointHash",
 	CmdIBDBlockLocator:                     "IBDBlockLocator",
 	CmdIBDBlockLocatorHighestHash:          "IBDBlockLocatorHighestHash",
 	CmdIBDBlockLocatorHighestHashNotFound:  "IBDBlockLocatorHighestHashNotFound",
 	CmdBlockHeaders:                        "BlockHeaders",
 	CmdRequestNextPruningPointUTXOSetChunk: "RequestNextPruningPointUTXOSetChunk",
 	CmdDonePruningPointUTXOSetChunks:       "DonePruningPointUTXOSetChunks",
+	CmdBlockBlueWork:                       "BlockBlueWork",
+	CmdBlockWithTrustedData:                "BlockWithTrustedData",
+	CmdDoneBlocksWithTrustedData:           "DoneBlocksWithTrustedData",
+	CmdRequestPruningPointAndItsAnticone:   "RequestPruningPointAndItsAnticoneHeaders",
+	CmdRequestBlockBlueWork:                "RequestBlockBlueWork",
+	CmdIBDBlock:                            "IBDBlock",
+	CmdRequestIBDBlocks:                    "RequestIBDBlocks",
 }
 
 // RPCMessageCommandToString maps all MessageCommands to their string representation

app/appmessage/p2p_msgblockbluework.go

@@ -0,0 +1,23 @@
+package appmessage
+
+import (
+	"math/big"
+)
+
+// MsgBlockBlueWork represents a kaspa BlockBlueWork message
+type MsgBlockBlueWork struct {
+	baseMessage
+	BlueWork *big.Int
+}
+
+// Command returns the protocol command string for the message
+func (msg *MsgBlockBlueWork) Command() MessageCommand {
+	return CmdBlockBlueWork
+}
+
+// NewBlockBlueWork returns a new kaspa BlockBlueWork message
+func NewBlockBlueWork(blueWork *big.Int) *MsgBlockBlueWork {
+	return &MsgBlockBlueWork{
+		BlueWork: blueWork,
+	}
+}

app/appmessage/p2p_msgblockheader.go

@@ -81,12 +81,6 @@ func (h *MsgBlockHeader) IsGenesis() bool {
 	return h.NumParentBlocks() == 0
 }
 
-// Command returns the protocol command string for the message. This is part
-// of the Message interface implementation.
-func (h *MsgBlockHeader) Command() MessageCommand {
-	return CmdHeader
-}
-
 // NewBlockHeader returns a new MsgBlockHeader using the provided version, previous
 // block hash, hash merkle root, accepted ID merkle root, difficulty bits, and nonce used to generate the
 // block with defaults or calclulated values for the remaining fields.

app/appmessage/p2p_msgblockwithtrusteddata.go

@@ -0,0 +1,54 @@
+package appmessage
+
+import (
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"math/big"
+)
+
+// MsgBlockWithTrustedData represents a kaspa BlockWithTrustedData message
+type MsgBlockWithTrustedData struct {
+	baseMessage
+
+	Block        *MsgBlock
+	DAAScore     uint64
+	DAAWindow    []*TrustedDataDataDAABlock
+	GHOSTDAGData []*BlockGHOSTDAGDataHashPair
+}
+
+// Command returns the protocol command string for the message
+func (msg *MsgBlockWithTrustedData) Command() MessageCommand {
+	return CmdBlockWithTrustedData
+}
+
+// NewMsgBlockWithTrustedData returns a new MsgBlockWithTrustedData.
+func NewMsgBlockWithTrustedData() *MsgBlockWithTrustedData {
+	return &MsgBlockWithTrustedData{}
+}
+
+// TrustedDataDataDAABlock is an appmessage representation of externalapi.TrustedDataDataDAABlock
+type TrustedDataDataDAABlock struct {
+	Header       *MsgBlockHeader
+	GHOSTDAGData *BlockGHOSTDAGData
+}
+
+// BlockGHOSTDAGData is an appmessage representation of externalapi.BlockGHOSTDAGData
+type BlockGHOSTDAGData struct {
+	BlueScore          uint64
+	BlueWork           *big.Int
+	SelectedParent     *externalapi.DomainHash
+	MergeSetBlues      []*externalapi.DomainHash
+	MergeSetReds       []*externalapi.DomainHash
+	BluesAnticoneSizes []*BluesAnticoneSizes
+}
+
+// BluesAnticoneSizes is an appmessage representation of the BluesAnticoneSizes part of GHOSTDAG data.
+type BluesAnticoneSizes struct {
+	BlueHash     *externalapi.DomainHash
+	AnticoneSize externalapi.KType
+}
+
+// BlockGHOSTDAGDataHashPair is an appmessage representation of externalapi.BlockGHOSTDAGDataHashPair
+type BlockGHOSTDAGDataHashPair struct {
+	Hash         *externalapi.DomainHash
+	GHOSTDAGData *BlockGHOSTDAGData
+}

app/appmessage/p2p_msgdoneblockswithmetadata.go

@@ -0,0 +1,21 @@
+package appmessage
+
+// MsgDoneBlocksWithTrustedData implements the Message interface and represents a kaspa
+// DoneBlocksWithTrustedData message
+//
+// This message has no payload.
+type MsgDoneBlocksWithTrustedData struct {
+	baseMessage
+}
+
+// Command returns the protocol command string for the message. This is part
+// of the Message interface implementation.
+func (msg *MsgDoneBlocksWithTrustedData) Command() MessageCommand {
+	return CmdDoneBlocksWithTrustedData
+}
+
+// NewMsgDoneBlocksWithTrustedData returns a new kaspa DoneBlocksWithTrustedData message that conforms to the
+// Message interface.
+func NewMsgDoneBlocksWithTrustedData() *MsgDoneBlocksWithTrustedData {
+	return &MsgDoneBlocksWithTrustedData{}
+}

app/appmessage/p2p_msgdrequestpruningpointanditsanticoneheaders.go

@@ -0,0 +1,16 @@
+package appmessage
+
+// MsgRequestPruningPointAndItsAnticone represents a kaspa RequestPruningPointAndItsAnticone message
+type MsgRequestPruningPointAndItsAnticone struct {
+	baseMessage
+}
+
+// Command returns the protocol command string for the message
+func (msg *MsgRequestPruningPointAndItsAnticone) Command() MessageCommand {
+	return CmdRequestPruningPointAndItsAnticone
+}
+
+// NewMsgRequestPruningPointAndItsAnticone returns a new MsgRequestPruningPointAndItsAnticone.
+func NewMsgRequestPruningPointAndItsAnticone() *MsgRequestPruningPointAndItsAnticone {
+	return &MsgRequestPruningPointAndItsAnticone{}
+}

app/appmessage/p2p_msgibdblock_test.go

@@ -1,65 +0,0 @@
-// Copyright (c) 2013-2016 The btcsuite developers
-// Use of this source code is governed by an ISC
-// license that can be found in the LICENSE file.
-
-package appmessage
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-// TestIBDBlock tests the MsgIBDBlock API.
-func TestIBDBlock(t *testing.T) {
-	pver := ProtocolVersion
-
-	// Block 1 header.
-	parentHashes := blockOne.Header.ParentHashes
-	hashMerkleRoot := blockOne.Header.HashMerkleRoot
-	acceptedIDMerkleRoot := blockOne.Header.AcceptedIDMerkleRoot
-	utxoCommitment := blockOne.Header.UTXOCommitment
-	bits := blockOne.Header.Bits
-	nonce := blockOne.Header.Nonce
-	bh := NewBlockHeader(1, parentHashes, hashMerkleRoot, acceptedIDMerkleRoot, utxoCommitment, bits, nonce)
-
-	// Ensure the command is expected value.
-	wantCmd := MessageCommand(15)
-	msg := NewMsgIBDBlock(NewMsgBlock(bh))
-	if cmd := msg.Command(); cmd != wantCmd {
-		t.Errorf("NewMsgIBDBlock: wrong command - got %v want %v",
-			cmd, wantCmd)
-	}
-
-	// Ensure max payload is expected value for latest protocol version.
-	wantPayload := uint32(1024 * 1024 * 32)
-	maxPayload := msg.MaxPayloadLength(pver)
-	if maxPayload != wantPayload {
-		t.Errorf("MaxPayloadLength: wrong max payload length for "+
-			"protocol version %d - got %v, want %v", pver,
-			maxPayload, wantPayload)
-	}
-
-	// Ensure we get the same block header data back out.
-	if !reflect.DeepEqual(&msg.Header, bh) {
-		t.Errorf("NewMsgIBDBlock: wrong block header - got %v, want %v",
-			spew.Sdump(&msg.Header), spew.Sdump(bh))
-	}
-
-	// Ensure transactions are added properly.
-	tx := blockOne.Transactions[0].Copy()
-	msg.AddTransaction(tx)
-	if !reflect.DeepEqual(msg.Transactions, blockOne.Transactions) {
-		t.Errorf("AddTransaction: wrong transactions - got %v, want %v",
-			spew.Sdump(msg.Transactions),
-			spew.Sdump(blockOne.Transactions))
-	}
-
-	// Ensure transactions are properly cleared.
-	msg.ClearTransactions()
-	if len(msg.Transactions) != 0 {
-		t.Errorf("ClearTransactions: wrong transactions - got %v, want %v",
-			len(msg.Transactions), 0)
-	}
-}

app/appmessage/p2p_msgpruningpointhash.go

@@ -1,23 +0,0 @@
-package appmessage
-
-import (
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-)
-
-// MsgPruningPointHashMessage represents a kaspa PruningPointHash message
-type MsgPruningPointHashMessage struct {
-	baseMessage
-	Hash *externalapi.DomainHash
-}
-
-// Command returns the protocol command string for the message
-func (msg *MsgPruningPointHashMessage) Command() MessageCommand {
-	return CmdPruningPointHash
-}
-
-// NewPruningPointHashMessage returns a new kaspa PruningPointHash message
-func NewPruningPointHashMessage(hash *externalapi.DomainHash) *MsgPruningPointHashMessage {
-	return &MsgPruningPointHashMessage{
-		Hash: hash,
-	}
-}

app/appmessage/p2p_msgrequestblockbluework.go

@@ -0,0 +1,23 @@
+package appmessage
+
+import (
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+)
+
+// MsgRequestBlockBlueWork represents a kaspa RequestBlockBlueWork message
+type MsgRequestBlockBlueWork struct {
+	baseMessage
+	Hash *externalapi.DomainHash
+}
+
+// Command returns the protocol command string for the message
+func (msg *MsgRequestBlockBlueWork) Command() MessageCommand {
+	return CmdRequestBlockBlueWork
+}
+
+// NewRequestBlockBlueWork returns a new kaspa RequestBlockBlueWork message
+func NewRequestBlockBlueWork(hash *externalapi.DomainHash) *MsgRequestBlockBlueWork {
+	return &MsgRequestBlockBlueWork{
+		Hash: hash,
+	}
+}

app/appmessage/p2p_msgrequestblocklocator.go

@@ -10,7 +10,6 @@ import (
 // The locator is returned via a locator message (MsgBlockLocator).
 type MsgRequestBlockLocator struct {
 	baseMessage
-	LowHash  *externalapi.DomainHash
 	HighHash *externalapi.DomainHash
 	Limit    uint32
 }
@@ -24,9 +23,8 @@ func (msg *MsgRequestBlockLocator) Command() MessageCommand {
 // NewMsgRequestBlockLocator returns a new RequestBlockLocator message that conforms to the
 // Message interface using the passed parameters and defaults for the remaining
 // fields.
-func NewMsgRequestBlockLocator(lowHash, highHash *externalapi.DomainHash, limit uint32) *MsgRequestBlockLocator {
+func NewMsgRequestBlockLocator(highHash *externalapi.DomainHash, limit uint32) *MsgRequestBlockLocator {
 	return &MsgRequestBlockLocator{
-		LowHash:  lowHash,
 		HighHash: highHash,
 		Limit:    limit,
 	}

app/appmessage/p2p_msgrequestblocklocator_test.go

@@ -16,7 +16,7 @@ func TestRequestBlockLocator(t *testing.T) {
 
 	// Ensure the command is expected value.
 	wantCmd := MessageCommand(9)
-	msg := NewMsgRequestBlockLocator(highHash, &externalapi.DomainHash{}, 0)
+	msg := NewMsgRequestBlockLocator(highHash, 0)
 	if cmd := msg.Command(); cmd != wantCmd {
 		t.Errorf("NewMsgRequestBlockLocator: wrong command - got %v want %v",
 			cmd, wantCmd)

app/appmessage/p2p_msgrequestheaders_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 )
 
-// TestRequstIBDBlocks tests the MsgRequestHeaders API.
+// TestRequstIBDBlocks tests the MsgRequestIBDBlocks API.
 func TestRequstIBDBlocks(t *testing.T) {
 	hashStr := "000000000002e7ad7b9eef9479e4aabc65cb831269cc20d2632c13684406dee0"
 	lowHash, err := externalapi.NewDomainHashFromString(hashStr)
@@ -27,14 +27,14 @@ func TestRequstIBDBlocks(t *testing.T) {
 	// Ensure we get the same data back out.
 	msg := NewMsgRequstHeaders(lowHash, highHash)
 	if !msg.HighHash.Equal(highHash) {
-		t.Errorf("NewMsgRequstHeaders: wrong high hash - got %v, want %v",
+		t.Errorf("NewMsgRequstIBDBlocks: wrong high hash - got %v, want %v",
 			msg.HighHash, highHash)
 	}
 
 	// Ensure the command is expected value.
 	wantCmd := MessageCommand(4)
 	if cmd := msg.Command(); cmd != wantCmd {
-		t.Errorf("NewMsgRequstHeaders: wrong command - got %v want %v",
+		t.Errorf("NewMsgRequstIBDBlocks: wrong command - got %v want %v",
 			cmd, wantCmd)
 	}
 }

app/appmessage/p2p_msgrequestpruningpointutxosetandblock.go

@@ -4,20 +4,20 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 )
 
-// MsgRequestPruningPointUTXOSetAndBlock represents a kaspa RequestPruningPointUTXOSetAndBlock message
-type MsgRequestPruningPointUTXOSetAndBlock struct {
+// MsgRequestPruningPointUTXOSet represents a kaspa RequestPruningPointUTXOSet message
+type MsgRequestPruningPointUTXOSet struct {
 	baseMessage
 	PruningPointHash *externalapi.DomainHash
 }
 
 // Command returns the protocol command string for the message
-func (msg *MsgRequestPruningPointUTXOSetAndBlock) Command() MessageCommand {
-	return CmdRequestPruningPointUTXOSetAndBlock
+func (msg *MsgRequestPruningPointUTXOSet) Command() MessageCommand {
+	return CmdRequestPruningPointUTXOSet
 }
 
-// NewMsgRequestPruningPointUTXOSetAndBlock returns a new MsgRequestPruningPointUTXOSetAndBlock
-func NewMsgRequestPruningPointUTXOSetAndBlock(pruningPointHash *externalapi.DomainHash) *MsgRequestPruningPointUTXOSetAndBlock {
-	return &MsgRequestPruningPointUTXOSetAndBlock{
+// NewMsgRequestPruningPointUTXOSet returns a new MsgRequestPruningPointUTXOSet
+func NewMsgRequestPruningPointUTXOSet(pruningPointHash *externalapi.DomainHash) *MsgRequestPruningPointUTXOSet {
+	return &MsgRequestPruningPointUTXOSet{
 		PruningPointHash: pruningPointHash,
 	}
 }

app/appmessage/p2p_msgtx.go

@@ -90,16 +90,18 @@ type TxIn struct {
 	PreviousOutpoint Outpoint
 	SignatureScript  []byte
 	Sequence         uint64
+	SigOpCount       byte
 }
 
 // NewTxIn returns a new kaspa transaction input with the provided
 // previous outpoint point and signature script with a default sequence of
 // MaxTxInSequenceNum.
-func NewTxIn(prevOut *Outpoint, signatureScript []byte, sequence uint64) *TxIn {
+func NewTxIn(prevOut *Outpoint, signatureScript []byte, sequence uint64, sigOpCount byte) *TxIn {
 	return &TxIn{
 		PreviousOutpoint: *prevOut,
 		SignatureScript:  signatureScript,
 		Sequence:         sequence,
+		SigOpCount:       sigOpCount,
 	}
 }
 
@@ -206,6 +208,7 @@ func (msg *MsgTx) Copy() *MsgTx {
 			PreviousOutpoint: newOutpoint,
 			SignatureScript:  newScript,
 			Sequence:         oldTxIn.Sequence,
+			SigOpCount:       oldTxIn.SigOpCount,
 		}
 
 		// Finally, append this fully copied txin.

app/appmessage/p2p_msgtx_test.go

@@ -68,7 +68,7 @@ func TestTx(t *testing.T) {
 
 	// Ensure we get the same transaction input back out.
 	sigScript := []byte{0x04, 0x31, 0xdc, 0x00, 0x1b, 0x01, 0x62}
-	txIn := NewTxIn(prevOut, sigScript, constants.MaxTxInSequenceNum)
+	txIn := NewTxIn(prevOut, sigScript, constants.MaxTxInSequenceNum, 1)
 	if !reflect.DeepEqual(&txIn.PreviousOutpoint, prevOut) {
 		t.Errorf("NewTxIn: wrong prev outpoint - got %v, want %v",
 			spew.Sprint(&txIn.PreviousOutpoint),

app/appmessage/p2p_requestpruningpointhash.go

@@ -1,16 +0,0 @@
-package appmessage
-
-// MsgRequestPruningPointHashMessage represents a kaspa RequestPruningPointHashMessage message
-type MsgRequestPruningPointHashMessage struct {
-	baseMessage
-}
-
-// Command returns the protocol command string for the message
-func (msg *MsgRequestPruningPointHashMessage) Command() MessageCommand {
-	return CmdRequestPruningPointHash
-}
-
-// NewMsgRequestPruningPointHashMessage returns a new kaspa RequestPruningPointHash message
-func NewMsgRequestPruningPointHashMessage() *MsgRequestPruningPointHashMessage {
-	return &MsgRequestPruningPointHashMessage{}
-}

app/appmessage/rpc_get_info.go

@@ -20,8 +20,9 @@ func NewGetInfoRequestMessage() *GetInfoRequestMessage {
 // its respective RPC message
 type GetInfoResponseMessage struct {
 	baseMessage
-	P2PID       string
-	MempoolSize uint64
+	P2PID         string
+	MempoolSize   uint64
+	ServerVersion string
 
 	Error *RPCError
 }
@@ -32,9 +33,10 @@ func (msg *GetInfoResponseMessage) Command() MessageCommand {
 }
 
 // NewGetInfoResponseMessage returns a instance of the message
-func NewGetInfoResponseMessage(p2pID string, mempoolSize uint64) *GetInfoResponseMessage {
+func NewGetInfoResponseMessage(p2pID string, mempoolSize uint64, serverVersion string) *GetInfoResponseMessage {
 	return &GetInfoResponseMessage{
-		P2PID:       p2pID,
-		MempoolSize: mempoolSize,
+		P2PID:         p2pID,
+		MempoolSize:   mempoolSize,
+		ServerVersion: serverVersion,
 	}
 }

app/appmessage/rpc_get_virtual_selected_parent_chain_from_block.go

@@ -24,7 +24,7 @@ func NewGetVirtualSelectedParentChainFromBlockRequestMessage(startHash string) *
 type GetVirtualSelectedParentChainFromBlockResponseMessage struct {
 	baseMessage
 	RemovedChainBlockHashes []string
-	AddedChainBlocks        []*ChainBlock
+	AddedChainBlockHashes   []string
 
 	Error *RPCError
 }
@@ -35,11 +35,11 @@ func (msg *GetVirtualSelectedParentChainFromBlockResponseMessage) Command() Mess
 }
 
 // NewGetVirtualSelectedParentChainFromBlockResponseMessage returns a instance of the message
-func NewGetVirtualSelectedParentChainFromBlockResponseMessage(removedChainBlockHashes []string,
-	addedChainBlocks []*ChainBlock) *GetVirtualSelectedParentChainFromBlockResponseMessage {
+func NewGetVirtualSelectedParentChainFromBlockResponseMessage(removedChainBlockHashes,
+	addedChainBlockHashes []string) *GetVirtualSelectedParentChainFromBlockResponseMessage {
 
 	return &GetVirtualSelectedParentChainFromBlockResponseMessage{
 		RemovedChainBlockHashes: removedChainBlockHashes,
-		AddedChainBlocks:        addedChainBlocks,
+		AddedChainBlockHashes:   addedChainBlockHashes,
 	}
 }

app/appmessage/rpc_notify_virtual_selected_parent_chain_changed.go

@@ -38,19 +38,7 @@ func NewNotifyVirtualSelectedParentChainChangedResponseMessage() *NotifyVirtualS
 type VirtualSelectedParentChainChangedNotificationMessage struct {
 	baseMessage
 	RemovedChainBlockHashes []string
-	AddedChainBlocks        []*ChainBlock
-}
-
-// ChainBlock represents a DAG chain-block
-type ChainBlock struct {
-	Hash           string
-	AcceptedBlocks []*AcceptedBlock
-}
-
-// AcceptedBlock represents a block accepted into the DAG
-type AcceptedBlock struct {
-	Hash                   string
-	AcceptedTransactionIDs []string
+	AddedChainBlockHashes   []string
 }
 
 // Command returns the protocol command string for the message
@@ -59,11 +47,11 @@ func (msg *VirtualSelectedParentChainChangedNotificationMessage) Command() Messa
 }
 
 // NewVirtualSelectedParentChainChangedNotificationMessage returns a instance of the message
-func NewVirtualSelectedParentChainChangedNotificationMessage(removedChainBlockHashes []string,
-	addedChainBlocks []*ChainBlock) *VirtualSelectedParentChainChangedNotificationMessage {
+func NewVirtualSelectedParentChainChangedNotificationMessage(removedChainBlockHashes,
+	addedChainBlocks []string) *VirtualSelectedParentChainChangedNotificationMessage {
 
 	return &VirtualSelectedParentChainChangedNotificationMessage{
 		RemovedChainBlockHashes: removedChainBlockHashes,
-		AddedChainBlocks:        addedChainBlocks,
+		AddedChainBlockHashes:   addedChainBlocks,
 	}
 }

app/appmessage/rpc_submit_transaction.go

@@ -5,6 +5,7 @@ package appmessage
 type SubmitTransactionRequestMessage struct {
 	baseMessage
 	Transaction *RPCTransaction
+	AllowOrphan bool
 }
 
 // Command returns the protocol command string for the message
@@ -13,9 +14,10 @@ func (msg *SubmitTransactionRequestMessage) Command() MessageCommand {
 }
 
 // NewSubmitTransactionRequestMessage returns a instance of the message
-func NewSubmitTransactionRequestMessage(transaction *RPCTransaction) *SubmitTransactionRequestMessage {
+func NewSubmitTransactionRequestMessage(transaction *RPCTransaction, allowOrphan bool) *SubmitTransactionRequestMessage {
 	return &SubmitTransactionRequestMessage{
 		Transaction: transaction,
+		AllowOrphan: allowOrphan,
 	}
 }
 
@@ -59,6 +61,7 @@ type RPCTransactionInput struct {
 	PreviousOutpoint *RPCOutpoint
 	SignatureScript  string
 	Sequence         uint64
+	SigOpCount       byte
 	VerboseData      *RPCTransactionInputVerboseData
 }
 
@@ -96,7 +99,7 @@ type RPCUTXOEntry struct {
 type RPCTransactionVerboseData struct {
 	TransactionID string
 	Hash          string
-	Size          uint64
+	Mass          uint64
 	BlockHash     string
 	BlockTime     uint64
 }

app/component_manager.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"sync/atomic"
 
+	"github.com/kaspanet/kaspad/domain/miningmanager/mempool"
+
 	"github.com/kaspanet/kaspad/app/protocol"
 	"github.com/kaspanet/kaspad/app/rpc"
 	"github.com/kaspanet/kaspad/domain"
@@ -79,8 +81,11 @@ func NewComponentManager(cfg *config.Config, db infrastructuredatabase.Database,
 		IsArchival:                      cfg.IsArchivalNode,
 		EnableSanityCheckPruningUTXOSet: cfg.EnableSanityCheckPruningUTXOSet,
 	}
+	mempoolConfig := mempool.DefaultConfig(&consensusConfig.Params)
+	mempoolConfig.MaximumOrphanTransactionCount = cfg.MaxOrphanTxs
+	mempoolConfig.MinimumRelayTransactionFee = cfg.MinRelayTxFee
 
-	domain, err := domain.New(&consensusConfig, db)
+	domain, err := domain.New(&consensusConfig, mempoolConfig, db)
 	if err != nil {
 		return nil, err
 	}

app/protocol/flowcontext/blocks.go

@@ -1,13 +1,14 @@
 package flowcontext
 
 import (
+	"time"
+
 	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"
-
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
+	"github.com/pkg/errors"
 
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/protocol/flows/blockrelay"
@@ -71,8 +72,6 @@ func (f *FlowContext) OnPruningPointUTXOSetOverride() error {
 func (f *FlowContext) broadcastTransactionsAfterBlockAdded(
 	addedBlocks []*externalapi.DomainBlock, transactionsAcceptedToMempool []*externalapi.DomainTransaction) error {
 
-	f.updateTransactionsToRebroadcast(addedBlocks)
-
 	// Don't relay transactions when in IBD.
 	if f.IsIBDRunning() {
 		return nil
@@ -80,7 +79,12 @@ func (f *FlowContext) broadcastTransactionsAfterBlockAdded(
 
 	var txIDsToRebroadcast []*externalapi.DomainTransactionID
 	if f.shouldRebroadcastTransactions() {
-		txIDsToRebroadcast = f.txIDsToRebroadcast()
+		txsToRebroadcast, err := f.Domain().MiningManager().RevalidateHighPriorityTransactions()
+		if err != nil {
+			return err
+		}
+		txIDsToRebroadcast = consensushashing.TransactionIDs(txsToRebroadcast)
+		f.lastRebroadcastTime = time.Now()
 	}
 
 	txIDsToBroadcast := make([]*externalapi.DomainTransactionID, len(transactionsAcceptedToMempool)+len(txIDsToRebroadcast))
@@ -91,15 +95,7 @@ func (f *FlowContext) broadcastTransactionsAfterBlockAdded(
 	for i, txID := range txIDsToRebroadcast {
 		txIDsToBroadcast[offset+i] = txID
 	}
-
-	if len(txIDsToBroadcast) == 0 {
-		return nil
-	}
-	if len(txIDsToBroadcast) > appmessage.MaxInvPerTxInvMsg {
-		txIDsToBroadcast = txIDsToBroadcast[:appmessage.MaxInvPerTxInvMsg]
-	}
-	inv := appmessage.NewMsgInvTransaction(txIDsToBroadcast)
-	return f.Broadcast(inv)
+	return f.EnqueueTransactionIDsForPropagation(txIDsToBroadcast)
 }
 
 // SharedRequestedBlocks returns a *blockrelay.SharedRequestedBlocks for sharing
@@ -114,7 +110,7 @@ func (f *FlowContext) AddBlock(block *externalapi.DomainBlock) error {
 		return protocolerrors.Errorf(false, "cannot add header only block")
 	}
 
-	blockInsertionResult, err := f.Domain().Consensus().ValidateAndInsertBlock(block)
+	blockInsertionResult, err := f.Domain().Consensus().ValidateAndInsertBlock(block, true)
 	if err != nil {
 		if errors.As(err, &ruleerrors.RuleError{}) {
 			log.Warnf("Validation failed for block %s: %s", consensushashing.BlockHash(block), err)
@@ -161,7 +157,6 @@ func (f *FlowContext) UnsetIBDRunning() {
 	}
 
 	f.ibdPeer = nil
-	log.Infof("IBD finished")
 }
 
 // IBDPeer returns the current IBD peer or null if the node is not

app/protocol/flowcontext/errors.go

@@ -29,3 +29,8 @@ func (*FlowContext) HandleError(err error, flowName string, isStopping *uint32,
 		errChan <- err
 	}
 }
+
+// IsRecoverableError returns whether the error is recoverable
+func (*FlowContext) IsRecoverableError(err error) bool {
+	return err == nil || errors.Is(err, router.ErrRouteClosed) || errors.As(err, &protocolerrors.ProtocolError{})
+}

app/protocol/flowcontext/flow_context.go

@@ -1,10 +1,11 @@
 package flowcontext
 
 import (
-	"github.com/kaspanet/kaspad/util/mstime"
 	"sync"
 	"time"
 
+	"github.com/kaspanet/kaspad/util/mstime"
+
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 
 	"github.com/kaspanet/kaspad/domain"
@@ -46,10 +47,8 @@ type FlowContext struct {
 	onPruningPointUTXOSetOverrideHandler OnPruningPointUTXOSetOverrideHandler
 	onTransactionAddedToMempoolHandler   OnTransactionAddedToMempoolHandler
 
-	transactionsToRebroadcastLock sync.Mutex
-	transactionsToRebroadcast     map[externalapi.DomainTransactionID]*externalapi.DomainTransaction
-	lastRebroadcastTime           time.Time
-	sharedRequestedTransactions   *transactionrelay.SharedRequestedTransactions
+	lastRebroadcastTime         time.Time
+	sharedRequestedTransactions *transactionrelay.SharedRequestedTransactions
 
 	sharedRequestedBlocks *blockrelay.SharedRequestedBlocks
 
@@ -62,6 +61,10 @@ type FlowContext struct {
 	orphans      map[externalapi.DomainHash]*externalapi.DomainBlock
 	orphansMutex sync.RWMutex
 
+	transactionIDsToPropagate        []*externalapi.DomainTransactionID
+	lastTransactionIDPropagationTime time.Time
+	transactionIDPropagationLock     sync.Mutex
+
 	shutdownChan chan struct{}
 }
 
@@ -70,18 +73,19 @@ func New(cfg *config.Config, domain domain.Domain, addressManager *addressmanage
 	netAdapter *netadapter.NetAdapter, connectionManager *connmanager.ConnectionManager) *FlowContext {
 
 	return &FlowContext{
-		cfg:                         cfg,
-		netAdapter:                  netAdapter,
-		domain:                      domain,
-		addressManager:              addressManager,
-		connectionManager:           connectionManager,
-		sharedRequestedTransactions: transactionrelay.NewSharedRequestedTransactions(),
-		sharedRequestedBlocks:       blockrelay.NewSharedRequestedBlocks(),
-		peers:                       make(map[id.ID]*peerpkg.Peer),
-		transactionsToRebroadcast:   make(map[externalapi.DomainTransactionID]*externalapi.DomainTransaction),
-		orphans:                     make(map[externalapi.DomainHash]*externalapi.DomainBlock),
-		timeStarted:                 mstime.Now().UnixMilliseconds(),
-		shutdownChan:                make(chan struct{}),
+		cfg:                              cfg,
+		netAdapter:                       netAdapter,
+		domain:                           domain,
+		addressManager:                   addressManager,
+		connectionManager:                connectionManager,
+		sharedRequestedTransactions:      transactionrelay.NewSharedRequestedTransactions(),
+		sharedRequestedBlocks:            blockrelay.NewSharedRequestedBlocks(),
+		peers:                            make(map[id.ID]*peerpkg.Peer),
+		orphans:                          make(map[externalapi.DomainHash]*externalapi.DomainBlock),
+		timeStarted:                      mstime.Now().UnixMilliseconds(),
+		transactionIDsToPropagate:        []*externalapi.DomainTransactionID{},
+		lastTransactionIDPropagationTime: time.Now(),
+		shutdownChan:                     make(chan struct{}),
 	}
 }
 

app/protocol/flowcontext/orphans.go

@@ -150,7 +150,7 @@ func (f *FlowContext) unorphanBlock(orphanHash externalapi.DomainHash) (*externa
 	}
 	delete(f.orphans, orphanHash)
 
-	blockInsertionResult, err := f.domain.Consensus().ValidateAndInsertBlock(orphanBlock)
+	blockInsertionResult, err := f.domain.Consensus().ValidateAndInsertBlock(orphanBlock, true)
 	if err != nil {
 		if errors.As(err, &ruleerrors.RuleError{}) {
 			log.Warnf("Validation failed for orphan block %s: %s", orphanHash, err)

app/protocol/flowcontext/transactions.go

@@ -9,34 +9,18 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
 )
 
-// AddTransaction adds transaction to the mempool and propagates it.
-func (f *FlowContext) AddTransaction(tx *externalapi.DomainTransaction) error {
-	f.transactionsToRebroadcastLock.Lock()
-	defer f.transactionsToRebroadcastLock.Unlock()
+// TransactionIDPropagationInterval is the interval between transaction IDs propagations
+const TransactionIDPropagationInterval = 500 * time.Millisecond
 
-	err := f.Domain().MiningManager().ValidateAndInsertTransaction(tx, false)
+// AddTransaction adds transaction to the mempool and propagates it.
+func (f *FlowContext) AddTransaction(tx *externalapi.DomainTransaction, allowOrphan bool) error {
+	acceptedTransactions, err := f.Domain().MiningManager().ValidateAndInsertTransaction(tx, true, allowOrphan)
 	if err != nil {
 		return err
 	}
 
-	transactionID := consensushashing.TransactionID(tx)
-	f.transactionsToRebroadcast[*transactionID] = tx
-	inv := appmessage.NewMsgInvTransaction([]*externalapi.DomainTransactionID{transactionID})
-	return f.Broadcast(inv)
-}
-
-func (f *FlowContext) updateTransactionsToRebroadcast(addedBlocks []*externalapi.DomainBlock) {
-	f.transactionsToRebroadcastLock.Lock()
-	defer f.transactionsToRebroadcastLock.Unlock()
-
-	for _, block := range addedBlocks {
-		// Note: if a transaction is included in the DAG but not accepted,
-		// it won't be rebroadcast anymore, although it is not included in
-		// the UTXO set
-		for _, tx := range block.Transactions {
-			delete(f.transactionsToRebroadcast, *consensushashing.TransactionID(tx))
-		}
-	}
+	acceptedTransactionIDs := consensushashing.TransactionIDs(acceptedTransactions)
+	return f.EnqueueTransactionIDsForPropagation(acceptedTransactionIDs)
 }
 
 func (f *FlowContext) shouldRebroadcastTransactions() bool {
@@ -44,19 +28,6 @@ func (f *FlowContext) shouldRebroadcastTransactions() bool {
 	return time.Since(f.lastRebroadcastTime) > rebroadcastInterval
 }
 
-func (f *FlowContext) txIDsToRebroadcast() []*externalapi.DomainTransactionID {
-	f.transactionsToRebroadcastLock.Lock()
-	defer f.transactionsToRebroadcastLock.Unlock()
-
-	txIDs := make([]*externalapi.DomainTransactionID, len(f.transactionsToRebroadcast))
-	i := 0
-	for _, tx := range f.transactionsToRebroadcast {
-		txIDs[i] = consensushashing.TransactionID(tx)
-		i++
-	}
-	return txIDs
-}
-
 // SharedRequestedTransactions returns a *transactionrelay.SharedRequestedTransactions for sharing
 // data about requested transactions between different peers.
 func (f *FlowContext) SharedRequestedTransactions() *transactionrelay.SharedRequestedTransactions {
@@ -70,3 +41,42 @@ func (f *FlowContext) OnTransactionAddedToMempool() {
 		f.onTransactionAddedToMempoolHandler()
 	}
 }
+
+// EnqueueTransactionIDsForPropagation add the given transactions IDs to a set of IDs to
+// propagate. The IDs will be broadcast to all peers within a single transaction Inv message.
+// The broadcast itself may happen only during a subsequent call to this method
+func (f *FlowContext) EnqueueTransactionIDsForPropagation(transactionIDs []*externalapi.DomainTransactionID) error {
+	f.transactionIDPropagationLock.Lock()
+	defer f.transactionIDPropagationLock.Unlock()
+
+	f.transactionIDsToPropagate = append(f.transactionIDsToPropagate, transactionIDs...)
+
+	return f.maybePropagateTransactions()
+}
+
+func (f *FlowContext) maybePropagateTransactions() error {
+	if time.Since(f.lastTransactionIDPropagationTime) < TransactionIDPropagationInterval &&
+		len(f.transactionIDsToPropagate) < appmessage.MaxInvPerTxInvMsg {
+		return nil
+	}
+
+	for len(f.transactionIDsToPropagate) > 0 {
+		transactionIDsToBroadcast := f.transactionIDsToPropagate
+		if len(transactionIDsToBroadcast) > appmessage.MaxInvPerTxInvMsg {
+			transactionIDsToBroadcast = f.transactionIDsToPropagate[:len(transactionIDsToBroadcast)]
+		}
+		log.Debugf("Transaction propagation: broadcasting %d transactions", len(transactionIDsToBroadcast))
+
+		inv := appmessage.NewMsgInvTransaction(transactionIDsToBroadcast)
+		err := f.Broadcast(inv)
+		if err != nil {
+			return err
+		}
+
+		f.transactionIDsToPropagate = f.transactionIDsToPropagate[len(transactionIDsToBroadcast):]
+	}
+
+	f.lastTransactionIDPropagationTime = time.Now()
+
+	return nil
+}

app/protocol/flows/blockrelay/block_locator.go

@@ -7,10 +7,8 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 )
 
-func (flow *handleRelayInvsFlow) sendGetBlockLocator(lowHash *externalapi.DomainHash,
-	highHash *externalapi.DomainHash, limit uint32) error {
-
-	msgGetBlockLocator := appmessage.NewMsgRequestBlockLocator(lowHash, highHash, limit)
+func (flow *handleRelayInvsFlow) sendGetBlockLocator(highHash *externalapi.DomainHash, limit uint32) error {
+	msgGetBlockLocator := appmessage.NewMsgRequestBlockLocator(highHash, limit)
 	return flow.outgoingRoute.Enqueue(msgGetBlockLocator)
 }
 

app/protocol/flows/blockrelay/handle_block_blue_work_requests.go

@@ -0,0 +1,42 @@
+package blockrelay
+
+import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
+	"github.com/kaspanet/kaspad/domain"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+)
+
+// BlockBlueWorkRequestsContext is the interface for the context needed for the HandleBlockBlueWorkRequests flow.
+type BlockBlueWorkRequestsContext interface {
+	Domain() domain.Domain
+}
+
+// HandleBlockBlueWorkRequests listens to appmessage.MsgRequestBlockBlueWork messages and sends
+// their corresponding blue work to the requesting peer.
+func HandleBlockBlueWorkRequests(context BlockBlueWorkRequestsContext, incomingRoute *router.Route,
+	outgoingRoute *router.Route, peer *peerpkg.Peer) error {
+
+	for {
+		message, err := incomingRoute.Dequeue()
+		if err != nil {
+			return err
+		}
+		msgRequestBlockBlueWork := message.(*appmessage.MsgRequestBlockBlueWork)
+		log.Debugf("Got request for block %s blue work from %s", msgRequestBlockBlueWork.Hash, peer)
+		blockInfo, err := context.Domain().Consensus().GetBlockInfo(msgRequestBlockBlueWork.Hash)
+		if err != nil {
+			return err
+		}
+		if !blockInfo.Exists {
+			return protocolerrors.Errorf(true, "block %s not found", msgRequestBlockBlueWork.Hash)
+		}
+
+		err = outgoingRoute.Enqueue(appmessage.NewBlockBlueWork(blockInfo.BlueWork))
+		if err != nil {
+			return err
+		}
+		log.Debugf("Sent blue work for block %s to %s", msgRequestBlockBlueWork.Hash, peer)
+	}
+}

app/protocol/flows/blockrelay/handle_ibd_block_locator.go

@@ -5,6 +5,7 @@ import (
 	"github.com/kaspanet/kaspad/app/protocol/peer"
 	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
@@ -44,7 +45,9 @@ func HandleIBDBlockLocator(context HandleIBDBlockLocatorContext, incomingRoute *
 			if err != nil {
 				return err
 			}
-			if !blockInfo.Exists {
+
+			// The IBD block locator is checking only existing blocks with bodies.
+			if !blockInfo.Exists || blockInfo.BlockStatus == externalapi.StatusHeaderOnly {
 				continue
 			}
 

app/protocol/flows/blockrelay/handle_ibd_block_requests.go

@@ -48,7 +48,7 @@ func HandleIBDBlockRequests(context HandleIBDBlockRequestsContext, incomingRoute
 			if err != nil {
 				return err
 			}
-			log.Debugf("sent %d out of %d", i, len(msgRequestIBDBlocks.Hashes))
+			log.Debugf("sent %d out of %d", i+1, len(msgRequestIBDBlocks.Hashes))
 		}
 	}
 }

app/protocol/flows/blockrelay/handle_pruning_point_and_its_anticone_requests.go

@@ -0,0 +1,46 @@
+package blockrelay
+
+import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/domain"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+)
+
+// PruningPointAndItsAnticoneRequestsContext is the interface for the context needed for the HandlePruningPointAndItsAnticoneRequests flow.
+type PruningPointAndItsAnticoneRequestsContext interface {
+	Domain() domain.Domain
+}
+
+// HandlePruningPointAndItsAnticoneRequests listens to appmessage.MsgRequestPruningPointAndItsAnticone messages and sends
+// the pruning point and its anticone to the requesting peer.
+func HandlePruningPointAndItsAnticoneRequests(context PruningPointAndItsAnticoneRequestsContext, incomingRoute *router.Route,
+	outgoingRoute *router.Route, peer *peerpkg.Peer) error {
+
+	for {
+		_, err := incomingRoute.Dequeue()
+		if err != nil {
+			return err
+		}
+
+		log.Debugf("Got request for pruning point and its anticone from %s", peer)
+		blocks, err := context.Domain().Consensus().PruningPointAndItsAnticoneWithTrustedData()
+		if err != nil {
+			return err
+		}
+
+		for _, block := range blocks {
+			err = outgoingRoute.Enqueue(appmessage.DomainBlockWithTrustedDataToBlockWithTrustedData(block))
+			if err != nil {
+				return err
+			}
+		}
+
+		err = outgoingRoute.Enqueue(appmessage.NewMsgDoneBlocksWithTrustedData())
+		if err != nil {
+			return err
+		}
+
+		log.Debugf("Sent pruning point and its anticone to %s", peer)
+	}
+}

app/protocol/flows/blockrelay/handle_pruning_point_hash_requests.go

@@ -1,51 +0,0 @@
-package blockrelay
-
-import (
-	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/domain"
-	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-)
-
-// HandlePruningPointHashRequestsFlowContext is the interface for the context needed for the handlePruningPointHashRequestsFlow flow.
-type HandlePruningPointHashRequestsFlowContext interface {
-	Domain() domain.Domain
-}
-
-type handlePruningPointHashRequestsFlow struct {
-	HandlePruningPointHashRequestsFlowContext
-	incomingRoute, outgoingRoute *router.Route
-}
-
-// HandlePruningPointHashRequests listens to appmessage.MsgRequestPruningPointHashMessage messages and sends
-// the pruning point hash as response.
-func HandlePruningPointHashRequests(context HandlePruningPointHashRequestsFlowContext, incomingRoute,
-	outgoingRoute *router.Route) error {
-	flow := &handlePruningPointHashRequestsFlow{
-		HandlePruningPointHashRequestsFlowContext: context,
-		incomingRoute: incomingRoute,
-		outgoingRoute: outgoingRoute,
-	}
-
-	return flow.start()
-}
-
-func (flow *handlePruningPointHashRequestsFlow) start() error {
-	for {
-		_, err := flow.incomingRoute.Dequeue()
-		if err != nil {
-			return err
-		}
-		log.Debugf("Got request for a pruning point hash")
-
-		pruningPoint, err := flow.Domain().Consensus().PruningPoint()
-		if err != nil {
-			return err
-		}
-
-		err = flow.outgoingRoute.Enqueue(appmessage.NewPruningPointHashMessage(pruningPoint))
-		if err != nil {
-			return err
-		}
-		log.Debugf("Sent pruning point hash %s", pruningPoint)
-	}
-}

app/protocol/flows/blockrelay/handle_relay_invs.go

@@ -33,6 +33,7 @@ type RelayInvsContext interface {
 	IsIBDRunning() bool
 	TrySetIBDRunning(ibdPeer *peerpkg.Peer) bool
 	UnsetIBDRunning()
+	IsRecoverableError(err error) bool
 }
 
 type handleRelayInvsFlow struct {
@@ -126,7 +127,7 @@ func (flow *handleRelayInvsFlow) start() error {
 		}
 		if len(missingParents) > 0 {
 			log.Debugf("Block %s is orphan and has missing parents: %s", inv.Hash, missingParents)
-			err := flow.processOrphan(block, missingParents)
+			err := flow.processOrphan(block)
 			if err != nil {
 				return err
 			}
@@ -228,7 +229,7 @@ func (flow *handleRelayInvsFlow) readMsgBlock() (msgBlock *appmessage.MsgBlock,
 
 func (flow *handleRelayInvsFlow) processBlock(block *externalapi.DomainBlock) ([]*externalapi.DomainHash, *externalapi.BlockInsertionResult, error) {
 	blockHash := consensushashing.BlockHash(block)
-	blockInsertionResult, err := flow.Domain().Consensus().ValidateAndInsertBlock(block)
+	blockInsertionResult, err := flow.Domain().Consensus().ValidateAndInsertBlock(block, true)
 	if err != nil {
 		if !errors.As(err, &ruleerrors.RuleError{}) {
 			return nil, nil, errors.Wrapf(err, "failed to process block %s", blockHash)
@@ -249,7 +250,7 @@ func (flow *handleRelayInvsFlow) relayBlock(block *externalapi.DomainBlock) erro
 	return flow.Broadcast(appmessage.NewMsgInvBlock(blockHash))
 }
 
-func (flow *handleRelayInvsFlow) processOrphan(block *externalapi.DomainBlock, missingParents []*externalapi.DomainHash) error {
+func (flow *handleRelayInvsFlow) processOrphan(block *externalapi.DomainBlock) error {
 	blockHash := consensushashing.BlockHash(block)
 
 	// Return if the block has been orphaned from elsewhere already
@@ -283,8 +284,7 @@ func (flow *handleRelayInvsFlow) processOrphan(block *externalapi.DomainBlock, m
 // In the response, if we know none of the hashes, we should retrieve the given
 // blockHash via IBD. Otherwise, via unorphaning.
 func (flow *handleRelayInvsFlow) isBlockInOrphanResolutionRange(blockHash *externalapi.DomainHash) (bool, error) {
-	lowHash := flow.Config().ActiveNetParams.GenesisHash
-	err := flow.sendGetBlockLocator(lowHash, blockHash, orphanResolutionRange)
+	err := flow.sendGetBlockLocator(blockHash, orphanResolutionRange)
 	if err != nil {
 		return false, err
 	}

app/protocol/flows/blockrelay/handle_request_block_locator.go

@@ -32,20 +32,19 @@ func HandleRequestBlockLocator(context RequestBlockLocatorContext, incomingRoute
 
 func (flow *handleRequestBlockLocatorFlow) start() error {
 	for {
-		lowHash, highHash, limit, err := flow.receiveGetBlockLocator()
+		highHash, limit, err := flow.receiveGetBlockLocator()
 		if err != nil {
 			return err
 		}
-		log.Debugf("Received getBlockLocator with lowHash: %s, highHash: %s, limit: %d",
-			lowHash, highHash, limit)
+		log.Debugf("Received getBlockLocator with highHash: %s, limit: %d", highHash, limit)
 
-		locator, err := flow.Domain().Consensus().CreateBlockLocator(lowHash, highHash, limit)
+		locator, err := flow.Domain().Consensus().CreateBlockLocatorFromPruningPoint(highHash, limit)
 		if err != nil || len(locator) == 0 {
 			if err != nil {
-				log.Debugf("Received error from CreateBlockLocator: %s", err)
+				log.Debugf("Received error from CreateBlockLocatorFromPruningPoint: %s", err)
 			}
 			return protocolerrors.Errorf(true, "couldn't build a block "+
-				"locator between blocks %s and %s", lowHash, highHash)
+				"locator between the pruning point and %s", highHash)
 		}
 
 		err = flow.sendBlockLocator(locator)
@@ -55,16 +54,15 @@ func (flow *handleRequestBlockLocatorFlow) start() error {
 	}
 }
 
-func (flow *handleRequestBlockLocatorFlow) receiveGetBlockLocator() (lowHash *externalapi.DomainHash,
-	highHash *externalapi.DomainHash, limit uint32, err error) {
+func (flow *handleRequestBlockLocatorFlow) receiveGetBlockLocator() (highHash *externalapi.DomainHash, limit uint32, err error) {
 
 	message, err := flow.incomingRoute.Dequeue()
 	if err != nil {
-		return nil, nil, 0, err
+		return nil, 0, err
 	}
 	msgGetBlockLocator := message.(*appmessage.MsgRequestBlockLocator)
 
-	return msgGetBlockLocator.LowHash, msgGetBlockLocator.HighHash, msgGetBlockLocator.Limit, nil
+	return msgGetBlockLocator.HighHash, msgGetBlockLocator.Limit, nil
 }
 
 func (flow *handleRequestBlockLocatorFlow) sendBlockLocator(locator externalapi.BlockLocator) error {

app/protocol/flows/blockrelay/handle_request_headers.go

@@ -12,26 +12,26 @@ import (
 
 const ibdBatchSize = router.DefaultMaxMessages
 
-// RequestIBDBlocksContext is the interface for the context needed for the HandleRequestHeaders flow.
-type RequestIBDBlocksContext interface {
+// RequestHeadersContext is the interface for the context needed for the HandleRequestHeaders flow.
+type RequestHeadersContext interface {
 	Domain() domain.Domain
 }
 
 type handleRequestHeadersFlow struct {
-	RequestIBDBlocksContext
+	RequestHeadersContext
 	incomingRoute, outgoingRoute *router.Route
 	peer                         *peer.Peer
 }
 
 // HandleRequestHeaders handles RequestHeaders messages
-func HandleRequestHeaders(context RequestIBDBlocksContext, incomingRoute *router.Route,
+func HandleRequestHeaders(context RequestHeadersContext, incomingRoute *router.Route,
 	outgoingRoute *router.Route, peer *peer.Peer) error {
 
 	flow := &handleRequestHeadersFlow{
-		RequestIBDBlocksContext: context,
-		incomingRoute:           incomingRoute,
-		outgoingRoute:           outgoingRoute,
-		peer:                    peer,
+		RequestHeadersContext: context,
+		incomingRoute:         incomingRoute,
+		outgoingRoute:         outgoingRoute,
+		peer:                  peer,
 	}
 	return flow.start()
 }
@@ -49,8 +49,9 @@ func (flow *handleRequestHeadersFlow) start() error {
 
 			// GetHashesBetween is a relatively heavy operation so we limit it
 			// in order to avoid locking the consensus for too long
-			const maxBlueScoreDifference = 1 << 10
-			blockHashes, _, err := flow.Domain().Consensus().GetHashesBetween(lowHash, highHash, maxBlueScoreDifference)
+			// maxBlocks MUST be >= MergeSetSizeLimit + 1
+			const maxBlocks = 1 << 10
+			blockHashes, _, err := flow.Domain().Consensus().GetHashesBetween(lowHash, highHash, maxBlocks)
 			if err != nil {
 				return err
 			}

app/protocol/flows/blockrelay/handle_request_pruning_point_utxo_set.go

@@ -0,0 +1,128 @@
+package blockrelay
+
+import (
+	"errors"
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/common"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
+	"github.com/kaspanet/kaspad/domain"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
+	"github.com/kaspanet/kaspad/infrastructure/logger"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+)
+
+// HandleRequestPruningPointUTXOSetContext is the interface for the context needed for the HandleRequestPruningPointUTXOSet flow.
+type HandleRequestPruningPointUTXOSetContext interface {
+	Domain() domain.Domain
+}
+
+type handleRequestPruningPointUTXOSetFlow struct {
+	HandleRequestPruningPointUTXOSetContext
+	incomingRoute, outgoingRoute *router.Route
+}
+
+// HandleRequestPruningPointUTXOSet listens to appmessage.MsgRequestPruningPointUTXOSet messages and sends
+// the pruning point UTXO set and block body.
+func HandleRequestPruningPointUTXOSet(context HandleRequestPruningPointUTXOSetContext, incomingRoute,
+	outgoingRoute *router.Route) error {
+
+	flow := &handleRequestPruningPointUTXOSetFlow{
+		HandleRequestPruningPointUTXOSetContext: context,
+		incomingRoute:                           incomingRoute,
+		outgoingRoute:                           outgoingRoute,
+	}
+
+	return flow.start()
+}
+
+func (flow *handleRequestPruningPointUTXOSetFlow) start() error {
+	for {
+		msgRequestPruningPointUTXOSet, err := flow.waitForRequestPruningPointUTXOSetMessages()
+		if err != nil {
+			return err
+		}
+
+		err = flow.handleRequestPruningPointUTXOSetMessage(msgRequestPruningPointUTXOSet)
+		if err != nil {
+			return err
+		}
+	}
+}
+
+func (flow *handleRequestPruningPointUTXOSetFlow) handleRequestPruningPointUTXOSetMessage(
+	msgRequestPruningPointUTXOSet *appmessage.MsgRequestPruningPointUTXOSet) error {
+
+	onEnd := logger.LogAndMeasureExecutionTime(log, "handleRequestPruningPointUTXOSetFlow")
+	defer onEnd()
+
+	log.Debugf("Got request for pruning point UTXO set")
+
+	return flow.sendPruningPointUTXOSet(msgRequestPruningPointUTXOSet)
+}
+
+func (flow *handleRequestPruningPointUTXOSetFlow) waitForRequestPruningPointUTXOSetMessages() (
+	*appmessage.MsgRequestPruningPointUTXOSet, error) {
+
+	message, err := flow.incomingRoute.Dequeue()
+	if err != nil {
+		return nil, err
+	}
+	msgRequestPruningPointUTXOSet, ok := message.(*appmessage.MsgRequestPruningPointUTXOSet)
+	if !ok {
+		return nil, protocolerrors.Errorf(true, "received unexpected message type. "+
+			"expected: %s, got: %s", appmessage.CmdRequestPruningPointUTXOSet, message.Command())
+	}
+	return msgRequestPruningPointUTXOSet, nil
+}
+
+func (flow *handleRequestPruningPointUTXOSetFlow) sendPruningPointUTXOSet(
+	msgRequestPruningPointUTXOSet *appmessage.MsgRequestPruningPointUTXOSet) error {
+
+	// Send the UTXO set in `step`-sized chunks
+	const step = 1000
+	var fromOutpoint *externalapi.DomainOutpoint
+	chunksSent := 0
+	for {
+		pruningPointUTXOs, err := flow.Domain().Consensus().GetPruningPointUTXOs(
+			msgRequestPruningPointUTXOSet.PruningPointHash, fromOutpoint, step)
+		if err != nil {
+			if errors.Is(err, ruleerrors.ErrWrongPruningPointHash) {
+				return flow.outgoingRoute.Enqueue(appmessage.NewMsgUnexpectedPruningPoint())
+			}
+		}
+
+		log.Debugf("Retrieved %d UTXOs for pruning block %s",
+			len(pruningPointUTXOs), msgRequestPruningPointUTXOSet.PruningPointHash)
+
+		outpointAndUTXOEntryPairs :=
+			appmessage.DomainOutpointAndUTXOEntryPairsToOutpointAndUTXOEntryPairs(pruningPointUTXOs)
+		err = flow.outgoingRoute.Enqueue(appmessage.NewMsgPruningPointUTXOSetChunk(outpointAndUTXOEntryPairs))
+		if err != nil {
+			return err
+		}
+
+		if len(pruningPointUTXOs) < step {
+			log.Debugf("Finished sending UTXOs for pruning block %s",
+				msgRequestPruningPointUTXOSet.PruningPointHash)
+
+			return flow.outgoingRoute.Enqueue(appmessage.NewMsgDonePruningPointUTXOSetChunks())
+		}
+
+		fromOutpoint = pruningPointUTXOs[len(pruningPointUTXOs)-1].Outpoint
+		chunksSent++
+
+		// Wait for the peer to request more chunks every `ibdBatchSize` chunks
+		if chunksSent%ibdBatchSize == 0 {
+			message, err := flow.incomingRoute.DequeueWithTimeout(common.DefaultTimeout)
+			if err != nil {
+				return err
+			}
+			_, ok := message.(*appmessage.MsgRequestNextPruningPointUTXOSetChunk)
+			if !ok {
+				return protocolerrors.Errorf(true, "received unexpected message type. "+
+					"expected: %s, got: %s", appmessage.CmdRequestNextPruningPointUTXOSetChunk, message.Command())
+			}
+		}
+	}
+}

app/protocol/flows/blockrelay/handle_request_pruning_point_utxo_set_and_block.go

@@ -1,144 +0,0 @@
-package blockrelay
-
-import (
-	"errors"
-	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/app/protocol/common"
-	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	"github.com/kaspanet/kaspad/domain"
-	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
-	"github.com/kaspanet/kaspad/infrastructure/logger"
-	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-)
-
-// HandleRequestPruningPointUTXOSetAndBlockContext is the interface for the context needed for the HandleRequestPruningPointUTXOSetAndBlock flow.
-type HandleRequestPruningPointUTXOSetAndBlockContext interface {
-	Domain() domain.Domain
-}
-
-type handleRequestPruningPointUTXOSetAndBlockFlow struct {
-	HandleRequestPruningPointUTXOSetAndBlockContext
-	incomingRoute, outgoingRoute *router.Route
-}
-
-// HandleRequestPruningPointUTXOSetAndBlock listens to appmessage.MsgRequestPruningPointUTXOSetAndBlock messages and sends
-// the pruning point UTXO set and block body.
-func HandleRequestPruningPointUTXOSetAndBlock(context HandleRequestPruningPointUTXOSetAndBlockContext, incomingRoute,
-	outgoingRoute *router.Route) error {
-	flow := &handleRequestPruningPointUTXOSetAndBlockFlow{
-		HandleRequestPruningPointUTXOSetAndBlockContext: context,
-		incomingRoute: incomingRoute,
-		outgoingRoute: outgoingRoute,
-	}
-
-	return flow.start()
-}
-
-func (flow *handleRequestPruningPointUTXOSetAndBlockFlow) start() error {
-	for {
-		msgRequestPruningPointUTXOSetAndBlock, err := flow.waitForRequestPruningPointUTXOSetAndBlockMessages()
-		if err != nil {
-			return err
-		}
-
-		err = flow.handleRequestPruningPointUTXOSetAndBlockMessage(msgRequestPruningPointUTXOSetAndBlock)
-		if err != nil {
-			return err
-		}
-	}
-}
-
-func (flow *handleRequestPruningPointUTXOSetAndBlockFlow) handleRequestPruningPointUTXOSetAndBlockMessage(
-	msgRequestPruningPointUTXOSetAndBlock *appmessage.MsgRequestPruningPointUTXOSetAndBlock) error {
-
-	onEnd := logger.LogAndMeasureExecutionTime(log, "handleRequestPruningPointUTXOSetAndBlockFlow")
-	defer onEnd()
-
-	log.Debugf("Got request for PruningPointHash UTXOSet and Block")
-
-	err := flow.sendPruningPointBlock(msgRequestPruningPointUTXOSetAndBlock)
-	if err != nil {
-		return err
-	}
-
-	return flow.sendPruningPointUTXOSet(msgRequestPruningPointUTXOSetAndBlock)
-}
-
-func (flow *handleRequestPruningPointUTXOSetAndBlockFlow) waitForRequestPruningPointUTXOSetAndBlockMessages() (
-	*appmessage.MsgRequestPruningPointUTXOSetAndBlock, error) {
-
-	message, err := flow.incomingRoute.Dequeue()
-	if err != nil {
-		return nil, err
-	}
-	msgRequestPruningPointUTXOSetAndBlock, ok := message.(*appmessage.MsgRequestPruningPointUTXOSetAndBlock)
-	if !ok {
-		return nil, protocolerrors.Errorf(true, "received unexpected message type. "+
-			"expected: %s, got: %s", appmessage.CmdRequestPruningPointUTXOSetAndBlock, message.Command())
-	}
-	return msgRequestPruningPointUTXOSetAndBlock, nil
-}
-
-func (flow *handleRequestPruningPointUTXOSetAndBlockFlow) sendPruningPointBlock(
-	msgRequestPruningPointUTXOSetAndBlock *appmessage.MsgRequestPruningPointUTXOSetAndBlock) error {
-
-	block, err := flow.Domain().Consensus().GetBlock(msgRequestPruningPointUTXOSetAndBlock.PruningPointHash)
-	if err != nil {
-		return err
-	}
-	log.Debugf("Retrieved pruning block %s", msgRequestPruningPointUTXOSetAndBlock.PruningPointHash)
-
-	return flow.outgoingRoute.Enqueue(appmessage.NewMsgIBDBlock(appmessage.DomainBlockToMsgBlock(block)))
-}
-
-func (flow *handleRequestPruningPointUTXOSetAndBlockFlow) sendPruningPointUTXOSet(
-	msgRequestPruningPointUTXOSetAndBlock *appmessage.MsgRequestPruningPointUTXOSetAndBlock) error {
-
-	// Send the UTXO set in `step`-sized chunks
-	const step = 1000
-	var fromOutpoint *externalapi.DomainOutpoint
-	chunksSent := 0
-	for {
-		pruningPointUTXOs, err := flow.Domain().Consensus().GetPruningPointUTXOs(
-			msgRequestPruningPointUTXOSetAndBlock.PruningPointHash, fromOutpoint, step)
-		if err != nil {
-			if errors.Is(err, ruleerrors.ErrWrongPruningPointHash) {
-				return flow.outgoingRoute.Enqueue(appmessage.NewMsgUnexpectedPruningPoint())
-			}
-		}
-
-		log.Debugf("Retrieved %d UTXOs for pruning block %s",
-			len(pruningPointUTXOs), msgRequestPruningPointUTXOSetAndBlock.PruningPointHash)
-
-		outpointAndUTXOEntryPairs :=
-			appmessage.DomainOutpointAndUTXOEntryPairsToOutpointAndUTXOEntryPairs(pruningPointUTXOs)
-		err = flow.outgoingRoute.Enqueue(appmessage.NewMsgPruningPointUTXOSetChunk(outpointAndUTXOEntryPairs))
-		if err != nil {
-			return err
-		}
-
-		if len(pruningPointUTXOs) < step {
-			log.Debugf("Finished sending UTXOs for pruning block %s",
-				msgRequestPruningPointUTXOSetAndBlock.PruningPointHash)
-
-			return flow.outgoingRoute.Enqueue(appmessage.NewMsgDonePruningPointUTXOSetChunks())
-		}
-
-		fromOutpoint = pruningPointUTXOs[len(pruningPointUTXOs)-1].Outpoint
-		chunksSent++
-
-		// Wait for the peer to request more chunks every `ibdBatchSize` chunks
-		if chunksSent%ibdBatchSize == 0 {
-			message, err := flow.incomingRoute.DequeueWithTimeout(common.DefaultTimeout)
-			if err != nil {
-				return err
-			}
-			_, ok := message.(*appmessage.MsgRequestNextPruningPointUTXOSetChunk)
-			if !ok {
-				return protocolerrors.Errorf(true, "received unexpected message type. "+
-					"expected: %s, got: %s", appmessage.CmdRequestNextPruningPointUTXOSetChunk, message.Command())
-			}
-		}
-	}
-}

app/protocol/flows/blockrelay/ibd.go

@@ -1,7 +1,6 @@
 package blockrelay
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/kaspanet/kaspad/infrastructure/logger"
@@ -23,72 +22,60 @@ func (flow *handleRelayInvsFlow) runIBDIfNotRunning(highHash *externalapi.Domain
 		log.Debugf("IBD is already running")
 		return nil
 	}
-	defer flow.UnsetIBDRunning()
+
+	isFinishedSuccessfully := false
+	defer func() {
+		flow.UnsetIBDRunning()
+		flow.logIBDFinished(isFinishedSuccessfully)
+	}()
 
 	log.Debugf("IBD started with peer %s and highHash %s", flow.peer, highHash)
-
-	log.Debugf("Syncing headers up to %s", highHash)
-	headersSynced, err := flow.syncHeaders(highHash)
+	log.Debugf("Syncing blocks up to %s", highHash)
+	log.Debugf("Trying to find highest shared chain block with peer %s with high hash %s", flow.peer, highHash)
+	highestSharedBlockHash, highestSharedBlockFound, err := flow.findHighestSharedBlockHash(highHash)
 	if err != nil {
 		return err
 	}
-	if !headersSynced {
-		log.Debugf("Aborting IBD because the headers failed to sync")
-		return nil
-	}
-	log.Debugf("Finished syncing headers up to %s", highHash)
+	log.Debugf("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer)
 
-	log.Debugf("Syncing the current pruning point UTXO set")
-	syncedPruningPointUTXOSetSuccessfully, err := flow.syncPruningPointUTXOSet()
+	shouldDownloadHeadersProof, shouldSync, err := flow.shouldSyncAndShouldDownloadHeadersProof(highHash, highestSharedBlockFound)
 	if err != nil {
 		return err
 	}
-	if !syncedPruningPointUTXOSetSuccessfully {
-		log.Debugf("Aborting IBD because the pruning point UTXO set failed to sync")
+
+	if !shouldSync {
 		return nil
 	}
-	log.Debugf("Finished syncing the current pruning point UTXO set")
 
-	log.Debugf("Downloading block bodies up to %s", highHash)
+	if shouldDownloadHeadersProof {
+		log.Infof("Starting IBD with headers proof")
+		err := flow.ibdWithHeadersProof(highHash)
+		if err != nil {
+			return err
+		}
+	} else {
+		err = flow.syncPruningPointFutureHeaders(flow.Domain().Consensus(), highestSharedBlockHash, highHash)
+		if err != nil {
+			return err
+		}
+	}
+
 	err = flow.syncMissingBlockBodies(highHash)
 	if err != nil {
 		return err
 	}
-	log.Debugf("Finished downloading block bodies up to %s", highHash)
 
+	log.Debugf("Finished syncing blocks up to %s", highHash)
+	isFinishedSuccessfully = true
 	return nil
 }
 
-// syncHeaders attempts to sync headers from the peer. This method may fail
-// because the peer and us have conflicting pruning points. In that case we
-// return (false, nil) so that we may stop IBD gracefully.
-func (flow *handleRelayInvsFlow) syncHeaders(highHash *externalapi.DomainHash) (bool, error) {
-	log.Debugf("Trying to find highest shared chain block with peer %s with high hash %s", flow.peer, highHash)
-	highestSharedBlockHash, highestSharedBlockFound, err := flow.findHighestSharedBlockHash(highHash)
-	if err != nil {
-		return false, err
+func (flow *handleRelayInvsFlow) logIBDFinished(isFinishedSuccessfully bool) {
+	successString := "successfully"
+	if !isFinishedSuccessfully {
+		successString = "(interrupted)"
 	}
-	if !highestSharedBlockFound {
-		return false, nil
-	}
-	log.Debugf("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer)
-
-	err = flow.downloadHeaders(highestSharedBlockHash, highHash)
-	if err != nil {
-		return false, err
-	}
-
-	// If the highHash has not been received, the peer is misbehaving
-	highHashBlockInfo, err := flow.Domain().Consensus().GetBlockInfo(highHash)
-	if err != nil {
-		return false, err
-	}
-	if !highHashBlockInfo.Exists {
-		return false, protocolerrors.Errorf(true, "did not receive "+
-			"highHash header %s from peer %s during header download", highHash, flow.peer)
-	}
-	log.Debugf("Headers downloaded from peer %s", flow.peer)
-	return true, nil
+	log.Infof("IBD finished %s", successString)
 }
 
 // findHighestSharedBlock attempts to find the highest shared block between the peer
@@ -208,20 +195,22 @@ func (flow *handleRelayInvsFlow) fetchHighestHash(
 	}
 }
 
-func (flow *handleRelayInvsFlow) downloadHeaders(highestSharedBlockHash *externalapi.DomainHash,
+func (flow *handleRelayInvsFlow) syncPruningPointFutureHeaders(consensus externalapi.Consensus, highestSharedBlockHash *externalapi.DomainHash,
 	highHash *externalapi.DomainHash) error {
 
+	log.Infof("Downloading headers from %s", flow.peer)
+
 	err := flow.sendRequestHeaders(highestSharedBlockHash, highHash)
 	if err != nil {
 		return err
 	}
 
-	// Keep a short queue of blockHeadersMessages so that there's
+	// Keep a short queue of BlockHeadersMessages so that there's
 	// never a moment when the node is not validating and inserting
 	// headers
 	blockHeadersMessageChan := make(chan *appmessage.BlockHeadersMessage, 2)
 	errChan := make(chan error)
-	spawn("handleRelayInvsFlow-downloadHeaders", func() {
+	spawn("handleRelayInvsFlow-syncPruningPointFutureHeaders", func() {
 		for {
 			blockHeadersMessage, doneIBD, err := flow.receiveHeaders()
 			if err != nil {
@@ -245,12 +234,21 @@ func (flow *handleRelayInvsFlow) downloadHeaders(highestSharedBlockHash *externa
 
 	for {
 		select {
-		case blockHeadersMessage, ok := <-blockHeadersMessageChan:
+		case ibdBlocksMessage, ok := <-blockHeadersMessageChan:
 			if !ok {
+				// If the highHash has not been received, the peer is misbehaving
+				highHashBlockInfo, err := consensus.GetBlockInfo(highHash)
+				if err != nil {
+					return err
+				}
+				if !highHashBlockInfo.Exists {
+					return protocolerrors.Errorf(true, "did not receive "+
+						"highHash block %s from peer %s during block download", highHash, flow.peer)
+				}
 				return nil
 			}
-			for _, header := range blockHeadersMessage.BlockHeaders {
-				err = flow.processHeader(header)
+			for _, block := range ibdBlocksMessage.BlockHeaders {
+				err = flow.processHeader(consensus, block)
 				if err != nil {
 					return err
 				}
@@ -268,7 +266,7 @@ func (flow *handleRelayInvsFlow) sendRequestHeaders(highestSharedBlockHash *exte
 	return flow.outgoingRoute.Enqueue(msgGetBlockInvs)
 }
 
-func (flow *handleRelayInvsFlow) receiveHeaders() (msgIBDBlock *appmessage.BlockHeadersMessage, doneIBD bool, err error) {
+func (flow *handleRelayInvsFlow) receiveHeaders() (msgIBDBlock *appmessage.BlockHeadersMessage, doneHeaders bool, err error) {
 	message, err := flow.dequeueIncomingMessageAndSkipInvs(common.DefaultTimeout)
 	if err != nil {
 		return nil, false, err
@@ -281,11 +279,14 @@ func (flow *handleRelayInvsFlow) receiveHeaders() (msgIBDBlock *appmessage.Block
 	default:
 		return nil, false,
 			protocolerrors.Errorf(true, "received unexpected message type. "+
-				"expected: %s or %s, got: %s", appmessage.CmdHeader, appmessage.CmdDoneHeaders, message.Command())
+				"expected: %s or %s, got: %s",
+				appmessage.CmdBlockHeaders,
+				appmessage.CmdDoneHeaders,
+				message.Command())
 	}
 }
 
-func (flow *handleRelayInvsFlow) processHeader(msgBlockHeader *appmessage.MsgBlockHeader) error {
+func (flow *handleRelayInvsFlow) processHeader(consensus externalapi.Consensus, msgBlockHeader *appmessage.MsgBlockHeader) error {
 	header := appmessage.BlockHeaderToDomainBlockHeader(msgBlockHeader)
 	block := &externalapi.DomainBlock{
 		Header:       header,
@@ -293,7 +294,7 @@ func (flow *handleRelayInvsFlow) processHeader(msgBlockHeader *appmessage.MsgBlo
 	}
 
 	blockHash := consensushashing.BlockHash(block)
-	blockInfo, err := flow.Domain().Consensus().GetBlockInfo(blockHash)
+	blockInfo, err := consensus.GetBlockInfo(blockHash)
 	if err != nil {
 		return err
 	}
@@ -301,7 +302,7 @@ func (flow *handleRelayInvsFlow) processHeader(msgBlockHeader *appmessage.MsgBlo
 		log.Debugf("Block header %s is already in the DAG. Skipping...", blockHash)
 		return nil
 	}
-	_, err = flow.Domain().Consensus().ValidateAndInsertBlock(block)
+	_, err = consensus.ValidateAndInsertBlock(block, false)
 	if err != nil {
 		if !errors.As(err, &ruleerrors.RuleError{}) {
 			return errors.Wrapf(err, "failed to process header %s during IBD", blockHash)
@@ -318,129 +319,8 @@ func (flow *handleRelayInvsFlow) processHeader(msgBlockHeader *appmessage.MsgBlo
 	return nil
 }
 
-func (flow *handleRelayInvsFlow) syncPruningPointUTXOSet() (bool, error) {
-	log.Debugf("Checking if a new pruning point is available")
-	err := flow.outgoingRoute.Enqueue(appmessage.NewMsgRequestPruningPointHashMessage())
-	if err != nil {
-		return false, err
-	}
-	message, err := flow.dequeueIncomingMessageAndSkipInvs(common.DefaultTimeout)
-	if err != nil {
-		return false, err
-	}
-	msgPruningPointHash, ok := message.(*appmessage.MsgPruningPointHashMessage)
-	if !ok {
-		return false, protocolerrors.Errorf(true, "received unexpected message type. "+
-			"expected: %s, got: %s", appmessage.CmdPruningPointHash, message.Command())
-	}
-
-	blockInfo, err := flow.Domain().Consensus().GetBlockInfo(msgPruningPointHash.Hash)
-	if err != nil {
-		return false, err
-	}
-
-	if !blockInfo.Exists {
-		return false, errors.Errorf("The pruning point header is missing")
-	}
-
-	if blockInfo.BlockStatus != externalapi.StatusHeaderOnly {
-		log.Debugf("Already has the block data of the new suggested pruning point %s", msgPruningPointHash.Hash)
-		return true, nil
-	}
-
-	log.Infof("Checking if the suggested pruning point %s is compatible to the node DAG", msgPruningPointHash.Hash)
-	isValid, err := flow.Domain().Consensus().IsValidPruningPoint(msgPruningPointHash.Hash)
-	if err != nil {
-		return false, err
-	}
-
-	if !isValid {
-		log.Infof("The suggested pruning point %s is incompatible to this node DAG, so stopping IBD with this"+
-			" peer", msgPruningPointHash.Hash)
-		return false, nil
-	}
-
-	log.Info("Fetching the pruning point UTXO set")
-	succeed, err := flow.fetchMissingUTXOSet(msgPruningPointHash.Hash)
-	if err != nil {
-		return false, err
-	}
-
-	if !succeed {
-		log.Infof("Couldn't successfully fetch the pruning point UTXO set. Stopping IBD.")
-		return false, nil
-	}
-
-	log.Info("Fetched the new pruning point UTXO set")
-	return true, nil
-}
-
-func (flow *handleRelayInvsFlow) fetchMissingUTXOSet(pruningPointHash *externalapi.DomainHash) (succeed bool, err error) {
-	defer func() {
-		err := flow.Domain().Consensus().ClearImportedPruningPointData()
-		if err != nil {
-			panic(fmt.Sprintf("failed to clear imported pruning point data: %s", err))
-		}
-	}()
-
-	err = flow.outgoingRoute.Enqueue(appmessage.NewMsgRequestPruningPointUTXOSetAndBlock(pruningPointHash))
-	if err != nil {
-		return false, err
-	}
-
-	block, err := flow.receivePruningPointBlock()
-	if err != nil {
-		return false, err
-	}
-
-	receivedAll, err := flow.receiveAndInsertPruningPointUTXOSet(pruningPointHash)
-	if err != nil {
-		return false, err
-	}
-	if !receivedAll {
-		return false, nil
-	}
-
-	err = flow.Domain().Consensus().ValidateAndInsertImportedPruningPoint(block)
-	if err != nil {
-		// TODO: Find a better way to deal with finality conflicts.
-		if errors.Is(err, ruleerrors.ErrSuggestedPruningViolatesFinality) {
-			return false, nil
-		}
-		return false, protocolerrors.ConvertToBanningProtocolErrorIfRuleError(err, "error with pruning point UTXO set")
-	}
-
-	err = flow.OnPruningPointUTXOSetOverride()
-	if err != nil {
-		return false, err
-	}
-
-	return true, nil
-}
-
-func (flow *handleRelayInvsFlow) receivePruningPointBlock() (*externalapi.DomainBlock, error) {
-	onEnd := logger.LogAndMeasureExecutionTime(log, "receivePruningPointBlock")
-	defer onEnd()
-
-	message, err := flow.dequeueIncomingMessageAndSkipInvs(common.DefaultTimeout)
-	if err != nil {
-		return nil, err
-	}
-
-	ibdBlockMessage, ok := message.(*appmessage.MsgIBDBlock)
-	if !ok {
-		return nil, protocolerrors.Errorf(true, "received unexpected message type. "+
-			"expected: %s, got: %s", appmessage.CmdIBDBlock, message.Command())
-	}
-	block := appmessage.MsgBlockToDomainBlock(ibdBlockMessage.MsgBlock)
-
-	log.Debugf("Received pruning point block %s", consensushashing.BlockHash(block))
-
-	return block, nil
-}
-
 func (flow *handleRelayInvsFlow) receiveAndInsertPruningPointUTXOSet(
-	pruningPointHash *externalapi.DomainHash) (bool, error) {
+	consensus externalapi.Consensus, pruningPointHash *externalapi.DomainHash) (bool, error) {
 
 	onEnd := logger.LogAndMeasureExecutionTime(log, "receiveAndInsertPruningPointUTXOSet")
 	defer onEnd()
@@ -459,7 +339,7 @@ func (flow *handleRelayInvsFlow) receiveAndInsertPruningPointUTXOSet(
 			domainOutpointAndUTXOEntryPairs :=
 				appmessage.OutpointAndUTXOEntryPairsToDomainOutpointAndUTXOEntryPairs(message.OutpointAndUTXOEntryPairs)
 
-			err := flow.Domain().Consensus().AppendImportedPruningPointUTXOs(domainOutpointAndUTXOEntryPairs)
+			err := consensus.AppendImportedPruningPointUTXOs(domainOutpointAndUTXOEntryPairs)
 			if err != nil {
 				return false, err
 			}
@@ -543,7 +423,7 @@ func (flow *handleRelayInvsFlow) syncMissingBlockBodies(highHash *externalapi.Do
 				return err
 			}
 
-			blockInsertionResult, err := flow.Domain().Consensus().ValidateAndInsertBlock(block)
+			blockInsertionResult, err := flow.Domain().Consensus().ValidateAndInsertBlock(block, false)
 			if err != nil {
 				if errors.Is(err, ruleerrors.ErrDuplicateBlock) {
 					log.Debugf("Skipping IBD Block %s as it has already been added to the DAG", blockHash)
@@ -558,7 +438,7 @@ func (flow *handleRelayInvsFlow) syncMissingBlockBodies(highHash *externalapi.Do
 		}
 	}
 
-	return nil
+	return flow.Domain().Consensus().ResolveVirtual()
 }
 
 // dequeueIncomingMessageAndSkipInvs is a convenience method to be used during

app/protocol/flows/blockrelay/ibd_with_headers_proof.go

@@ -0,0 +1,264 @@
+package blockrelay
+
+import (
+	"fmt"
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/common"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+	"github.com/kaspanet/kaspad/domain/consensus/ruleerrors"
+	"github.com/pkg/errors"
+)
+
+func (flow *handleRelayInvsFlow) ibdWithHeadersProof(highHash *externalapi.DomainHash) error {
+	err := flow.Domain().InitStagingConsensus()
+	if err != nil {
+		return err
+	}
+
+	err = flow.downloadHeadersAndPruningUTXOSet(flow.Domain().StagingConsensus(), highHash)
+	if err != nil {
+		if !flow.IsRecoverableError(err) {
+			return err
+		}
+
+		deleteStagingConsensusErr := flow.Domain().DeleteStagingConsensus()
+		if deleteStagingConsensusErr != nil {
+			return deleteStagingConsensusErr
+		}
+
+		return err
+	}
+
+	err = flow.Domain().CommitStagingConsensus()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (flow *handleRelayInvsFlow) shouldSyncAndShouldDownloadHeadersProof(highHash *externalapi.DomainHash,
+	highestSharedBlockFound bool) (shouldDownload, shouldSync bool, err error) {
+
+	if !highestSharedBlockFound {
+		hasMoreBlueWorkThanSelectedTip, err := flow.checkIfHighHashHasMoreBlueWorkThanSelectedTip(highHash)
+		if err != nil {
+			return false, false, err
+		}
+
+		if hasMoreBlueWorkThanSelectedTip {
+			return true, true, nil
+		}
+
+		return false, false, nil
+	}
+
+	return false, true, nil
+}
+
+func (flow *handleRelayInvsFlow) checkIfHighHashHasMoreBlueWorkThanSelectedTip(highHash *externalapi.DomainHash) (bool, error) {
+	err := flow.outgoingRoute.Enqueue(appmessage.NewRequestBlockBlueWork(highHash))
+	if err != nil {
+		return false, err
+	}
+
+	message, err := flow.dequeueIncomingMessageAndSkipInvs(common.DefaultTimeout)
+	if err != nil {
+		return false, err
+	}
+
+	msgBlockBlueWork, ok := message.(*appmessage.MsgBlockBlueWork)
+	if !ok {
+		return false,
+			protocolerrors.Errorf(true, "received unexpected message type. "+
+				"expected: %s, got: %s", appmessage.CmdBlockBlueWork, message.Command())
+	}
+
+	headersSelectedTip, err := flow.Domain().Consensus().GetHeadersSelectedTip()
+	if err != nil {
+		return false, err
+	}
+
+	headersSelectedTipInfo, err := flow.Domain().Consensus().GetBlockInfo(headersSelectedTip)
+	if err != nil {
+		return false, err
+	}
+
+	return msgBlockBlueWork.BlueWork.Cmp(headersSelectedTipInfo.BlueWork) > 0, nil
+}
+
+func (flow *handleRelayInvsFlow) downloadHeadersProof() error {
+	// TODO: Implement headers proof mechanism
+	return nil
+}
+
+func (flow *handleRelayInvsFlow) downloadHeadersAndPruningUTXOSet(consensus externalapi.Consensus, highHash *externalapi.DomainHash) error {
+	err := flow.downloadHeadersProof()
+	if err != nil {
+		return err
+	}
+
+	pruningPoint, err := flow.syncPruningPointAndItsAnticone(consensus)
+	if err != nil {
+		return err
+	}
+
+	// TODO: Remove this condition once there's more proper way to check finality violation
+	// in the headers proof.
+	if pruningPoint.Equal(flow.Config().NetParams().GenesisHash) {
+		return protocolerrors.Errorf(true, "the genesis pruning point violates finality")
+	}
+
+	err = flow.syncPruningPointFutureHeaders(consensus, pruningPoint, highHash)
+	if err != nil {
+		return err
+	}
+
+	log.Debugf("Blocks downloaded from peer %s", flow.peer)
+
+	log.Debugf("Syncing the current pruning point UTXO set")
+	syncedPruningPointUTXOSetSuccessfully, err := flow.syncPruningPointUTXOSet(consensus, pruningPoint)
+	if err != nil {
+		return err
+	}
+	if !syncedPruningPointUTXOSetSuccessfully {
+		log.Debugf("Aborting IBD because the pruning point UTXO set failed to sync")
+		return nil
+	}
+	log.Debugf("Finished syncing the current pruning point UTXO set")
+	return nil
+}
+
+func (flow *handleRelayInvsFlow) syncPruningPointAndItsAnticone(consensus externalapi.Consensus) (*externalapi.DomainHash, error) {
+	log.Infof("Downloading pruning point and its anticone from %s", flow.peer)
+	err := flow.outgoingRoute.Enqueue(appmessage.NewMsgRequestPruningPointAndItsAnticone())
+	if err != nil {
+		return nil, err
+	}
+
+	pruningPoint, done, err := flow.receiveBlockWithTrustedData()
+	if err != nil {
+		return nil, err
+	}
+
+	if done {
+		return nil, protocolerrors.Errorf(true, "got `done` message before receiving the pruning point")
+	}
+
+	err = flow.processBlockWithTrustedData(consensus, pruningPoint)
+	if err != nil {
+		return nil, err
+	}
+
+	for {
+		blockWithTrustedData, done, err := flow.receiveBlockWithTrustedData()
+		if err != nil {
+			return nil, err
+		}
+
+		if done {
+			break
+		}
+
+		err = flow.processBlockWithTrustedData(consensus, blockWithTrustedData)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	log.Infof("Finished downloading pruning point and its anticone from %s", flow.peer)
+	return pruningPoint.Block.Header.BlockHash(), nil
+}
+
+func (flow *handleRelayInvsFlow) processBlockWithTrustedData(
+	consensus externalapi.Consensus, block *appmessage.MsgBlockWithTrustedData) error {
+
+	_, err := consensus.ValidateAndInsertBlockWithTrustedData(appmessage.BlockWithTrustedDataToDomainBlockWithTrustedData(block), false)
+	return err
+}
+
+func (flow *handleRelayInvsFlow) receiveBlockWithTrustedData() (*appmessage.MsgBlockWithTrustedData, bool, error) {
+	message, err := flow.dequeueIncomingMessageAndSkipInvs(common.DefaultTimeout)
+	if err != nil {
+		return nil, false, err
+	}
+
+	switch downCastedMessage := message.(type) {
+	case *appmessage.MsgBlockWithTrustedData:
+		return downCastedMessage, false, nil
+	case *appmessage.MsgDoneBlocksWithTrustedData:
+		return nil, true, nil
+	default:
+		return nil, false,
+			protocolerrors.Errorf(true, "received unexpected message type. "+
+				"expected: %s or %s, got: %s",
+				(&appmessage.MsgBlockWithTrustedData{}).Command(),
+				(&appmessage.MsgDoneBlocksWithTrustedData{}).Command(),
+				downCastedMessage.Command())
+	}
+}
+
+func (flow *handleRelayInvsFlow) syncPruningPointUTXOSet(consensus externalapi.Consensus, pruningPoint *externalapi.DomainHash) (bool, error) {
+	log.Infof("Checking if the suggested pruning point %s is compatible to the node DAG", pruningPoint)
+	isValid, err := flow.Domain().StagingConsensus().IsValidPruningPoint(pruningPoint)
+	if err != nil {
+		return false, err
+	}
+
+	if !isValid {
+		return false, protocolerrors.Errorf(true, "invalid pruning point %s", pruningPoint)
+	}
+
+	log.Info("Fetching the pruning point UTXO set")
+	isSuccessful, err := flow.fetchMissingUTXOSet(consensus, pruningPoint)
+	if err != nil {
+		return false, err
+	}
+
+	if !isSuccessful {
+		log.Infof("Couldn't successfully fetch the pruning point UTXO set. Stopping IBD.")
+		return false, nil
+	}
+
+	log.Info("Fetched the new pruning point UTXO set")
+	return true, nil
+}
+
+func (flow *handleRelayInvsFlow) fetchMissingUTXOSet(consensus externalapi.Consensus, pruningPointHash *externalapi.DomainHash) (succeed bool, err error) {
+	defer func() {
+		err := flow.Domain().StagingConsensus().ClearImportedPruningPointData()
+		if err != nil {
+			panic(fmt.Sprintf("failed to clear imported pruning point data: %s", err))
+		}
+	}()
+
+	err = flow.outgoingRoute.Enqueue(appmessage.NewMsgRequestPruningPointUTXOSet(pruningPointHash))
+	if err != nil {
+		return false, err
+	}
+
+	receivedAll, err := flow.receiveAndInsertPruningPointUTXOSet(consensus, pruningPointHash)
+	if err != nil {
+		return false, err
+	}
+	if !receivedAll {
+		return false, nil
+	}
+
+	err = flow.Domain().StagingConsensus().ValidateAndInsertImportedPruningPoint(pruningPointHash)
+	if err != nil {
+		// TODO: Find a better way to deal with finality conflicts.
+		if errors.Is(err, ruleerrors.ErrSuggestedPruningViolatesFinality) {
+			return false, nil
+		}
+		return false, protocolerrors.ConvertToBanningProtocolErrorIfRuleError(err, "error with pruning point UTXO set")
+	}
+
+	err = flow.OnPruningPointUTXOSetOverride()
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}

app/protocol/flows/blockrelay/send_virtual_selected_parent_inv.go

@@ -4,12 +4,14 @@ import (
 	"github.com/kaspanet/kaspad/app/appmessage"
 	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
 	"github.com/kaspanet/kaspad/domain"
+	"github.com/kaspanet/kaspad/infrastructure/config"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
 // SendVirtualSelectedParentInvContext is the interface for the context needed for the SendVirtualSelectedParentInv flow.
 type SendVirtualSelectedParentInvContext interface {
 	Domain() domain.Domain
+	Config() *config.Config
 }
 
 // SendVirtualSelectedParentInv sends a peer the selected parent hash of the virtual
@@ -21,6 +23,11 @@ func SendVirtualSelectedParentInv(context SendVirtualSelectedParentInvContext,
 		return err
 	}
 
+	if virtualSelectedParent.Equal(context.Config().NetParams().GenesisHash) {
+		log.Debugf("Skipping sending the virtual selected parent hash to peer %s because it's the genesis", peer)
+		return nil
+	}
+
 	log.Debugf("Sending virtual selected parent hash %s to peer %s", virtualSelectedParent, peer)
 
 	virtualSelectedParentInv := appmessage.NewMsgInvBlock(virtualSelectedParent)

app/protocol/flows/rejects/handle_rejects.go

@@ -33,10 +33,5 @@ func (flow *handleRejectsFlow) start() error {
 	}
 	rejectMessage := message.(*appmessage.MsgReject)
 
-	const maxReasonLength = 255
-	if len(rejectMessage.Reason) > maxReasonLength {
-		return protocolerrors.Errorf(false, "got reject message longer than %d", maxReasonLength)
-	}
-
 	return protocolerrors.Errorf(false, "got reject message: `%s`", rejectMessage.Reason)
 }

app/protocol/flows/testing/receiveaddresses_test.go

@@ -21,8 +21,8 @@ func (f fakeReceiveAddressesContext) AddressManager() *addressmanager.AddressMan
 
 func TestReceiveAddressesErrors(t *testing.T) {
 	testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) {
-		incomingRoute := router.NewRoute()
-		outgoingRoute := router.NewRoute()
+		incomingRoute := router.NewRoute("incoming")
+		outgoingRoute := router.NewRoute("outgoing")
 		peer := peerpkg.New(nil)
 		errChan := make(chan error)
 		go func() {

app/protocol/flows/transactionrelay/handle_relayed_transactions.go

@@ -19,8 +19,8 @@ type TransactionsRelayContext interface {
 	NetAdapter() *netadapter.NetAdapter
 	Domain() domain.Domain
 	SharedRequestedTransactions() *SharedRequestedTransactions
-	Broadcast(message appmessage.Message) error
 	OnTransactionAddedToMempool()
+	EnqueueTransactionIDsForPropagation(transactionIDs []*externalapi.DomainTransactionID) error
 }
 
 type handleRelayedTransactionsFlow struct {
@@ -119,8 +119,7 @@ func (flow *handleRelayedTransactionsFlow) readInv() (*appmessage.MsgInvTransact
 }
 
 func (flow *handleRelayedTransactionsFlow) broadcastAcceptedTransactions(acceptedTxIDs []*externalapi.DomainTransactionID) error {
-	inv := appmessage.NewMsgInvTransaction(acceptedTxIDs)
-	return flow.Broadcast(inv)
+	return flow.EnqueueTransactionIDsForPropagation(acceptedTxIDs)
 }
 
 // readMsgTxOrNotFound returns the next msgTx or msgTransactionNotFound in incomingRoute,
@@ -173,17 +172,18 @@ func (flow *handleRelayedTransactionsFlow) receiveTransactions(requestedTransact
 				expectedID, txID)
 		}
 
-		err = flow.Domain().MiningManager().ValidateAndInsertTransaction(tx, true)
+		acceptedTransactions, err :=
+			flow.Domain().MiningManager().ValidateAndInsertTransaction(tx, false, true)
 		if err != nil {
 			ruleErr := &mempool.RuleError{}
 			if !errors.As(err, ruleErr) {
 				return errors.Wrapf(err, "failed to process transaction %s", txID)
 			}
 
-			shouldBan := true
+			shouldBan := false
 			if txRuleErr := (&mempool.TxRuleError{}); errors.As(ruleErr.Err, txRuleErr) {
-				if txRuleErr.RejectCode != mempool.RejectInvalid {
-					shouldBan = false
+				if txRuleErr.RejectCode == mempool.RejectInvalid {
+					shouldBan = true
 				}
 			}
 
@@ -193,7 +193,7 @@ func (flow *handleRelayedTransactionsFlow) receiveTransactions(requestedTransact
 
 			return protocolerrors.Errorf(true, "rejected transaction %s: %s", txID, ruleErr)
 		}
-		err = flow.broadcastAcceptedTransactions([]*externalapi.DomainTransactionID{txID})
+		err = flow.broadcastAcceptedTransactions(consensushashing.TransactionIDs(acceptedTransactions))
 		if err != nil {
 			return err
 		}

app/protocol/flows/transactionrelay/handle_relayed_transactions_test.go

@@ -2,16 +2,18 @@ package transactionrelay_test
 
 import (
 	"errors"
+	"strings"
+	"testing"
+
 	"github.com/kaspanet/kaspad/app/protocol/flows/transactionrelay"
 	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain"
 	"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/miningmanager/mempool"
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/util/panics"
-	"strings"
-	"testing"
 
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/infrastructure/config"
@@ -37,7 +39,7 @@ func (m *mocTransactionsRelayContext) SharedRequestedTransactions() *transaction
 	return m.sharedRequestedTransactions
 }
 
-func (m *mocTransactionsRelayContext) Broadcast(appmessage.Message) error {
+func (m *mocTransactionsRelayContext) EnqueueTransactionIDsForPropagation(transactionIDs []*externalapi.DomainTransactionID) error {
 	return nil
 }
 
@@ -63,7 +65,7 @@ func TestHandleRelayedTransactionsNotFound(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed to create a NetAdapter: %v", err)
 		}
-		domainInstance, err := domain.New(consensusConfig, tc.Database())
+		domainInstance, err := domain.New(consensusConfig, mempool.DefaultConfig(&consensusConfig.Params), tc.Database())
 		if err != nil {
 			t.Fatalf("Failed to set up a domain instance: %v", err)
 		}
@@ -72,9 +74,9 @@ func TestHandleRelayedTransactionsNotFound(t *testing.T) {
 			domain:                      domainInstance,
 			sharedRequestedTransactions: sharedRequestedTransactions,
 		}
-		incomingRoute := router.NewRoute()
+		incomingRoute := router.NewRoute("incoming")
 		defer incomingRoute.Close()
-		peerIncomingRoute := router.NewRoute()
+		peerIncomingRoute := router.NewRoute("outgoing")
 		defer peerIncomingRoute.Close()
 
 		txID1 := externalapi.NewDomainTransactionIDFromByteArray(&[externalapi.DomainHashSize]byte{
@@ -156,7 +158,7 @@ func TestOnClosedIncomingRoute(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed to creat a NetAdapter : %v", err)
 		}
-		domainInstance, err := domain.New(consensusConfig, tc.Database())
+		domainInstance, err := domain.New(consensusConfig, mempool.DefaultConfig(&consensusConfig.Params), tc.Database())
 		if err != nil {
 			t.Fatalf("Failed to set up a domain instance: %v", err)
 		}
@@ -165,8 +167,8 @@ func TestOnClosedIncomingRoute(t *testing.T) {
 			domain:                      domainInstance,
 			sharedRequestedTransactions: sharedRequestedTransactions,
 		}
-		incomingRoute := router.NewRoute()
-		outgoingRoute := router.NewRoute()
+		incomingRoute := router.NewRoute("incoming")
+		outgoingRoute := router.NewRoute("outgoing")
 		defer outgoingRoute.Close()
 
 		txID := externalapi.NewDomainTransactionIDFromByteArray(&[externalapi.DomainHashSize]byte{

app/protocol/flows/transactionrelay/handle_requested_transactions_test.go

@@ -1,19 +1,21 @@
 package transactionrelay_test
 
 import (
+	"testing"
+
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/protocol/flows/transactionrelay"
 	"github.com/kaspanet/kaspad/domain"
 	"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/miningmanager/mempool"
 	"github.com/kaspanet/kaspad/infrastructure/config"
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 	"github.com/kaspanet/kaspad/util/panics"
 	"github.com/pkg/errors"
-	"testing"
 )
 
 // TestHandleRequestedTransactionsNotFound tests the flow of  HandleRequestedTransactions
@@ -34,7 +36,7 @@ func TestHandleRequestedTransactionsNotFound(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed to create a NetAdapter: %v", err)
 		}
-		domainInstance, err := domain.New(consensusConfig, tc.Database())
+		domainInstance, err := domain.New(consensusConfig, mempool.DefaultConfig(&consensusConfig.Params), tc.Database())
 		if err != nil {
 			t.Fatalf("Failed to set up a domain Instance: %v", err)
 		}
@@ -43,8 +45,8 @@ func TestHandleRequestedTransactionsNotFound(t *testing.T) {
 			domain:                      domainInstance,
 			sharedRequestedTransactions: sharedRequestedTransactions,
 		}
-		incomingRoute := router.NewRoute()
-		outgoingRoute := router.NewRoute()
+		incomingRoute := router.NewRoute("incoming")
+		outgoingRoute := router.NewRoute("outgoing")
 		defer outgoingRoute.Close()
 
 		txID1 := externalapi.NewDomainTransactionIDFromByteArray(&[externalapi.DomainHashSize]byte{

app/protocol/manager.go

@@ -2,10 +2,11 @@ package protocol
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"sync"
 	"sync/atomic"
 
+	"github.com/pkg/errors"
+
 	"github.com/kaspanet/kaspad/domain"
 
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
@@ -61,8 +62,8 @@ func (m *Manager) IBDPeer() *peerpkg.Peer {
 }
 
 // AddTransaction adds transaction to the mempool and propagates it.
-func (m *Manager) AddTransaction(tx *externalapi.DomainTransaction) error {
-	return m.context.AddTransaction(tx)
+func (m *Manager) AddTransaction(tx *externalapi.DomainTransaction, allowOrphan bool) error {
+	return m.context.AddTransaction(tx, allowOrphan)
 }
 
 // AddBlock adds the given block to the DAG and propagates it.

app/protocol/protocol.go

@@ -168,10 +168,12 @@ func (m *Manager) registerBlockRelayFlows(router *routerpkg.Router, isStopping *
 			}),
 
 		m.registerFlow("HandleRelayInvs", router, []appmessage.MessageCommand{
-			appmessage.CmdInvRelayBlock, appmessage.CmdBlock, appmessage.CmdBlockLocator, appmessage.CmdIBDBlock,
+			appmessage.CmdInvRelayBlock, appmessage.CmdBlock, appmessage.CmdBlockLocator, appmessage.CmdBlockBlueWork,
 			appmessage.CmdDoneHeaders, appmessage.CmdUnexpectedPruningPoint, appmessage.CmdPruningPointUTXOSetChunk,
-			appmessage.CmdBlockHeaders, appmessage.CmdPruningPointHash, appmessage.CmdIBDBlockLocatorHighestHash,
-			appmessage.CmdIBDBlockLocatorHighestHashNotFound, appmessage.CmdDonePruningPointUTXOSetChunks},
+			appmessage.CmdBlockHeaders, appmessage.CmdIBDBlockLocatorHighestHash, appmessage.CmdBlockWithTrustedData,
+			appmessage.CmdDoneBlocksWithTrustedData, appmessage.CmdIBDBlockLocatorHighestHashNotFound,
+			appmessage.CmdDonePruningPointUTXOSetChunks, appmessage.CmdIBDBlock,
+		},
 			isStopping, errChan, func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return blockrelay.HandleRelayInvs(m.context, incomingRoute,
 					outgoingRoute, peer)
@@ -198,14 +200,6 @@ func (m *Manager) registerBlockRelayFlows(router *routerpkg.Router, isStopping *
 			},
 		),
 
-		m.registerFlow("HandleRequestPruningPointUTXOSetAndBlock", router,
-			[]appmessage.MessageCommand{appmessage.CmdRequestPruningPointUTXOSetAndBlock,
-				appmessage.CmdRequestNextPruningPointUTXOSetChunk}, isStopping, errChan,
-			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
-				return blockrelay.HandleRequestPruningPointUTXOSetAndBlock(m.context, incomingRoute, outgoingRoute)
-			},
-		),
-
 		m.registerFlow("HandleIBDBlockRequests", router,
 			[]appmessage.MessageCommand{appmessage.CmdRequestIBDBlocks}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
@@ -213,10 +207,25 @@ func (m *Manager) registerBlockRelayFlows(router *routerpkg.Router, isStopping *
 			},
 		),
 
-		m.registerFlow("HandlePruningPointHashRequests", router,
-			[]appmessage.MessageCommand{appmessage.CmdRequestPruningPointHash}, isStopping, errChan,
+		m.registerFlow("HandleRequestPruningPointUTXOSet", router,
+			[]appmessage.MessageCommand{appmessage.CmdRequestPruningPointUTXOSet,
+				appmessage.CmdRequestNextPruningPointUTXOSetChunk}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
-				return blockrelay.HandlePruningPointHashRequests(m.context, incomingRoute, outgoingRoute)
+				return blockrelay.HandleRequestPruningPointUTXOSet(m.context, incomingRoute, outgoingRoute)
+			},
+		),
+
+		m.registerFlow("HandleBlockBlueWorkRequests", router,
+			[]appmessage.MessageCommand{appmessage.CmdRequestBlockBlueWork}, isStopping, errChan,
+			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
+				return blockrelay.HandleBlockBlueWorkRequests(m.context, incomingRoute, outgoingRoute, peer)
+			},
+		),
+
+		m.registerFlow("HandlePruningPointAndItsAnticoneRequests", router,
+			[]appmessage.MessageCommand{appmessage.CmdRequestPruningPointAndItsAnticone}, isStopping, errChan,
+			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
+				return blockrelay.HandlePruningPointAndItsAnticoneRequests(m.context, incomingRoute, outgoingRoute, peer)
 			},
 		),
 
@@ -282,7 +291,7 @@ func (m *Manager) registerRejectsFlow(router *routerpkg.Router, isStopping *uint
 func (m *Manager) registerFlow(name string, router *routerpkg.Router, messageTypes []appmessage.MessageCommand, isStopping *uint32,
 	errChan chan error, initializeFunc flowInitializeFunc) *flow {
 
-	route, err := router.AddIncomingRoute(messageTypes)
+	route, err := router.AddIncomingRoute(name, messageTypes)
 	if err != nil {
 		panic(err)
 	}
@@ -294,7 +303,7 @@ func (m *Manager) registerFlowWithCapacity(name string, capacity int, router *ro
 	messageTypes []appmessage.MessageCommand, isStopping *uint32,
 	errChan chan error, initializeFunc flowInitializeFunc) *flow {
 
-	route, err := router.AddIncomingRouteWithCapacity(capacity, messageTypes)
+	route, err := router.AddIncomingRouteWithCapacity(name, capacity, messageTypes)
 	if err != nil {
 		panic(err)
 	}
@@ -320,7 +329,7 @@ func (m *Manager) registerFlowForRoute(route *routerpkg.Route, name string, isSt
 func (m *Manager) registerOneTimeFlow(name string, router *routerpkg.Router, messageTypes []appmessage.MessageCommand,
 	isStopping *uint32, stopChan chan error, initializeFunc flowInitializeFunc) *flow {
 
-	route, err := router.AddIncomingRoute(messageTypes)
+	route, err := router.AddIncomingRoute(name, messageTypes)
 	if err != nil {
 		panic(err)
 	}
@@ -346,12 +355,12 @@ func (m *Manager) registerOneTimeFlow(name string, router *routerpkg.Router, mes
 
 func registerHandshakeRoutes(router *routerpkg.Router) (
 	receiveVersionRoute *routerpkg.Route, sendVersionRoute *routerpkg.Route) {
-	receiveVersionRoute, err := router.AddIncomingRoute([]appmessage.MessageCommand{appmessage.CmdVersion})
+	receiveVersionRoute, err := router.AddIncomingRoute("recieveVersion - incoming", []appmessage.MessageCommand{appmessage.CmdVersion})
 	if err != nil {
 		panic(err)
 	}
 
-	sendVersionRoute, err = router.AddIncomingRoute([]appmessage.MessageCommand{appmessage.CmdVerAck})
+	sendVersionRoute, err = router.AddIncomingRoute("sendVersion - incoming", []appmessage.MessageCommand{appmessage.CmdVerAck})
 	if err != nil {
 		panic(err)
 	}

app/rpc/manager.go

@@ -162,12 +162,12 @@ func (m *Manager) notifyVirtualDaaScoreChanged() error {
 	onEnd := logger.LogAndMeasureExecutionTime(log, "RPCManager.NotifyVirtualDaaScoreChanged")
 	defer onEnd()
 
-	virtualInfo, err := m.context.Domain.Consensus().GetVirtualInfo()
+	virtualDAAScore, err := m.context.Domain.Consensus().GetVirtualDAAScore()
 	if err != nil {
 		return err
 	}
 
-	notification := appmessage.NewVirtualDaaScoreChangedNotificationMessage(virtualInfo.DAAScore)
+	notification := appmessage.NewVirtualDaaScoreChangedNotificationMessage(virtualDAAScore)
 	return m.context.NotificationManager.NotifyVirtualDaaScoreChanged(notification)
 }
 

app/rpc/rpc.go

@@ -53,7 +53,7 @@ func (m *Manager) routerInitializer(router *router.Router, netConnection *netada
 	for messageType := range handlers {
 		messageTypes = append(messageTypes, messageType)
 	}
-	incomingRoute, err := router.AddIncomingRoute(messageTypes)
+	incomingRoute, err := router.AddIncomingRoute("rpc router", messageTypes)
 	if err != nil {
 		panic(err)
 	}

app/rpc/rpccontext/chain_changed.go

@@ -3,7 +3,6 @@ package rpccontext
 import (
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
-	"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
 )
 
 // ConvertVirtualSelectedParentChainChangesToChainChangedNotificationMessage converts
@@ -16,29 +15,9 @@ func (ctx *Context) ConvertVirtualSelectedParentChainChangesToChainChangedNotifi
 		removedChainBlockHashes[i] = removed.String()
 	}
 
-	addedChainBlocks := make([]*appmessage.ChainBlock, len(selectedParentChainChanges.Added))
+	addedChainBlocks := make([]string, len(selectedParentChainChanges.Added))
 	for i, added := range selectedParentChainChanges.Added {
-		acceptanceData, err := ctx.Domain.Consensus().GetBlockAcceptanceData(added)
-		if err != nil {
-			return nil, err
-		}
-		acceptedBlocks := make([]*appmessage.AcceptedBlock, len(acceptanceData))
-		for j, acceptedBlock := range acceptanceData {
-			acceptedTransactionIDs := make([]string, len(acceptedBlock.TransactionAcceptanceData))
-			for k, transaction := range acceptedBlock.TransactionAcceptanceData {
-				transactionID := consensushashing.TransactionID(transaction.Transaction)
-				acceptedTransactionIDs[k] = transactionID.String()
-			}
-			acceptedBlocks[j] = &appmessage.AcceptedBlock{
-				Hash:                   acceptedBlock.BlockHash.String(),
-				AcceptedTransactionIDs: acceptedTransactionIDs,
-			}
-		}
-
-		addedChainBlocks[i] = &appmessage.ChainBlock{
-			Hash:           added.String(),
-			AcceptedBlocks: acceptedBlocks,
-		}
+		addedChainBlocks[i] = added.String()
 	}
 
 	return appmessage.NewVirtualSelectedParentChainChangedNotificationMessage(removedChainBlockHashes, addedChainBlocks), nil

app/rpc/rpccontext/verbosedata.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
 
-	"github.com/kaspanet/kaspad/domain/consensus/utils/estimatedsize"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/txscript"
 
 	"github.com/kaspanet/kaspad/app/appmessage"
@@ -114,10 +113,11 @@ func (ctx *Context) PopulateTransactionWithVerboseData(
 		return err
 	}
 
+	ctx.Domain.Consensus().PopulateMass(domainTransaction)
 	transaction.VerboseData = &appmessage.RPCTransactionVerboseData{
 		TransactionID: consensushashing.TransactionID(domainTransaction).String(),
 		Hash:          consensushashing.TransactionHash(domainTransaction).String(),
-		Size:          estimatedsize.TransactionEstimatedSerializedSize(domainTransaction),
+		Mass:          domainTransaction.Mass,
 	}
 	if domainBlockHeader != nil {
 		transaction.VerboseData.BlockHash = consensushashing.HeaderHash(domainBlockHeader).String()

app/rpc/rpchandlers/ban.go

@@ -12,8 +12,12 @@ func HandleBan(context *rpccontext.Context, _ *router.Router, request appmessage
 	banRequest := request.(*appmessage.BanRequestMessage)
 	ip := net.ParseIP(banRequest.IP)
 	if ip == nil {
+		hint := ""
+		if banRequest.IP[0] == '[' {
+			hint = " (try to remove “[” and “]” symbols)"
+		}
 		errorMessage := &appmessage.BanResponseMessage{}
-		errorMessage.Error = appmessage.RPCErrorf("Could not parse IP %s", banRequest.IP)
+		errorMessage.Error = appmessage.RPCErrorf("Could not parse IP%s: %s", hint, banRequest.IP)
 		return errorMessage, nil
 	}
 

app/rpc/rpchandlers/get_blocks.go

@@ -8,12 +8,6 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
-const (
-	// maxBlocksInGetBlocksResponse is the max amount of blocks that are
-	// allowed in a GetBlocksResult.
-	maxBlocksInGetBlocksResponse = 1000
-)
-
 // HandleGetBlocks handles the respectively named RPC command
 func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appmessage.Message) (appmessage.Message, error) {
 	getBlocksRequest := request.(*appmessage.GetBlocksRequestMessage)
@@ -55,7 +49,11 @@ func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appm
 	if err != nil {
 		return nil, err
 	}
-	blockHashes, highHash, err := context.Domain.Consensus().GetHashesBetween(lowHash, virtualSelectedParent, maxBlocksInGetBlocksResponse)
+
+	// We use +1 because lowHash is also returned
+	// maxBlocks MUST be >= MergeSetSizeLimit + 1
+	maxBlocks := context.Config.NetParams().MergeSetSizeLimit + 1
+	blockHashes, highHash, err := context.Domain.Consensus().GetHashesBetween(lowHash, virtualSelectedParent, maxBlocks)
 	if err != nil {
 		return nil, err
 	}
@@ -74,12 +72,6 @@ func HandleGetBlocks(context *rpccontext.Context, _ *router.Router, request appm
 		blockHashes = append(blockHashes, virtualSelectedParentAnticone...)
 	}
 
-	// Both GetHashesBetween and Anticone might return more then the allowed number of blocks, so
-	// trim any extra blocks.
-	if len(blockHashes) > maxBlocksInGetBlocksResponse {
-		blockHashes = blockHashes[:maxBlocksInGetBlocksResponse]
-	}
-
 	// Prepare the response
 	response := appmessage.NewGetBlocksResponseMessage()
 	response.BlockHashes = hashes.ToStrings(blockHashes)

app/rpc/rpchandlers/get_blocks_test.go

@@ -23,6 +23,22 @@ type fakeDomain struct {
 	testapi.TestConsensus
 }
 
+func (d fakeDomain) DeleteStagingConsensus() error {
+	panic("implement me")
+}
+
+func (d fakeDomain) StagingConsensus() externalapi.Consensus {
+	panic("implement me")
+}
+
+func (d fakeDomain) InitStagingConsensus() error {
+	panic("implement me")
+}
+
+func (d fakeDomain) CommitStagingConsensus() error {
+	panic("implement me")
+}
+
 func (d fakeDomain) Consensus() externalapi.Consensus           { return d }
 func (d fakeDomain) MiningManager() miningmanager.MiningManager { return nil }
 

app/rpc/rpchandlers/get_info.go

@@ -4,6 +4,7 @@ import (
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/app/rpc/rpccontext"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+	"github.com/kaspanet/kaspad/version"
 )
 
 // HandleGetInfo handles the respectively named RPC command
@@ -11,6 +12,7 @@ func HandleGetInfo(context *rpccontext.Context, _ *router.Router, _ appmessage.M
 	response := appmessage.NewGetInfoResponseMessage(
 		context.NetAdapter.ID().String(),
 		uint64(context.Domain.MiningManager().TransactionCount()),
+		version.Version(),
 	)
 
 	return response, nil

app/rpc/rpchandlers/get_virtual_selected_parent_blue_score.go

@@ -8,9 +8,14 @@ import (
 
 // HandleGetVirtualSelectedParentBlueScore handles the respectively named RPC command
 func HandleGetVirtualSelectedParentBlueScore(context *rpccontext.Context, _ *router.Router, _ appmessage.Message) (appmessage.Message, error) {
-	virtualInfo, err := context.Domain.Consensus().GetVirtualInfo()
+	c := context.Domain.Consensus()
+	selectedParent, err := c.GetVirtualSelectedParent()
 	if err != nil {
 		return nil, err
 	}
-	return appmessage.NewGetVirtualSelectedParentBlueScoreResponseMessage(virtualInfo.BlueScore), nil
+	blockInfo, err := c.GetBlockInfo(selectedParent)
+	if err != nil {
+		return nil, err
+	}
+	return appmessage.NewGetVirtualSelectedParentBlueScoreResponseMessage(blockInfo.BlueScore), nil
 }

app/rpc/rpchandlers/get_virtual_selected_parent_chain_from_block.go

@@ -32,6 +32,6 @@ func HandleGetVirtualSelectedParentChainFromBlock(context *rpccontext.Context, _
 	}
 
 	response := appmessage.NewGetVirtualSelectedParentChainFromBlockResponseMessage(
-		chainChangedNotification.RemovedChainBlockHashes, chainChangedNotification.AddedChainBlocks)
+		chainChangedNotification.RemovedChainBlockHashes, chainChangedNotification.AddedChainBlockHashes)
 	return response, nil
 }

app/rpc/rpchandlers/submit_transaction.go

@@ -21,7 +21,7 @@ func HandleSubmitTransaction(context *rpccontext.Context, _ *router.Router, requ
 	}
 
 	transactionID := consensushashing.TransactionID(domainTransaction)
-	err = context.ProtocolManager.AddTransaction(domainTransaction)
+	err = context.ProtocolManager.AddTransaction(domainTransaction, submitTransactionRequest.AllowOrphan)
 	if err != nil {
 		if !errors.As(err, &mempool.RuleError{}) {
 			return nil, err

app/rpc/rpchandlers/unban.go

@@ -12,8 +12,12 @@ func HandleUnban(context *rpccontext.Context, _ *router.Router, request appmessa
 	unbanRequest := request.(*appmessage.UnbanRequestMessage)
 	ip := net.ParseIP(unbanRequest.IP)
 	if ip == nil {
+		hint := ""
+		if unbanRequest.IP[0] == '[' {
+			hint = " (try to remove “[” and “]” symbols)"
+		}
 		errorMessage := &appmessage.UnbanResponseMessage{}
-		errorMessage.Error = appmessage.RPCErrorf("Could not parse IP %s", unbanRequest.IP)
+		errorMessage.Error = appmessage.RPCErrorf("Could not parse IP%s: %s", hint, unbanRequest.IP)
 		return errorMessage, nil
 	}
 	err := context.AddressManager.Unban(appmessage.NewNetAddressIPPort(ip, 0))

cmd/kaspactl/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/kaspanet/kaspad/version"
 	"os"
 	"time"
 
@@ -33,6 +34,18 @@ func main() {
 	}
 	defer client.Disconnect()
 
+	kaspadMessage, err := client.Post(&protowire.KaspadMessage{Payload: &protowire.KaspadMessage_GetInfoRequest{GetInfoRequest: &protowire.GetInfoRequestMessage{}}})
+	if err != nil {
+		printErrorAndExit(fmt.Sprintf("Cannot post GetInfo message: %s", err))
+	}
+
+	localVersion := version.Version()
+	remoteVersion := kaspadMessage.GetGetInfoResponse().ServerVersion
+
+	if localVersion != remoteVersion {
+		printErrorAndExit(fmt.Sprintf("Server version mismatch, expect: %s, got: %s", localVersion, remoteVersion))
+	}
+
 	responseChan := make(chan string)
 
 	if cfg.RequestJSON != "" {

cmd/kaspawallet/daemon/client/client.go

@@ -1,14 +1,26 @@
 package client
 
 import (
+	"context"
+	"time"
+
+	"github.com/pkg/errors"
+
 	"github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/pb"
 	"google.golang.org/grpc"
 )
 
 // Connect connects to the kaspawalletd server, and returns the client instance
 func Connect(address string) (pb.KaspawalletdClient, func(), error) {
-	conn, err := grpc.Dial(address, grpc.WithInsecure(), grpc.WithBlock())
+	// Connection is local, so 1 second timeout is sufficient
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+
+	conn, err := grpc.DialContext(ctx, address, grpc.WithInsecure(), grpc.WithBlock())
 	if err != nil {
+		if errors.Is(err, context.DeadlineExceeded) {
+			return nil, nil, errors.New("kaspactl daemon is not running, start it with `kaspactl start-daemon`")
+		}
 		return nil, nil, err
 	}
 

cmd/kaspawallet/daemon/server/broadcast.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"context"
+
 	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/pb"
 	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet"
@@ -25,7 +26,7 @@ func (s *server) Broadcast(_ context.Context, request *pb.BroadcastRequest) (*pb
 }
 
 func sendTransaction(client *rpcclient.RPCClient, tx *externalapi.DomainTransaction) (string, error) {
-	submitTransactionResponse, err := client.SubmitTransaction(appmessage.DomainTransactionToRPCTransaction(tx))
+	submitTransactionResponse, err := client.SubmitTransaction(appmessage.DomainTransactionToRPCTransaction(tx), false)
 	if err != nil {
 		return "", errors.Wrapf(err, "error submitting transaction")
 	}

cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.pb.go

@@ -89,7 +89,7 @@ type PartiallySignedInput struct {
 	PrevOutput           *TransactionOutput     `protobuf:"bytes,2,opt,name=prevOutput,proto3" json:"prevOutput,omitempty"`
 	MinimumSignatures    uint32                 `protobuf:"varint,3,opt,name=minimumSignatures,proto3" json:"minimumSignatures,omitempty"`
 	PubKeySignaturePairs []*PubKeySignaturePair `protobuf:"bytes,4,rep,name=pubKeySignaturePairs,proto3" json:"pubKeySignaturePairs,omitempty"`
-	DerivationPath       string                 `protobuf:"bytes,5,opt,name=DerivationPath,proto3" json:"DerivationPath,omitempty"`
+	DerivationPath       string                 `protobuf:"bytes,5,opt,name=derivationPath,proto3" json:"derivationPath,omitempty"`
 }
 
 func (x *PartiallySignedInput) Reset() {
@@ -364,6 +364,7 @@ type TransactionInput struct {
 	PreviousOutpoint *Outpoint `protobuf:"bytes,1,opt,name=previousOutpoint,proto3" json:"previousOutpoint,omitempty"`
 	SignatureScript  []byte    `protobuf:"bytes,2,opt,name=signatureScript,proto3" json:"signatureScript,omitempty"`
 	Sequence         uint64    `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	SigOpCount       uint32    `protobuf:"varint,4,opt,name=sigOpCount,proto3" json:"sigOpCount,omitempty"`
 }
 
 func (x *TransactionInput) Reset() {
@@ -419,6 +420,13 @@ func (x *TransactionInput) GetSequence() uint64 {
 	return 0
 }
 
+func (x *TransactionInput) GetSigOpCount() uint32 {
+	if x != nil {
+		return x.SigOpCount
+	}
+	return 0
+}
+
 type Outpoint struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -664,9 +672,9 @@ var file_wallet_proto_rawDesc = []byte{
 	0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50,
 	0x75, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61,
 	0x69, 0x72, 0x52, 0x14, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x50, 0x61, 0x69, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x44, 0x65, 0x72, 0x69,
+	0x75, 0x72, 0x65, 0x50, 0x61, 0x69, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x65, 0x72, 0x69,
 	0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0e, 0x44, 0x65, 0x72, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x74, 0x68,
+	0x52, 0x0e, 0x64, 0x65, 0x72, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x74, 0x68,
 	0x22, 0x5b, 0x0a, 0x13, 0x50, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
 	0x75, 0x72, 0x65, 0x50, 0x61, 0x69, 0x72, 0x12, 0x26, 0x0a, 0x0e, 0x65, 0x78, 0x74, 0x65, 0x6e,
 	0x64, 0x65, 0x64, 0x50, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
@@ -695,7 +703,7 @@ var file_wallet_proto_rawDesc = []byte{
 	0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x61, 0x73, 0x18, 0x06, 0x20, 0x01,
 	0x28, 0x04, 0x52, 0x03, 0x67, 0x61, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f,
 	0x61, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61,
-	0x64, 0x22, 0xa2, 0x01, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x64, 0x22, 0xc2, 0x01, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
 	0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x48, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f,
 	0x75, 0x73, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
@@ -705,7 +713,9 @@ var file_wallet_proto_rawDesc = []byte{
 	0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x69, 0x67, 0x6e, 0x61,
 	0x74, 0x75, 0x72, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65,
 	0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x73, 0x65,
-	0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0x69, 0x0a, 0x08, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69,
+	0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x4f, 0x70, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x4f,
+	0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x69, 0x0a, 0x08, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69,
 	0x6e, 0x74, 0x12, 0x47, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
 	0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x54,

cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.proto

@@ -13,7 +13,7 @@ message PartiallySignedInput{
   TransactionOutput prevOutput = 2;
   uint32 minimumSignatures = 3;
   repeated PubKeySignaturePair pubKeySignaturePairs = 4;
-  string DerivationPath = 5;
+  string derivationPath = 5;
 }
 
 message PubKeySignaturePair{
@@ -39,6 +39,7 @@ message TransactionInput{
   Outpoint previousOutpoint = 1;
   bytes signatureScript = 2;
   uint64 sequence = 3;
+  uint32 sigOpCount = 4;
 }
 
 message Outpoint{

cmd/kaspawallet/libkaspawallet/serialization/serialization.go

@@ -1,12 +1,13 @@
 package serialization
 
 import (
+	"math"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet/serialization/protoserialization"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks"
 	"github.com/pkg/errors"
-	"math"
 )
 
 // PartiallySignedTransaction is a type that is intended
@@ -190,6 +191,10 @@ func transactionToProto(tx *externalapi.DomainTransaction) *protoserialization.T
 }
 
 func transactionInputFromProto(protoInput *protoserialization.TransactionInput) (*externalapi.DomainTransactionInput, error) {
+	if protoInput.SigOpCount > math.MaxUint8 {
+		return nil, errors.New("TransactionInput SigOpCount > math.MaxUint8")
+	}
+
 	outpoint, err := outpointFromProto(protoInput.PreviousOutpoint)
 	if err != nil {
 		return nil, err
@@ -199,6 +204,7 @@ func transactionInputFromProto(protoInput *protoserialization.TransactionInput)
 		PreviousOutpoint: *outpoint,
 		SignatureScript:  protoInput.SignatureScript,
 		Sequence:         protoInput.Sequence,
+		SigOpCount:       byte(protoInput.SigOpCount),
 	}, nil
 }
 
@@ -207,6 +213,7 @@ func transactionInputToProto(input *externalapi.DomainTransactionInput) *protose
 		PreviousOutpoint: outpointToProto(&input.PreviousOutpoint),
 		SignatureScript:  input.SignatureScript,
 		Sequence:         input.Sequence,
+		SigOpCount:       uint32(input.SigOpCount),
 	}
 }
 

cmd/kaspawallet/libkaspawallet/sign.go

@@ -58,6 +58,7 @@ func sign(params *dagconfig.Params, mnemonic string, partiallySignedTransaction
 			false, // This is a fake value, because it's irrelevant for the signature
 			0,     // This is a fake value, because it's irrelevant for the signature
 		)
+		partiallySignedTransaction.Tx.Inputs[i].SigOpCount = byte(len(partiallySignedInput.PubKeySignaturePairs))
 	}
 
 	signed := false

domain/consensus/consensus.go

@@ -1,6 +1,9 @@
 package consensus
 
 import (
+	"github.com/kaspanet/kaspad/infrastructure/logger"
+	"github.com/kaspanet/kaspad/util/staging"
+	"math/big"
 	"sync"
 
 	"github.com/kaspanet/kaspad/domain/consensus/database"
@@ -14,6 +17,9 @@ type consensus struct {
 	lock            *sync.Mutex
 	databaseContext model.DBManager
 
+	genesisBlock *externalapi.DomainBlock
+	genesisHash  *externalapi.DomainHash
+
 	blockProcessor        model.BlockProcessor
 	blockBuilder          model.BlockBuilder
 	consensusStateManager model.ConsensusStateManager
@@ -49,6 +55,88 @@ type consensus struct {
 	daaBlocksStore            model.DAABlocksStore
 }
 
+func (s *consensus) ValidateAndInsertBlockWithTrustedData(block *externalapi.BlockWithTrustedData, validateUTXO bool) (*externalapi.BlockInsertionResult, error) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	return s.blockProcessor.ValidateAndInsertBlockWithTrustedData(block, validateUTXO)
+}
+
+// Init initializes consensus
+func (s *consensus) Init(skipAddingGenesis bool) error {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	onEnd := logger.LogAndMeasureExecutionTime(log, "Init")
+	defer onEnd()
+
+	stagingArea := model.NewStagingArea()
+
+	exists, err := s.blockStatusStore.Exists(s.databaseContext, stagingArea, model.VirtualGenesisBlockHash)
+	if err != nil {
+		return err
+	}
+
+	// There should always be a virtual genesis block. Initially only the genesis points to this block, but
+	// on a node with pruned header all blocks without known parents points to it.
+	if !exists {
+		s.blockStatusStore.Stage(stagingArea, model.VirtualGenesisBlockHash, externalapi.StatusUTXOValid)
+		err = s.reachabilityManager.Init(stagingArea)
+		if err != nil {
+			return err
+		}
+
+		err = s.dagTopologyManager.SetParents(stagingArea, model.VirtualGenesisBlockHash, nil)
+		if err != nil {
+			return err
+		}
+
+		s.consensusStateStore.StageTips(stagingArea, []*externalapi.DomainHash{model.VirtualGenesisBlockHash})
+		s.ghostdagDataStore.Stage(stagingArea, model.VirtualGenesisBlockHash, externalapi.NewBlockGHOSTDAGData(
+			0,
+			big.NewInt(0),
+			nil,
+			nil,
+			nil,
+			nil,
+		), false)
+
+		err = staging.CommitAllChanges(s.databaseContext, stagingArea)
+		if err != nil {
+			return err
+		}
+	}
+
+	// The genesis should be added to the DAG if it's a fresh consensus, unless said otherwise (on a
+	// case where the consensus is used for a pruned headers node).
+	if !skipAddingGenesis && s.blockStore.Count(stagingArea) == 0 {
+		genesisWithTrustedData := &externalapi.BlockWithTrustedData{
+			Block:     s.genesisBlock,
+			DAAScore:  0,
+			DAAWindow: nil,
+			GHOSTDAGData: []*externalapi.BlockGHOSTDAGDataHashPair{
+				{
+					GHOSTDAGData: externalapi.NewBlockGHOSTDAGData(0, big.NewInt(0), model.VirtualGenesisBlockHash, nil, nil, make(map[externalapi.DomainHash]externalapi.KType)),
+					Hash:         s.genesisHash,
+				},
+			},
+		}
+		_, err = s.blockProcessor.ValidateAndInsertBlockWithTrustedData(genesisWithTrustedData, true)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (s *consensus) PruningPointAndItsAnticoneWithTrustedData() ([]*externalapi.BlockWithTrustedData, error) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	return s.pruningManager.PruningPointAndItsAnticoneWithTrustedData()
+}
+
 // BuildBlock builds a block over the current state, with the transactions
 // selected by the given transactionSelector
 func (s *consensus) BuildBlock(coinbaseData *externalapi.DomainCoinbaseData,
@@ -62,11 +150,11 @@ func (s *consensus) BuildBlock(coinbaseData *externalapi.DomainCoinbaseData,
 
 // ValidateAndInsertBlock validates the given block and, if valid, applies it
 // to the current state
-func (s *consensus) ValidateAndInsertBlock(block *externalapi.DomainBlock) (*externalapi.BlockInsertionResult, error) {
+func (s *consensus) ValidateAndInsertBlock(block *externalapi.DomainBlock, shouldValidateAgainstUTXO bool) (*externalapi.BlockInsertionResult, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	return s.blockProcessor.ValidateAndInsertBlock(block)
+	return s.blockProcessor.ValidateAndInsertBlock(block, shouldValidateAgainstUTXO)
 }
 
 // ValidateTransactionAndPopulateWithConsensusData validates the given transaction
@@ -87,13 +175,12 @@ func (s *consensus) ValidateTransactionAndPopulateWithConsensusData(transaction
 		return err
 	}
 
-	virtualSelectedParentMedianTime, err := s.pastMedianTimeManager.PastMedianTime(stagingArea, model.VirtualBlockHash)
+	err = s.transactionValidator.ValidateTransactionInContextIgnoringUTXO(stagingArea, transaction, model.VirtualBlockHash)
 	if err != nil {
 		return err
 	}
-
-	return s.transactionValidator.ValidateTransactionInContextAndPopulateMassAndFee(
-		stagingArea, transaction, model.VirtualBlockHash, virtualSelectedParentMedianTime)
+	return s.transactionValidator.ValidateTransactionInContextAndPopulateFee(
+		stagingArea, transaction, model.VirtualBlockHash)
 }
 
 func (s *consensus) GetBlock(blockHash *externalapi.DomainHash) (*externalapi.DomainBlock, error) {
@@ -180,12 +267,13 @@ func (s *consensus) GetBlockInfo(blockHash *externalapi.DomainHash) (*externalap
 		return blockInfo, nil
 	}
 
-	ghostdagData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, blockHash)
+	ghostdagData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, blockHash, false)
 	if err != nil {
 		return nil, err
 	}
 
 	blockInfo.BlueScore = ghostdagData.BlueScore()
+	blockInfo.BlueWork = ghostdagData.BlueWork()
 
 	return blockInfo, nil
 }
@@ -204,7 +292,7 @@ func (s *consensus) GetBlockRelations(blockHash *externalapi.DomainHash) (
 		return nil, nil, nil, err
 	}
 
-	blockGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, blockHash)
+	blockGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, blockHash, false)
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -226,7 +314,7 @@ func (s *consensus) GetBlockAcceptanceData(blockHash *externalapi.DomainHash) (e
 	return s.acceptanceDataStore.Get(s.databaseContext, stagingArea, blockHash)
 }
 
-func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash, maxBlueScoreDifference uint64) (
+func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash, maxBlocks uint64) (
 	hashes []*externalapi.DomainHash, actualHighHash *externalapi.DomainHash, err error) {
 
 	s.lock.Lock()
@@ -243,7 +331,7 @@ func (s *consensus) GetHashesBetween(lowHash, highHash *externalapi.DomainHash,
 		return nil, nil, err
 	}
 
-	return s.syncManager.GetHashesBetween(stagingArea, lowHash, highHash, maxBlueScoreDifference)
+	return s.syncManager.GetHashesBetween(stagingArea, lowHash, highHash, maxBlocks)
 }
 
 func (s *consensus) GetMissingBlockBodyHashes(highHash *externalapi.DomainHash) ([]*externalapi.DomainHash, error) {
@@ -335,7 +423,7 @@ func (s *consensus) AppendImportedPruningPointUTXOs(outpointAndUTXOEntryPairs []
 	return s.pruningManager.AppendImportedPruningPointUTXOs(outpointAndUTXOEntryPairs)
 }
 
-func (s *consensus) ValidateAndInsertImportedPruningPoint(newPruningPoint *externalapi.DomainBlock) error {
+func (s *consensus) ValidateAndInsertImportedPruningPoint(newPruningPoint *externalapi.DomainHash) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
@@ -348,7 +436,7 @@ func (s *consensus) GetVirtualSelectedParent() (*externalapi.DomainHash, error)
 
 	stagingArea := model.NewStagingArea()
 
-	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, model.VirtualBlockHash)
+	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, model.VirtualBlockHash, false)
 	if err != nil {
 		return nil, err
 	}
@@ -382,7 +470,7 @@ func (s *consensus) GetVirtualInfo() (*externalapi.VirtualInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, model.VirtualBlockHash)
+	virtualGHOSTDAGData, err := s.ghostdagDataStore.Get(s.databaseContext, stagingArea, model.VirtualBlockHash, false)
 	if err != nil {
 		return nil, err
 	}
@@ -401,22 +489,32 @@ func (s *consensus) GetVirtualInfo() (*externalapi.VirtualInfo, error) {
 	}, nil
 }
 
-func (s *consensus) CreateBlockLocator(lowHash, highHash *externalapi.DomainHash, limit uint32) (externalapi.BlockLocator, error) {
+func (s *consensus) GetVirtualDAAScore() (uint64, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
 	stagingArea := model.NewStagingArea()
 
-	err := s.validateBlockHashExists(stagingArea, lowHash)
-	if err != nil {
-		return nil, err
-	}
-	err = s.validateBlockHashExists(stagingArea, highHash)
+	return s.daaBlocksStore.DAAScore(s.databaseContext, stagingArea, model.VirtualBlockHash)
+}
+
+func (s *consensus) CreateBlockLocatorFromPruningPoint(highHash *externalapi.DomainHash, limit uint32) (externalapi.BlockLocator, error) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	stagingArea := model.NewStagingArea()
+
+	err := s.validateBlockHashExists(stagingArea, highHash)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.syncManager.CreateBlockLocator(stagingArea, lowHash, highHash, limit)
+	pruningPoint, err := s.pruningStore.PruningPoint(s.databaseContext, stagingArea)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.syncManager.CreateBlockLocator(stagingArea, pruningPoint, highHash, limit)
 }
 
 func (s *consensus) CreateFullHeadersSelectedChainBlockLocator() (externalapi.BlockLocator, error) {
@@ -542,3 +640,29 @@ func (s *consensus) EstimateNetworkHashesPerSecond(startHash *externalapi.Domain
 
 	return s.difficultyManager.EstimateNetworkHashesPerSecond(startHash, windowSize)
 }
+
+func (s *consensus) PopulateMass(transaction *externalapi.DomainTransaction) {
+	s.transactionValidator.PopulateMass(transaction)
+}
+
+func (s *consensus) ResolveVirtual() error {
+	// In order to prevent a situation that the consensus lock is held for too much time, we
+	// release the lock each time resolve 100 blocks.
+	for {
+		var isCompletelyResolved bool
+		var err error
+		func() {
+			s.lock.Lock()
+			defer s.lock.Unlock()
+
+			isCompletelyResolved, err = s.consensusStateManager.ResolveVirtual(100)
+		}()
+		if err != nil {
+			return err
+		}
+
+		if isCompletelyResolved {
+			return nil
+		}
+	}
+}

domain/consensus/consensus_test.go

@@ -27,7 +27,7 @@ func TestConsensus_GetBlockInfo(t *testing.T) {
 		newHeader := invalidBlock.Header.ToMutable()
 		newHeader.SetTimeInMilliseconds(0)
 		invalidBlock.Header = newHeader.ToImmutable()
-		_, err = consensus.ValidateAndInsertBlock(invalidBlock)
+		_, err = consensus.ValidateAndInsertBlock(invalidBlock, true)
 		if !errors.Is(err, ruleerrors.ErrTimeTooOld) {
 			t.Fatalf("Expected block to be invalid with err: %v, instead found: %v", ruleerrors.ErrTimeTooOld, err)
 		}
@@ -55,7 +55,7 @@ func TestConsensus_GetBlockInfo(t *testing.T) {
 			t.Fatalf("consensus.BuildBlock with an empty coinbase shouldn't fail: %v", err)
 		}
 
-		_, err = consensus.ValidateAndInsertBlock(validBlock)
+		_, err = consensus.ValidateAndInsertBlock(validBlock, true)
 		if err != nil {
 			t.Fatalf("consensus.ValidateAndInsertBlock with a block straight from consensus.BuildBlock should not fail: %v", err)
 		}

domain/consensus/constructors.go

@@ -8,13 +8,18 @@ import (
 )
 
 // 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(
+	databaseContext model.DBReader,
+	dagTopologyManager model.DAGTopologyManager,
+	ghostdagDataStore model.GHOSTDAGDataStore,
+	headerStore model.BlockHeaderStore,
+	k externalapi.KType,
+	genesisHash *externalapi.DomainHash) 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.DAABlocksStore, model.DAGTopologyManager, model.DAGTraversalManager, *big.Int, int, bool, time.Duration,
-	*externalapi.DomainHash) model.DifficultyManager
+	*externalapi.DomainHash, uint32) 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,

domain/consensus/database/serialization/block_ghostdag_data.go

@@ -1,13 +1,12 @@
 package serialization
 
 import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"math/big"
 )
 
 // BlockGHOSTDAGDataToDBBlockGHOSTDAGData converts BlockGHOSTDAGData to DbBlockGhostdagData
-func BlockGHOSTDAGDataToDBBlockGHOSTDAGData(blockGHOSTDAGData *model.BlockGHOSTDAGData) *DbBlockGhostdagData {
+func BlockGHOSTDAGDataToDBBlockGHOSTDAGData(blockGHOSTDAGData *externalapi.BlockGHOSTDAGData) *DbBlockGhostdagData {
 	var selectedParent *DbHash
 	if blockGHOSTDAGData.SelectedParent() != nil {
 		selectedParent = DomainHashToDbHash(blockGHOSTDAGData.SelectedParent())
@@ -24,7 +23,7 @@ func BlockGHOSTDAGDataToDBBlockGHOSTDAGData(blockGHOSTDAGData *model.BlockGHOSTD
 }
 
 // DBBlockGHOSTDAGDataToBlockGHOSTDAGData converts DbBlockGhostdagData to BlockGHOSTDAGData
-func DBBlockGHOSTDAGDataToBlockGHOSTDAGData(dbBlockGHOSTDAGData *DbBlockGhostdagData) (*model.BlockGHOSTDAGData, error) {
+func DBBlockGHOSTDAGDataToBlockGHOSTDAGData(dbBlockGHOSTDAGData *DbBlockGhostdagData) (*externalapi.BlockGHOSTDAGData, error) {
 	var selectedParent *externalapi.DomainHash
 	if dbBlockGHOSTDAGData.SelectedParent != nil {
 		var err error
@@ -49,7 +48,7 @@ func DBBlockGHOSTDAGDataToBlockGHOSTDAGData(dbBlockGHOSTDAGData *DbBlockGhostdag
 		return nil, err
 	}
 
-	return model.NewBlockGHOSTDAGData(
+	return externalapi.NewBlockGHOSTDAGData(
 		dbBlockGHOSTDAGData.BlueScore,
 		new(big.Int).SetBytes(dbBlockGHOSTDAGData.BlueWork),
 		selectedParent,

domain/consensus/database/serialization/blues_anticone_sizes.go

@@ -1,12 +1,11 @@
 package serialization
 
 import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/pkg/errors"
 )
 
-func bluesAnticoneSizesToDBBluesAnticoneSizes(bluesAnticoneSizes map[externalapi.DomainHash]model.KType) []*DbBluesAnticoneSizes {
+func bluesAnticoneSizesToDBBluesAnticoneSizes(bluesAnticoneSizes map[externalapi.DomainHash]externalapi.KType) []*DbBluesAnticoneSizes {
 	dbBluesAnticoneSizes := make([]*DbBluesAnticoneSizes, len(bluesAnticoneSizes))
 	i := 0
 	for hash, anticoneSize := range bluesAnticoneSizes {
@@ -21,8 +20,8 @@ func bluesAnticoneSizesToDBBluesAnticoneSizes(bluesAnticoneSizes map[externalapi
 	return dbBluesAnticoneSizes
 }
 
-func dbBluesAnticoneSizesToBluesAnticoneSizes(dbBluesAnticoneSizes []*DbBluesAnticoneSizes) (map[externalapi.DomainHash]model.KType, error) {
-	bluesAnticoneSizes := make(map[externalapi.DomainHash]model.KType, len(dbBluesAnticoneSizes))
+func dbBluesAnticoneSizesToBluesAnticoneSizes(dbBluesAnticoneSizes []*DbBluesAnticoneSizes) (map[externalapi.DomainHash]externalapi.KType, error) {
+	bluesAnticoneSizes := make(map[externalapi.DomainHash]externalapi.KType, len(dbBluesAnticoneSizes))
 
 	for _, data := range dbBluesAnticoneSizes {
 		hash, err := DbHashToDomainHash(data.BlueHash)
@@ -39,8 +38,8 @@ func dbBluesAnticoneSizesToBluesAnticoneSizes(dbBluesAnticoneSizes []*DbBluesAnt
 	return bluesAnticoneSizes, nil
 }
 
-func uint32ToKType(n uint32) (model.KType, error) {
-	convertedN := model.KType(n)
+func uint32ToKType(n uint32) (externalapi.KType, error) {
+	convertedN := externalapi.KType(n)
 	if uint32(convertedN) != n {
 		return 0, errors.Errorf("cannot convert %d to KType without losing data", n)
 	}

domain/consensus/database/serialization/blues_anticone_sizes_test.go

@@ -1,27 +1,27 @@
 package serialization
 
 import (
-	"github.com/kaspanet/kaspad/domain/consensus/model"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"testing"
 )
 
-// TestBlueAnticoneSizesSize tests that no data can be loss when converting model.KType to the corresponding type in
+// TestBlueAnticoneSizesSize tests that no data can be loss when converting externalapi.KType to the corresponding type in
 // DbBluesAnticoneSizes
 func TestKType(t *testing.T) {
-	k := model.KType(0)
+	k := externalapi.KType(0)
 	k--
 
-	if k < model.KType(0) {
+	if k < externalapi.KType(0) {
 		t.Fatalf("KType must be unsigned")
 	}
 
 	// Setting maxKType to maximum value of KType.
 	// As we verify above that KType is unsigned we can be sure that maxKType is indeed the maximum value of KType.
-	maxKType := ^model.KType(0)
+	maxKType := ^externalapi.KType(0)
 	dbBluesAnticoneSizes := DbBluesAnticoneSizes{
 		AnticoneSize: uint32(maxKType),
 	}
-	if model.KType(dbBluesAnticoneSizes.AnticoneSize) != maxKType {
+	if externalapi.KType(dbBluesAnticoneSizes.AnticoneSize) != maxKType {
 		t.Fatalf("convert from uint32 to KType losses data")
 	}
 }

domain/consensus/database/serialization/daa_block.go

@@ -0,0 +1,31 @@
+package serialization
+
+import (
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+)
+
+// BlockGHOSTDAGDataHashPairToDbBlockGhostdagDataHashPair converts *externalapi.BlockGHOSTDAGDataHashPair to *DbBlockGHOSTDAGDataHashPair
+func BlockGHOSTDAGDataHashPairToDbBlockGhostdagDataHashPair(pair *externalapi.BlockGHOSTDAGDataHashPair) *DbBlockGHOSTDAGDataHashPair {
+	return &DbBlockGHOSTDAGDataHashPair{
+		Hash:         DomainHashToDbHash(pair.Hash),
+		GhostdagData: BlockGHOSTDAGDataToDBBlockGHOSTDAGData(pair.GHOSTDAGData),
+	}
+}
+
+// DbBlockGHOSTDAGDataHashPairToBlockGHOSTDAGDataHashPair converts *DbBlockGHOSTDAGDataHashPair to *externalapi.BlockGHOSTDAGDataHashPair
+func DbBlockGHOSTDAGDataHashPairToBlockGHOSTDAGDataHashPair(dbPair *DbBlockGHOSTDAGDataHashPair) (*externalapi.BlockGHOSTDAGDataHashPair, error) {
+	hash, err := DbHashToDomainHash(dbPair.Hash)
+	if err != nil {
+		return nil, err
+	}
+
+	ghostdagData, err := DBBlockGHOSTDAGDataToBlockGHOSTDAGData(dbPair.GhostdagData)
+	if err != nil {
+		return nil, err
+	}
+
+	return &externalapi.BlockGHOSTDAGDataHashPair{
+		Hash:         hash,
+		GHOSTDAGData: ghostdagData,
+	}, nil
+}

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

@@ -333,6 +333,7 @@ type DbTransactionInput struct {
 	PreviousOutpoint *DbOutpoint `protobuf:"bytes,1,opt,name=previousOutpoint,proto3" json:"previousOutpoint,omitempty"`
 	SignatureScript  []byte      `protobuf:"bytes,2,opt,name=signatureScript,proto3" json:"signatureScript,omitempty"`
 	Sequence         uint64      `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	SigOpCount       uint32      `protobuf:"varint,4,opt,name=sigOpCount,proto3" json:"sigOpCount,omitempty"`
 }
 
 func (x *DbTransactionInput) Reset() {
@@ -388,6 +389,13 @@ func (x *DbTransactionInput) GetSequence() uint64 {
 	return 0
 }
 
+func (x *DbTransactionInput) GetSigOpCount() uint32 {
+	if x != nil {
+		return x.SigOpCount
+	}
+	return 0
+}
+
 type DbOutpoint struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1606,6 +1614,61 @@ func (x *DbBlockHeaderCount) GetCount() uint64 {
 	return 0
 }
 
+type DbBlockGHOSTDAGDataHashPair struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Hash         *DbHash              `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
+	GhostdagData *DbBlockGhostdagData `protobuf:"bytes,2,opt,name=GhostdagData,proto3" json:"GhostdagData,omitempty"`
+}
+
+func (x *DbBlockGHOSTDAGDataHashPair) Reset() {
+	*x = DbBlockGHOSTDAGDataHashPair{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_dbobjects_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DbBlockGHOSTDAGDataHashPair) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DbBlockGHOSTDAGDataHashPair) ProtoMessage() {}
+
+func (x *DbBlockGHOSTDAGDataHashPair) ProtoReflect() protoreflect.Message {
+	mi := &file_dbobjects_proto_msgTypes[27]
+	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 DbBlockGHOSTDAGDataHashPair.ProtoReflect.Descriptor instead.
+func (*DbBlockGHOSTDAGDataHashPair) Descriptor() ([]byte, []int) {
+	return file_dbobjects_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *DbBlockGHOSTDAGDataHashPair) GetHash() *DbHash {
+	if x != nil {
+		return x.Hash
+	}
+	return nil
+}
+
+func (x *DbBlockGHOSTDAGDataHashPair) GetGhostdagData() *DbBlockGhostdagData {
+	if x != nil {
+		return x.GhostdagData
+	}
+	return nil
+}
+
 var File_dbobjects_proto protoreflect.FileDescriptor
 
 var file_dbobjects_proto_rawDesc = []byte{
@@ -1664,7 +1727,7 @@ var file_dbobjects_proto_rawDesc = []byte{
 	0x49, 0x64, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x44,
 	0x12, 0x10, 0x0a, 0x03, 0x67, 0x61, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x67,
 	0x61, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xa1, 0x01, 0x0a,
+	0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xc1, 0x01, 0x0a,
 	0x12, 0x44, 0x62, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e,
 	0x70, 0x75, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x4f,
 	0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
@@ -1675,6 +1738,8 @@ var file_dbobjects_proto_rawDesc = []byte{
 	0x01, 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x63,
 	0x72, 0x69, 0x70, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65,
+	0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x4f, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x4f, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74,
 	0x22, 0x68, 0x0a, 0x0a, 0x44, 0x62, 0x4f, 0x75, 0x74, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x44,
 	0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a,
@@ -1837,10 +1902,19 @@ var file_dbobjects_proto_rawDesc = []byte{
 	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,
+	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x90, 0x01, 0x0a, 0x1b, 0x44, 0x62, 0x42, 0x6c,
+	0x6f, 0x63, 0x6b, 0x47, 0x48, 0x4f, 0x53, 0x54, 0x44, 0x41, 0x47, 0x44, 0x61, 0x74, 0x61, 0x48,
+	0x61, 0x73, 0x68, 0x50, 0x61, 0x69, 0x72, 0x12, 0x29, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18,
+	0x01, 0x20, 0x01, 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, 0x68, 0x61,
+	0x73, 0x68, 0x12, 0x46, 0x0a, 0x0c, 0x47, 0x68, 0x6f, 0x73, 0x74, 0x64, 0x61, 0x67, 0x44, 0x61,
+	0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61,
+	0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x62, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+	0x47, 0x68, 0x6f, 0x73, 0x74, 0x64, 0x61, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0c, 0x47, 0x68,
+	0x6f, 0x73, 0x74, 0x64, 0x61, 0x67, 0x44, 0x61, 0x74, 0x61, 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 (
@@ -1855,7 +1929,7 @@ func file_dbobjects_proto_rawDescGZIP() []byte {
 	return file_dbobjects_proto_rawDescData
 }
 
-var file_dbobjects_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
+var file_dbobjects_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
 var file_dbobjects_proto_goTypes = []interface{}{
 	(*DbBlock)(nil),                     // 0: serialization.DbBlock
 	(*DbBlockHeader)(nil),               // 1: serialization.DbBlockHeader
@@ -1884,6 +1958,7 @@ var file_dbobjects_proto_goTypes = []interface{}{
 	(*DbTips)(nil),                      // 24: serialization.DbTips
 	(*DbBlockCount)(nil),                // 25: serialization.DbBlockCount
 	(*DbBlockHeaderCount)(nil),          // 26: serialization.DbBlockHeaderCount
+	(*DbBlockGHOSTDAGDataHashPair)(nil), // 27: serialization.DbBlockGHOSTDAGDataHashPair
 }
 var file_dbobjects_proto_depIdxs = []int32{
 	1,  // 0: serialization.DbBlock.header:type_name -> serialization.DbBlockHeader
@@ -1921,11 +1996,13 @@ var file_dbobjects_proto_depIdxs = []int32{
 	18, // 32: serialization.DbUtxoDiff.toAdd:type_name -> serialization.DbUtxoCollectionItem
 	18, // 33: serialization.DbUtxoDiff.toRemove:type_name -> serialization.DbUtxoCollectionItem
 	2,  // 34: serialization.DbTips.tips:type_name -> serialization.DbHash
-	35, // [35:35] is the sub-list for method output_type
-	35, // [35:35] is the sub-list for method input_type
-	35, // [35:35] is the sub-list for extension type_name
-	35, // [35:35] is the sub-list for extension extendee
-	0,  // [0:35] is the sub-list for field type_name
+	2,  // 35: serialization.DbBlockGHOSTDAGDataHashPair.hash:type_name -> serialization.DbHash
+	14, // 36: serialization.DbBlockGHOSTDAGDataHashPair.GhostdagData:type_name -> serialization.DbBlockGhostdagData
+	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
 }
 
 func init() { file_dbobjects_proto_init() }
@@ -2258,6 +2335,18 @@ func file_dbobjects_proto_init() {
 				return nil
 			}
 		}
+		file_dbobjects_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DbBlockGHOSTDAGDataHashPair); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2265,7 +2354,7 @@ func file_dbobjects_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_dbobjects_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   27,
+			NumMessages:   28,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

domain/consensus/database/serialization/dbobjects.proto

@@ -37,6 +37,7 @@ message DbTransactionInput {
   DbOutpoint previousOutpoint = 1;
   bytes signatureScript = 2;
   uint64 sequence = 3;
+  uint32 sigOpCount = 4;
 }
 
 message DbOutpoint {
@@ -148,4 +149,9 @@ message DbBlockCount {
 
 message DbBlockHeaderCount {
   uint64 count = 1;
-}
+}
+
+message DbBlockGHOSTDAGDataHashPair {
+  DbHash hash = 1;
+  DbBlockGhostdagData GhostdagData = 2;
+}

domain/consensus/database/serialization/transaction.go

@@ -1,9 +1,10 @@
 package serialization
 
 import (
+	"math"
+
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 	"github.com/pkg/errors"
-	"math"
 )
 
 // DomainTransactionToDbTransaction converts DomainTransaction to DbTransaction
@@ -14,6 +15,7 @@ func DomainTransactionToDbTransaction(domainTransaction *externalapi.DomainTrans
 			PreviousOutpoint: DomainOutpointToDbOutpoint(&domainTransactionInput.PreviousOutpoint),
 			SignatureScript:  domainTransactionInput.SignatureScript,
 			Sequence:         domainTransactionInput.Sequence,
+			SigOpCount:       uint32(domainTransactionInput.SigOpCount),
 		}
 	}
 
@@ -54,6 +56,7 @@ func DbTransactionToDomainTransaction(dbTransaction *DbTransaction) (*externalap
 			PreviousOutpoint: *domainPreviousOutpoint,
 			SignatureScript:  dbTransactionInput.SignatureScript,
 			Sequence:         dbTransactionInput.Sequence,
+			SigOpCount:       byte(dbTransactionInput.SigOpCount),
 		}
 	}
 

domain/consensus/datastructures/acceptancedatastore/acceptance_data_store.go

@@ -6,20 +6,23 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 	"google.golang.org/protobuf/proto"
 )
 
-var bucket = database.MakeBucket([]byte("acceptance-data"))
+var bucketName = []byte("acceptance-data")
 
 // acceptanceDataStore represents a store of AcceptanceData
 type acceptanceDataStore struct {
-	cache *lrucache.LRUCache
+	cache  *lrucache.LRUCache
+	bucket model.DBBucket
 }
 
 // New instantiates a new AcceptanceDataStore
-func New(cacheSize int, preallocate bool) model.AcceptanceDataStore {
+func New(prefix *prefix.Prefix, cacheSize int, preallocate bool) model.AcceptanceDataStore {
 	return &acceptanceDataStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:  lrucache.New(cacheSize, preallocate),
+		bucket: database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
 	}
 }
 
@@ -84,5 +87,5 @@ func (ads *acceptanceDataStore) deserializeAcceptanceData(acceptanceDataBytes []
 }
 
 func (ads *acceptanceDataStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+	return ads.bucket.Key(hash.ByteSlice())
 }

domain/consensus/datastructures/blockheaderstore/block_header_staging_shard.go

@@ -56,7 +56,7 @@ func (bhss *blockHeaderStagingShard) commitCount(dbTx model.DBTransaction) error
 	if err != nil {
 		return err
 	}
-	err = dbTx.Put(countKey, countBytes)
+	err = dbTx.Put(bhss.store.countKey, countBytes)
 	if err != nil {
 		return err
 	}

domain/consensus/datastructures/blockheaderstore/block_header_store.go

@@ -7,21 +7,26 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
-var bucket = database.MakeBucket([]byte("block-headers"))
-var countKey = database.MakeBucket(nil).Key([]byte("block-headers-count"))
+var bucketName = []byte("block-headers")
+var countKeyName = []byte("block-headers-count")
 
 // blockHeaderStore represents a store of blocks
 type blockHeaderStore struct {
 	cache       *lrucache.LRUCache
 	countCached uint64
+	bucket      model.DBBucket
+	countKey    model.DBKey
 }
 
 // New instantiates a new BlockHeaderStore
-func New(dbContext model.DBReader, cacheSize int, preallocate bool) (model.BlockHeaderStore, error) {
+func New(dbContext model.DBReader, prefix *prefix.Prefix, cacheSize int, preallocate bool) (model.BlockHeaderStore, error) {
 	blockHeaderStore := &blockHeaderStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:    lrucache.New(cacheSize, preallocate),
+		bucket:   database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
+		countKey: database.MakeBucket(prefix.Serialize()).Key(countKeyName),
 	}
 
 	err := blockHeaderStore.initializeCount(dbContext)
@@ -34,12 +39,12 @@ func New(dbContext model.DBReader, cacheSize int, preallocate bool) (model.Block
 
 func (bhs *blockHeaderStore) initializeCount(dbContext model.DBReader) error {
 	count := uint64(0)
-	hasCountBytes, err := dbContext.Has(countKey)
+	hasCountBytes, err := dbContext.Has(bhs.countKey)
 	if err != nil {
 		return err
 	}
 	if hasCountBytes {
-		countBytes, err := dbContext.Get(countKey)
+		countBytes, err := dbContext.Get(bhs.countKey)
 		if err != nil {
 			return err
 		}
@@ -144,7 +149,7 @@ func (bhs *blockHeaderStore) Delete(stagingArea *model.StagingArea, blockHash *e
 }
 
 func (bhs *blockHeaderStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+	return bhs.bucket.Key(hash.ByteSlice())
 }
 
 func (bhs *blockHeaderStore) serializeHeader(header externalapi.BlockHeader) ([]byte, error) {

domain/consensus/datastructures/blockrelationstore/block_relation_store.go

@@ -7,19 +7,22 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
-var bucket = database.MakeBucket([]byte("block-relations"))
+var bucketName = []byte("block-relations")
 
 // blockRelationStore represents a store of BlockRelations
 type blockRelationStore struct {
-	cache *lrucache.LRUCache
+	cache  *lrucache.LRUCache
+	bucket model.DBBucket
 }
 
 // New instantiates a new BlockRelationStore
-func New(cacheSize int, preallocate bool) model.BlockRelationStore {
+func New(prefix *prefix.Prefix, cacheSize int, preallocate bool) model.BlockRelationStore {
 	return &blockRelationStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:  lrucache.New(cacheSize, preallocate),
+		bucket: database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
 	}
 }
 
@@ -72,7 +75,7 @@ func (brs *blockRelationStore) Has(dbContext model.DBReader, stagingArea *model.
 }
 
 func (brs *blockRelationStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+	return brs.bucket.Key(hash.ByteSlice())
 }
 
 func (brs *blockRelationStore) serializeBlockRelations(blockRelations *model.BlockRelations) ([]byte, error) {

domain/consensus/datastructures/blockstatusstore/block_status_store.go

@@ -7,19 +7,22 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
-var bucket = database.MakeBucket([]byte("block-statuses"))
+var bucketName = []byte("block-statuses")
 
 // blockStatusStore represents a store of BlockStatuses
 type blockStatusStore struct {
-	cache *lrucache.LRUCache
+	cache  *lrucache.LRUCache
+	bucket model.DBBucket
 }
 
 // New instantiates a new BlockStatusStore
-func New(cacheSize int, preallocate bool) model.BlockStatusStore {
+func New(prefix *prefix.Prefix, cacheSize int, preallocate bool) model.BlockStatusStore {
 	return &blockStatusStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:  lrucache.New(cacheSize, preallocate),
+		bucket: database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
 	}
 }
 
@@ -93,5 +96,5 @@ func (bss *blockStatusStore) deserializeBlockStatus(statusBytes []byte) (externa
 }
 
 func (bss *blockStatusStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+	return bss.bucket.Key(hash.ByteSlice())
 }

domain/consensus/datastructures/blockstore/block_staging_shard.go

@@ -56,7 +56,7 @@ func (bss *blockStagingShard) commitCount(dbTx model.DBTransaction) error {
 	if err != nil {
 		return err
 	}
-	err = dbTx.Put(countKey, countBytes)
+	err = dbTx.Put(bss.store.countKey, countBytes)
 	if err != nil {
 		return err
 	}

domain/consensus/datastructures/blockstore/block_store.go

@@ -7,22 +7,26 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 	"github.com/pkg/errors"
 )
 
-var bucket = database.MakeBucket([]byte("blocks"))
-var countKey = database.MakeBucket(nil).Key([]byte("blocks-count"))
+var bucketName = []byte("blocks")
 
 // blockStore represents a store of blocks
 type blockStore struct {
 	cache       *lrucache.LRUCache
 	countCached uint64
+	bucket      model.DBBucket
+	countKey    model.DBKey
 }
 
 // New instantiates a new BlockStore
-func New(dbContext model.DBReader, cacheSize int, preallocate bool) (model.BlockStore, error) {
+func New(dbContext model.DBReader, prefix *prefix.Prefix, cacheSize int, preallocate bool) (model.BlockStore, error) {
 	blockStore := &blockStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:    lrucache.New(cacheSize, preallocate),
+		bucket:   database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
+		countKey: database.MakeBucket(prefix.Serialize()).Key([]byte("blocks-count")),
 	}
 
 	err := blockStore.initializeCount(dbContext)
@@ -35,12 +39,12 @@ func New(dbContext model.DBReader, cacheSize int, preallocate bool) (model.Block
 
 func (bs *blockStore) initializeCount(dbContext model.DBReader) error {
 	count := uint64(0)
-	hasCountBytes, err := dbContext.Has(countKey)
+	hasCountBytes, err := dbContext.Has(bs.countKey)
 	if err != nil {
 		return err
 	}
 	if hasCountBytes {
-		countBytes, err := dbContext.Get(countKey)
+		countBytes, err := dbContext.Get(bs.countKey)
 		if err != nil {
 			return err
 		}
@@ -153,7 +157,7 @@ func (bs *blockStore) deserializeBlock(blockBytes []byte) (*externalapi.DomainBl
 }
 
 func (bs *blockStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+	return bs.bucket.Key(hash.ByteSlice())
 }
 
 func (bs *blockStore) Count(stagingArea *model.StagingArea) uint64 {
@@ -225,7 +229,7 @@ func (a allBlockHashesIterator) Close() error {
 }
 
 func (bs *blockStore) AllBlockHashesIterator(dbContext model.DBReader) (model.BlockIterator, error) {
-	cursor, err := dbContext.Cursor(bucket)
+	cursor, err := dbContext.Cursor(bs.bucket)
 	if err != nil {
 		return nil, err
 	}

domain/consensus/datastructures/consensusstatestore/consensus_state_store.go

@@ -1,22 +1,31 @@
 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/kaspanet/kaspad/domain/consensus/utils/utxolrucache"
+	"github.com/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
+var importingPruningPointUTXOSetKeyName = []byte("importing-pruning-point-utxo-set")
+
 // consensusStateStore represents a store for the current consensus state
 type consensusStateStore struct {
-	virtualUTXOSetCache *utxolrucache.LRUCache
-
-	tipsCache []*externalapi.DomainHash
+	virtualUTXOSetCache             *utxolrucache.LRUCache
+	tipsCache                       []*externalapi.DomainHash
+	tipsKey                         model.DBKey
+	utxoSetBucket                   model.DBBucket
+	importingPruningPointUTXOSetKey model.DBKey
 }
 
 // New instantiates a new ConsensusStateStore
-func New(utxoSetCacheSize int, preallocate bool) model.ConsensusStateStore {
+func New(prefix *prefix.Prefix, utxoSetCacheSize int, preallocate bool) model.ConsensusStateStore {
 	return &consensusStateStore{
-		virtualUTXOSetCache: utxolrucache.New(utxoSetCacheSize, preallocate),
+		virtualUTXOSetCache:             utxolrucache.New(utxoSetCacheSize, preallocate),
+		tipsKey:                         database.MakeBucket(prefix.Serialize()).Key(tipsKeyName),
+		importingPruningPointUTXOSetKey: database.MakeBucket(prefix.Serialize()).Key(importingPruningPointUTXOSetKeyName),
+		utxoSetBucket:                   database.MakeBucket(prefix.Serialize()).Bucket(utxoSetBucketName),
 	}
 }
 

domain/consensus/datastructures/consensusstatestore/tips.go

@@ -2,13 +2,12 @@ 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 tipsKey = database.MakeBucket(nil).Key([]byte("tips"))
+var tipsKeyName = []byte("tips")
 
 func (css *consensusStateStore) Tips(stagingArea *model.StagingArea, dbContext model.DBReader) ([]*externalapi.DomainHash, error) {
 	stagingShard := css.stagingShard(stagingArea)
@@ -21,7 +20,7 @@ func (css *consensusStateStore) Tips(stagingArea *model.StagingArea, dbContext m
 		return externalapi.CloneHashes(css.tipsCache), nil
 	}
 
-	tipsBytes, err := dbContext.Get(tipsKey)
+	tipsBytes, err := dbContext.Get(css.tipsKey)
 	if err != nil {
 		return nil, err
 	}
@@ -66,7 +65,7 @@ func (csss *consensusStateStagingShard) commitTips(dbTx model.DBTransaction) err
 	if err != nil {
 		return err
 	}
-	err = dbTx.Put(tipsKey, tipsBytes)
+	err = dbTx.Put(csss.store.tipsKey, tipsBytes)
 	if err != nil {
 		return err
 	}

domain/consensus/datastructures/consensusstatestore/utxo.go

@@ -1,22 +1,21 @@
 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/kaspanet/kaspad/domain/consensus/utils/utxo"
 	"github.com/pkg/errors"
 )
 
-var utxoSetBucket = database.MakeBucket([]byte("virtual-utxo-set"))
+var utxoSetBucketName = []byte("virtual-utxo-set")
 
-func utxoKey(outpoint *externalapi.DomainOutpoint) (model.DBKey, error) {
+func (css *consensusStateStore) utxoKey(outpoint *externalapi.DomainOutpoint) (model.DBKey, error) {
 	serializedOutpoint, err := serializeOutpoint(outpoint)
 	if err != nil {
 		return nil, err
 	}
 
-	return utxoSetBucket.Key(serializedOutpoint), nil
+	return css.utxoSetBucket.Key(serializedOutpoint), nil
 }
 
 func (css *consensusStateStore) StageVirtualUTXODiff(stagingArea *model.StagingArea, virtualUTXODiff externalapi.UTXODiff) {
@@ -48,7 +47,7 @@ func (csss *consensusStateStagingShard) commitVirtualUTXODiff(dbTx model.DBTrans
 
 		csss.store.virtualUTXOSetCache.Remove(toRemoveOutpoint)
 
-		dbKey, err := utxoKey(toRemoveOutpoint)
+		dbKey, err := csss.store.utxoKey(toRemoveOutpoint)
 		if err != nil {
 			return err
 		}
@@ -68,7 +67,7 @@ func (csss *consensusStateStagingShard) commitVirtualUTXODiff(dbTx model.DBTrans
 
 		csss.store.virtualUTXOSetCache.Add(toAddOutpoint, toAddEntry)
 
-		dbKey, err := utxoKey(toAddOutpoint)
+		dbKey, err := csss.store.utxoKey(toAddOutpoint)
 		if err != nil {
 			return err
 		}
@@ -111,7 +110,7 @@ func (css *consensusStateStore) utxoByOutpointFromStagedVirtualUTXODiff(dbContex
 		return entry, nil
 	}
 
-	key, err := utxoKey(outpoint)
+	key, err := css.utxoKey(outpoint)
 	if err != nil {
 		return nil, err
 	}
@@ -150,7 +149,7 @@ func (css *consensusStateStore) hasUTXOByOutpointFromStagedVirtualUTXODiff(dbCon
 		}
 	}
 
-	key, err := utxoKey(outpoint)
+	key, err := css.utxoKey(outpoint)
 	if err != nil {
 		return false, err
 	}
@@ -161,7 +160,7 @@ func (css *consensusStateStore) hasUTXOByOutpointFromStagedVirtualUTXODiff(dbCon
 func (css *consensusStateStore) VirtualUTXOs(dbContext model.DBReader, fromOutpoint *externalapi.DomainOutpoint, limit int) (
 	[]*externalapi.OutpointAndUTXOEntryPair, error) {
 
-	cursor, err := dbContext.Cursor(utxoSetBucket)
+	cursor, err := dbContext.Cursor(css.utxoSetBucket)
 	if err != nil {
 		return nil, err
 	}
@@ -172,7 +171,7 @@ func (css *consensusStateStore) VirtualUTXOs(dbContext model.DBReader, fromOutpo
 		if err != nil {
 			return nil, err
 		}
-		seekKey := utxoSetBucket.Key(serializedFromOutpoint)
+		seekKey := css.utxoSetBucket.Key(serializedFromOutpoint)
 		err = cursor.Seek(seekKey)
 		if err != nil {
 			return nil, err
@@ -201,7 +200,7 @@ func (css *consensusStateStore) VirtualUTXOSetIterator(dbContext model.DBReader,
 
 	stagingShard := css.stagingShard(stagingArea)
 
-	cursor, err := dbContext.Cursor(utxoSetBucket)
+	cursor, err := dbContext.Cursor(css.utxoSetBucket)
 	if err != nil {
 		return nil, err
 	}

domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go

@@ -1,24 +1,21 @@
 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"
 )
 
-var importingPruningPointUTXOSetKey = database.MakeBucket(nil).Key([]byte("importing-pruning-point-utxo-set"))
-
 func (css *consensusStateStore) StartImportingPruningPointUTXOSet(dbContext model.DBWriter) error {
-	return dbContext.Put(importingPruningPointUTXOSetKey, []byte{0})
+	return dbContext.Put(css.importingPruningPointUTXOSetKey, []byte{0})
 }
 
 func (css *consensusStateStore) HadStartedImportingPruningPointUTXOSet(dbContext model.DBWriter) (bool, error) {
-	return dbContext.Has(importingPruningPointUTXOSetKey)
+	return dbContext.Has(css.importingPruningPointUTXOSetKey)
 }
 
 func (css *consensusStateStore) FinishImportingPruningPointUTXOSet(dbContext model.DBWriter) error {
-	return dbContext.Delete(importingPruningPointUTXOSetKey)
+	return dbContext.Delete(css.importingPruningPointUTXOSetKey)
 }
 
 func (css *consensusStateStore) ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbContext model.DBWriter,
@@ -37,7 +34,7 @@ func (css *consensusStateStore) ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbCo
 	css.virtualUTXOSetCache.Clear()
 
 	// Delete all the old UTXOs from the database
-	deleteCursor, err := dbContext.Cursor(utxoSetBucket)
+	deleteCursor, err := dbContext.Cursor(css.utxoSetBucket)
 	if err != nil {
 		return err
 	}
@@ -60,7 +57,7 @@ func (css *consensusStateStore) ImportPruningPointUTXOSetIntoVirtualUTXOSet(dbCo
 			return err
 		}
 
-		key, err := utxoKey(outpoint)
+		key, err := css.utxoKey(outpoint)
 		if err != nil {
 			return err
 		}

domain/consensus/datastructures/daablocksstore/daa_blocks_store.go

@@ -6,22 +6,27 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
-var daaScoreBucket = database.MakeBucket([]byte("daa-score"))
-var daaAddedBlocksBucket = database.MakeBucket([]byte("daa-added-blocks"))
+var daaScoreBucketName = []byte("daa-score")
+var daaAddedBlocksBucketName = []byte("daa-added-blocks")
 
 // daaBlocksStore represents a store of DAABlocksStore
 type daaBlocksStore struct {
 	daaScoreLRUCache       *lrucache.LRUCache
 	daaAddedBlocksLRUCache *lrucache.LRUCache
+	daaScoreBucket         model.DBBucket
+	daaAddedBlocksBucket   model.DBBucket
 }
 
 // New instantiates a new DAABlocksStore
-func New(daaScoreCacheSize int, daaAddedBlocksCacheSize int, preallocate bool) model.DAABlocksStore {
+func New(prefix *prefix.Prefix, daaScoreCacheSize int, daaAddedBlocksCacheSize int, preallocate bool) model.DAABlocksStore {
 	return &daaBlocksStore{
 		daaScoreLRUCache:       lrucache.New(daaScoreCacheSize, preallocate),
 		daaAddedBlocksLRUCache: lrucache.New(daaAddedBlocksCacheSize, preallocate),
+		daaScoreBucket:         database.MakeBucket(prefix.Serialize()).Bucket(daaScoreBucketName),
+		daaAddedBlocksBucket:   database.MakeBucket(prefix.Serialize()).Bucket(daaAddedBlocksBucketName),
 	}
 }
 
@@ -90,11 +95,11 @@ func (daas *daaBlocksStore) DAAAddedBlocks(dbContext model.DBReader, stagingArea
 }
 
 func (daas *daaBlocksStore) daaScoreHashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return daaScoreBucket.Key(hash.ByteSlice())
+	return daas.daaScoreBucket.Key(hash.ByteSlice())
 }
 
 func (daas *daaBlocksStore) daaAddedBlocksHashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return daaAddedBlocksBucket.Key(hash.ByteSlice())
+	return daas.daaAddedBlocksBucket.Key(hash.ByteSlice())
 }
 
 func (daas *daaBlocksStore) Delete(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) {

domain/consensus/datastructures/daawindowstore/daa_window_staging_shard.go

@@ -0,0 +1,59 @@
+package daawindowstore
+
+import (
+	"github.com/golang/protobuf/proto"
+	"github.com/kaspanet/kaspad/domain/consensus/database/serialization"
+	"github.com/kaspanet/kaspad/domain/consensus/model"
+	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
+)
+
+type dbKey struct {
+	blockHash externalapi.DomainHash
+	index     uint64
+}
+
+func newDBKey(blockHash *externalapi.DomainHash, index uint64) dbKey {
+	return dbKey{
+		blockHash: *blockHash,
+		index:     index,
+	}
+}
+
+type daaWindowStagingShard struct {
+	store *daaWindowStore
+	toAdd map[dbKey]*externalapi.BlockGHOSTDAGDataHashPair
+}
+
+func (daaws *daaWindowStore) stagingShard(stagingArea *model.StagingArea) *daaWindowStagingShard {
+	return stagingArea.GetOrCreateShard(model.StagingShardIDDAAWindow, func() model.StagingShard {
+		return &daaWindowStagingShard{
+			store: daaws,
+			toAdd: make(map[dbKey]*externalapi.BlockGHOSTDAGDataHashPair),
+		}
+	}).(*daaWindowStagingShard)
+}
+
+func (daawss *daaWindowStagingShard) Commit(dbTx model.DBTransaction) error {
+	for key, pair := range daawss.toAdd {
+		pairBytes, err := serializePair(pair)
+		if err != nil {
+			return err
+		}
+
+		err = dbTx.Put(daawss.store.key(key), pairBytes)
+		if err != nil {
+			return err
+		}
+		daawss.store.cache.Add(&key.blockHash, key.index, pair)
+	}
+
+	return nil
+}
+
+func serializePair(pair *externalapi.BlockGHOSTDAGDataHashPair) ([]byte, error) {
+	return proto.Marshal(serialization.BlockGHOSTDAGDataHashPairToDbBlockGhostdagDataHashPair(pair))
+}
+
+func (daawss *daaWindowStagingShard) isStaged() bool {
+	return len(daawss.toAdd) == 0
+}

domain/consensus/datastructures/daawindowstore/daa_window_store.go

@@ -0,0 +1,83 @@
+package daawindowstore
+
+import (
+	"encoding/binary"
+	"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"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/lrucachehashpairtoblockghostdagdatahashpair"
+	"github.com/kaspanet/kaspad/domain/prefixmanager/prefix"
+)
+
+var bucketName = []byte("daa-window")
+
+type daaWindowStore struct {
+	cache  *lrucachehashpairtoblockghostdagdatahashpair.LRUCache
+	bucket model.DBBucket
+}
+
+// New instantiates a new BlocksWithTrustedDataDAAWindowStore
+func New(prefix *prefix.Prefix, cacheSize int, preallocate bool) model.BlocksWithTrustedDataDAAWindowStore {
+	return &daaWindowStore{
+		cache:  lrucachehashpairtoblockghostdagdatahashpair.New(cacheSize, preallocate),
+		bucket: database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
+	}
+}
+
+func (daaws *daaWindowStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, index uint64, pair *externalapi.BlockGHOSTDAGDataHashPair) {
+	stagingShard := daaws.stagingShard(stagingArea)
+
+	key := newDBKey(blockHash, index)
+	if _, ok := stagingShard.toAdd[key]; !ok {
+		stagingShard.toAdd[key] = pair
+	}
+
+}
+
+func (daaws *daaWindowStore) DAAWindowBlock(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, index uint64) (*externalapi.BlockGHOSTDAGDataHashPair, error) {
+	stagingShard := daaws.stagingShard(stagingArea)
+
+	dbKey := newDBKey(blockHash, index)
+	if pair, ok := stagingShard.toAdd[dbKey]; ok {
+		return pair, nil
+	}
+
+	if pair, ok := daaws.cache.Get(blockHash, index); ok {
+		return pair, nil
+	}
+
+	pairBytes, err := dbContext.Get(daaws.key(dbKey))
+	if err != nil {
+		return nil, err
+	}
+
+	pair, err := deserializePairBytes(pairBytes)
+	if err != nil {
+		return nil, err
+	}
+
+	daaws.cache.Add(blockHash, index, pair)
+	return pair, nil
+}
+
+func deserializePairBytes(pairBytes []byte) (*externalapi.BlockGHOSTDAGDataHashPair, error) {
+	dbPair := &serialization.DbBlockGHOSTDAGDataHashPair{}
+	err := proto.Unmarshal(pairBytes, dbPair)
+	if err != nil {
+		return nil, err
+	}
+
+	return serialization.DbBlockGHOSTDAGDataHashPairToBlockGHOSTDAGDataHashPair(dbPair)
+}
+
+func (daaws *daaWindowStore) IsStaged(stagingArea *model.StagingArea) bool {
+	return daaws.stagingShard(stagingArea).isStaged()
+}
+
+func (daaws *daaWindowStore) key(key dbKey) model.DBKey {
+	keyIndexBytes := make([]byte, 8)
+	binary.LittleEndian.PutUint64(keyIndexBytes, key.index)
+	return daaws.bucket.Bucket(key.blockHash.ByteSlice()).Key(keyIndexBytes)
+}

domain/consensus/datastructures/finalitystore/finality_store.go

@@ -5,18 +5,21 @@ 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/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
-var bucket = database.MakeBucket([]byte("finality-points"))
+var bucketName = []byte("finality-points")
 
 type finalityStore struct {
-	cache *lrucache.LRUCache
+	cache  *lrucache.LRUCache
+	bucket model.DBBucket
 }
 
 // New instantiates a new FinalityStore
-func New(cacheSize int, preallocate bool) model.FinalityStore {
+func New(prefix *prefix.Prefix, cacheSize int, preallocate bool) model.FinalityStore {
 	return &finalityStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:  lrucache.New(cacheSize, preallocate),
+		bucket: database.MakeBucket(prefix.Serialize()).Bucket(bucketName),
 	}
 }
 
@@ -55,5 +58,5 @@ func (fs *finalityStore) IsStaged(stagingArea *model.StagingArea) bool {
 }
 
 func (fs *finalityStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+	return fs.bucket.Key(hash.ByteSlice())
 }

domain/consensus/datastructures/ghostdagdatastore/ghostadag_data_staging_shard.go

@@ -5,31 +5,43 @@ import (
 	"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
 )
 
+type key struct {
+	hash          externalapi.DomainHash
+	isTrustedData bool
+}
+
+func newKey(hash *externalapi.DomainHash, isTrustedData bool) key {
+	return key{
+		hash:          *hash,
+		isTrustedData: isTrustedData,
+	}
+}
+
 type ghostdagDataStagingShard struct {
 	store *ghostdagDataStore
-	toAdd map[externalapi.DomainHash]*model.BlockGHOSTDAGData
+	toAdd map[key]*externalapi.BlockGHOSTDAGData
 }
 
 func (gds *ghostdagDataStore) stagingShard(stagingArea *model.StagingArea) *ghostdagDataStagingShard {
 	return stagingArea.GetOrCreateShard(model.StagingShardIDGHOSTDAG, func() model.StagingShard {
 		return &ghostdagDataStagingShard{
 			store: gds,
-			toAdd: make(map[externalapi.DomainHash]*model.BlockGHOSTDAGData),
+			toAdd: make(map[key]*externalapi.BlockGHOSTDAGData),
 		}
 	}).(*ghostdagDataStagingShard)
 }
 
 func (gdss *ghostdagDataStagingShard) Commit(dbTx model.DBTransaction) error {
-	for hash, blockGHOSTDAGData := range gdss.toAdd {
+	for key, blockGHOSTDAGData := range gdss.toAdd {
 		blockGhostdagDataBytes, err := gdss.store.serializeBlockGHOSTDAGData(blockGHOSTDAGData)
 		if err != nil {
 			return err
 		}
-		err = dbTx.Put(gdss.store.hashAsKey(&hash), blockGhostdagDataBytes)
+		err = dbTx.Put(gdss.store.serializeKey(key), blockGhostdagDataBytes)
 		if err != nil {
 			return err
 		}
-		gdss.store.cache.Add(&hash, blockGHOSTDAGData)
+		gdss.store.cache.Add(&key.hash, key.isTrustedData, blockGHOSTDAGData)
 	}
 
 	return nil

domain/consensus/datastructures/ghostdagdatastore/ghostdag_data_store.go

@@ -6,28 +6,36 @@ 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/kaspanet/kaspad/domain/consensus/utils/lrucache"
+	"github.com/kaspanet/kaspad/domain/consensus/utils/lrucacheghostdagdata"
+	"github.com/kaspanet/kaspad/domain/prefixmanager/prefix"
 )
 
-var bucket = database.MakeBucket([]byte("block-ghostdag-data"))
+var ghostdagDataBucketName = []byte("block-ghostdag-data")
+var trustedDataBucketName = []byte("block-with-trusted-data-ghostdag-data")
 
 // ghostdagDataStore represents a store of BlockGHOSTDAGData
 type ghostdagDataStore struct {
-	cache *lrucache.LRUCache
+	cache              *lrucacheghostdagdata.LRUCache
+	ghostdagDataBucket model.DBBucket
+	trustedDataBucket  model.DBBucket
 }
 
 // New instantiates a new GHOSTDAGDataStore
-func New(cacheSize int, preallocate bool) model.GHOSTDAGDataStore {
+func New(prefix *prefix.Prefix, cacheSize int, preallocate bool) model.GHOSTDAGDataStore {
 	return &ghostdagDataStore{
-		cache: lrucache.New(cacheSize, preallocate),
+		cache:              lrucacheghostdagdata.New(cacheSize, preallocate),
+		ghostdagDataBucket: database.MakeBucket(prefix.Serialize()).Bucket(ghostdagDataBucketName),
+		trustedDataBucket:  database.MakeBucket(prefix.Serialize()).Bucket(trustedDataBucketName),
 	}
 }
 
 // Stage stages the given blockGHOSTDAGData for the given blockHash
-func (gds *ghostdagDataStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, blockGHOSTDAGData *model.BlockGHOSTDAGData) {
+func (gds *ghostdagDataStore) Stage(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash,
+	blockGHOSTDAGData *externalapi.BlockGHOSTDAGData, isTrustedData bool) {
+
 	stagingShard := gds.stagingShard(stagingArea)
 
-	stagingShard.toAdd[*blockHash] = blockGHOSTDAGData
+	stagingShard.toAdd[newKey(blockHash, isTrustedData)] = blockGHOSTDAGData
 }
 
 func (gds *ghostdagDataStore) IsStaged(stagingArea *model.StagingArea) bool {
@@ -35,18 +43,19 @@ func (gds *ghostdagDataStore) IsStaged(stagingArea *model.StagingArea) bool {
 }
 
 // Get gets the blockGHOSTDAGData associated with the given blockHash
-func (gds *ghostdagDataStore) Get(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) (*model.BlockGHOSTDAGData, error) {
+func (gds *ghostdagDataStore) Get(dbContext model.DBReader, stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, isTrustedData bool) (*externalapi.BlockGHOSTDAGData, error) {
 	stagingShard := gds.stagingShard(stagingArea)
 
-	if blockGHOSTDAGData, ok := stagingShard.toAdd[*blockHash]; ok {
+	key := newKey(blockHash, isTrustedData)
+	if blockGHOSTDAGData, ok := stagingShard.toAdd[key]; ok {
 		return blockGHOSTDAGData, nil
 	}
 
-	if blockGHOSTDAGData, ok := gds.cache.Get(blockHash); ok {
-		return blockGHOSTDAGData.(*model.BlockGHOSTDAGData), nil
+	if blockGHOSTDAGData, ok := gds.cache.Get(blockHash, isTrustedData); ok {
+		return blockGHOSTDAGData, nil
 	}
 
-	blockGHOSTDAGDataBytes, err := dbContext.Get(gds.hashAsKey(blockHash))
+	blockGHOSTDAGDataBytes, err := dbContext.Get(gds.serializeKey(key))
 	if err != nil {
 		return nil, err
 	}
@@ -55,19 +64,22 @@ func (gds *ghostdagDataStore) Get(dbContext model.DBReader, stagingArea *model.S
 	if err != nil {
 		return nil, err
 	}
-	gds.cache.Add(blockHash, blockGHOSTDAGData)
+	gds.cache.Add(blockHash, isTrustedData, blockGHOSTDAGData)
 	return blockGHOSTDAGData, nil
 }
 
-func (gds *ghostdagDataStore) hashAsKey(hash *externalapi.DomainHash) model.DBKey {
-	return bucket.Key(hash.ByteSlice())
+func (gds *ghostdagDataStore) serializeKey(k key) model.DBKey {
+	if k.isTrustedData {
+		return gds.trustedDataBucket.Key(k.hash.ByteSlice())
+	}
+	return gds.ghostdagDataBucket.Key(k.hash.ByteSlice())
 }
 
-func (gds *ghostdagDataStore) serializeBlockGHOSTDAGData(blockGHOSTDAGData *model.BlockGHOSTDAGData) ([]byte, error) {
+func (gds *ghostdagDataStore) serializeBlockGHOSTDAGData(blockGHOSTDAGData *externalapi.BlockGHOSTDAGData) ([]byte, error) {
 	return proto.Marshal(serialization.BlockGHOSTDAGDataToDBBlockGHOSTDAGData(blockGHOSTDAGData))
 }
 
-func (gds *ghostdagDataStore) deserializeBlockGHOSTDAGData(blockGHOSTDAGDataBytes []byte) (*model.BlockGHOSTDAGData, error) {
+func (gds *ghostdagDataStore) deserializeBlockGHOSTDAGData(blockGHOSTDAGDataBytes []byte) (*externalapi.BlockGHOSTDAGData, error) {
 	dbBlockGHOSTDAGData := &serialization.DbBlockGhostdagData{}
 	err := proto.Unmarshal(blockGHOSTDAGDataBytes, dbBlockGHOSTDAGData)
 	if err != nil {